Merge pull request #749 from minvws/multiple-dcc-no-duplicate-events

Filter out events that have the same date to check upgrade banner
minvws · Oct 12, 2021 · c1ec648 · c1ec648
2 parents e719f7d + 7aa1883
commit c1ec648
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/EventGroupEntityUtil.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/EventGroupEntityUtil.kt
@@ -34,6 +34,7 @@ class EventGroupEntityUtilImpl(
                 .map { remoteEventUtil.getRemoteEventsFromNonDcc(it) }
                 .flatten()
                 .filterIsInstance<RemoteEventVaccination>()
+                .distinctBy { it.vaccination?.date }
                 .toList()
 
             return dccVaccinationEvents.size + nonDccVaccinationEvents.size

diff --git a/holder/src/test/java/nl/rijksoverheid/ctr/holder/Fakes.kt b/holder/src/test/java/nl/rijksoverheid/ctr/holder/Fakes.kt
@@ -630,7 +630,7 @@ fun fakeRemoteEventUtil(
         return RemoteEventVaccination(
             type = "",
             unique = "",
-            vaccination = fakeRemoteEventVaccination
+            vaccination = fakeRemoteEventVaccination()
         )
     }
 
@@ -663,8 +663,8 @@ val fakeGreenCard = GreenCard(
     credentialEntities = listOf()
 )
 
-val fakeRemoteEventVaccination = RemoteEventVaccination.Vaccination(
-    date = LocalDate.now(),
+fun fakeRemoteEventVaccination(date: LocalDate = LocalDate.now()) = RemoteEventVaccination.Vaccination(
+    date = date,
     hpkCode = "",
     type = "",
     brand = "",

diff --git a/...c/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/EventGroupEntityUtilImplTest.kt b/...c/test/java/nl/rijksoverheid/ctr/holder/ui/create_qr/util/EventGroupEntityUtilImplTest.kt
@@ -8,6 +8,7 @@ import nl.rijksoverheid.ctr.holder.persistence.database.entities.OriginType
 import nl.rijksoverheid.ctr.holder.ui.create_qr.models.RemoteEventVaccination
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import java.time.LocalDate
 import java.time.OffsetDateTime
 
 class EventGroupEntityUtilImplTest {
@@ -26,19 +27,19 @@ class EventGroupEntityUtilImplTest {
     }
 
     @Test
-    fun `allVaccinationEvents returns 4 events if 2 ZZZ vaccination event groups with 2 events each`() = runBlocking {
+    fun `allVaccinationEvents returns 2 events if 2 ZZZ vaccination event groups with 2 events each with the same dates`() = runBlocking {
         val util = EventGroupEntityUtilImpl(
             remoteEventUtil = fakeRemoteEventUtil(
                 getRemoteEventsFromNonDcc = listOf(
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination(LocalDate.now().plusDays(1))
                     ),
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination(LocalDate.now().plusDays(2))
                     )
                 )
             )
@@ -73,23 +74,23 @@ class EventGroupEntityUtilImplTest {
             )
         )
 
-        assertEquals(4, amount)
+        assertEquals(2, amount)
     }
 
     @Test
-    fun `allVaccinationEvents returns 5 events if 2 ZZZ vaccination event groups with 2 events each and 1 DCC event`() = runBlocking {
+    fun `allVaccinationEvents returns 3 events if 2 ZZZ vaccination event groups with 2 events with the same dates each and 1 DCC event`() = runBlocking {
         val util = EventGroupEntityUtilImpl(
             remoteEventUtil = fakeRemoteEventUtil(
                 getRemoteEventsFromNonDcc = listOf(
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination(LocalDate.now().plusDays(1))
                     ),
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination(LocalDate.now().plusDays(2))
                     )
                 )
             )
@@ -132,6 +133,6 @@ class EventGroupEntityUtilImplTest {
             )
         )
 
-        assertEquals(5, amount)
+        assertEquals(3, amount)
     }
 }
diff --git a/...rc/test/java/nl/rijksoverheid/ctr/holder/ui/myoverview/utils/DashboardItemUtilImplTest.kt b/...rc/test/java/nl/rijksoverheid/ctr/holder/ui/myoverview/utils/DashboardItemUtilImplTest.kt
@@ -197,7 +197,7 @@ class DashboardItemUtilImplTest {
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination()
                     )
                 )
             )
@@ -222,12 +222,12 @@ class DashboardItemUtilImplTest {
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination()
                     ),
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination()
                     )
                 )
             )
@@ -252,12 +252,12 @@ class DashboardItemUtilImplTest {
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination()
                     ),
                     RemoteEventVaccination(
                         type = "",
                         unique = "",
-                        vaccination = fakeRemoteEventVaccination
+                        vaccination = fakeRemoteEventVaccination()
                     )
                 )
             )