Skip to content

FIX: #13846: General task not retrieved #13870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Pa-Touche wants to merge 2 commits into from
Closed

FIX: #13846: General task not retrieved #13870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa356b8
FIX: #13846: General task not retrieved
Pa-Touche Mar 9, 2026
2738273
FIX: #13846: General task not retrieved: enhanced unit test
Pa-Touche Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sormas-backend/src/main/java/de/symeda/sormas/backend/task/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ public Predicate buildCriteriaFilter(TaskCriteria taskCriteria, TaskQueryContext
filter,
CriteriaBuilderHelper.or(
cb,
cb.equal(from.get(Task.TASK_CONTEXT), TaskContext.GENERAL),
cb.equal(joins.getCaseRegion().get(Region.UUID), regionUuid),
cb.equal(joins.getCaseResponsibleRegion().get(Region.UUID), regionUuid),
cb.equal(joins.getContactRegion().get(Region.UUID), regionUuid),
Expand All @@ -508,6 +509,7 @@ public Predicate buildCriteriaFilter(TaskCriteria taskCriteria, TaskQueryContext
filter,
CriteriaBuilderHelper.or(
cb,
cb.equal(from.get(Task.TASK_CONTEXT), TaskContext.GENERAL),
cb.equal(joins.getCaseDistrict().get(District.UUID), districtUuid),
cb.equal(joins.getCaseResponsibleDistrict().get(District.UUID), districtUuid),
cb.equal(joins.getContactDistrict().get(District.UUID), districtUuid),
Expand Down
35 changes: 35 additions & 0 deletions sormas-backend/src/test/java/de/symeda/sormas/backend/task/TaskFacadeEjbTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
import de.symeda.sormas.api.feature.FeatureConfigurationIndexDto;
import de.symeda.sormas.api.feature.FeatureType;
import de.symeda.sormas.api.infrastructure.community.CommunityDto;
import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
import de.symeda.sormas.api.person.PersonDto;
import de.symeda.sormas.api.sormastosormas.share.incoming.ShareRequestDataType;
import de.symeda.sormas.api.sormastosormas.share.incoming.ShareRequestStatus;
Expand Down Expand Up @@ -120,6 +122,39 @@ public void testTaskDirectoryForDeletedLinkedCase() {
assertEquals(0, tasks.size());
}

@Test
public void testTaskDirectoryForGeneralTasks() {
RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
RegionReferenceDto region = rdcf.region;
DistrictReferenceDto district = rdcf.district;
UserDto user = creator.createUser(
region.getUuid(),
district.getUuid(),
rdcf.facility.getUuid(),
"Surv",
"Sup",
creator.userRoleDtoMap.get(DefaultUserRole.SURVEILLANCE_SUPERVISOR));

TaskDto task = creator.createTask(
TaskContext.GENERAL,
TaskType.DAILY_REPORT_GENERATION,
TaskStatus.DONE,
null,
null,
null,
null,
DateHelper.addDays(new Date(), 1),
user.toReference());

TaskCriteria taskCriteria = new TaskCriteria().taskContext(TaskContext.GENERAL).taskStatus(TaskStatus.DONE);
taskCriteria.setRegion(region);
taskCriteria.setDistrict(district);

List<TaskIndexDto> tasks = getTaskFacade().getIndexList(taskCriteria, 0, 100, null);
assertEquals(1, tasks.size());
assertEquals(task.getUuid(), tasks.get(0).getUuid());
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

@Test
public void testGetByUuidForArchivedTask() {
UserDto user1 = creator.createUser(
Expand Down
Loading