fix: [ANDROAPP-5803/5630] ignore deleted events on schedule creation (#…

…3458) * fix: [ANDROAPP-5803] ignore deleted events on schedule creation * lint * unit test
dhis2 · Jan 15, 2024 · 87cd3d8 · 87cd3d8
1 parent fad8dc2
commit 87cd3d8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt b/...org/dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepository.kt
@@ -75,10 +75,12 @@ class EventDetailsRepository(
         val activeEvents =
             d2.eventModule().events().byEnrollmentUid().eq(enrollmentUid).byProgramStageUid()
                 .eq(programStageUid)
+                .byDeleted().isFalse
                 .orderByEventDate(RepositoryScope.OrderByDirection.DESC).blockingGet()
         val scheduleEvents =
             d2.eventModule().events().byEnrollmentUid().eq(enrollmentUid).byProgramStageUid()
                 .eq(programStageUid)
+                .byDeleted().isFalse
                 .orderByDueDate(RepositoryScope.OrderByDirection.DESC).blockingGet()
 
         var activeDate: Date? = null
@@ -88,7 +90,12 @@ class EventDetailsRepository(
         }
         if (scheduleEvents.isNotEmpty()) scheduleDate = scheduleEvents[0].dueDate()
 
-        return activeDate ?: scheduleDate
+        return when {
+            scheduleDate == null -> activeDate
+            activeDate == null -> scheduleDate
+            activeDate.before(scheduleDate) -> scheduleDate
+            else -> activeDate
+        }
     }
 
     fun hasAccessDataWrite(): Boolean {

diff --git a/...dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt b/...dhis2/usescases/eventsWithoutRegistration/eventDetails/data/EventDetailsRepositoryTest.kt
@@ -59,13 +59,27 @@ class EventDetailsRepositoryTest {
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted(),
+        ) doReturn mock()
+        whenever(
+            d2.eventModule().events()
+                .byEnrollmentUid().eq(ENROLLMENT_UID)
+                .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse,
+        ) doReturn mock()
+        whenever(
+            d2.eventModule().events()
+                .byEnrollmentUid().eq(ENROLLMENT_UID)
+                .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByEventDate(DESC),
         ) doReturn mock()
 
         whenever(
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByDueDate(DESC),
         ) doReturn mock()
     }
@@ -97,13 +111,15 @@ class EventDetailsRepositoryTest {
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByEventDate(DESC)
                 .blockingGet(),
         ) doReturn listOf(event)
         whenever(
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByDueDate(DESC)
                 .blockingGet(),
         ) doReturn emptyList()
@@ -120,13 +136,15 @@ class EventDetailsRepositoryTest {
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByEventDate(DESC)
                 .blockingGet(),
         ) doReturn emptyList()
         whenever(
             d2.eventModule().events()
                 .byEnrollmentUid().eq(ENROLLMENT_UID)
                 .byProgramStageUid().eq(PROGRAM_STAGE_UID)
+                .byDeleted().isFalse
                 .orderByDueDate(DESC)
                 .blockingGet(),
         ) doReturn listOf(event)