WIP

espoon-voltti · Nov 27, 2024 · c4e2485 · c4e2485
1 parent 60eecec
commit c4e2485
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/TestFixtures.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/TestFixtures.kt
@@ -38,6 +38,7 @@ import fi.espoo.evaka.shared.dev.DevCareArea
 import fi.espoo.evaka.shared.dev.DevDaycare
 import fi.espoo.evaka.shared.dev.DevDaycareGroup
 import fi.espoo.evaka.shared.dev.DevEmployee
+import fi.espoo.evaka.shared.dev.DevMobileDevice
 import fi.espoo.evaka.shared.dev.DevPerson
 import fi.espoo.evaka.shared.dev.DevPreschoolTerm
 import fi.espoo.evaka.shared.dev.insert
@@ -753,3 +754,6 @@ fun DevPerson.toEvakaUser(type: EvakaUserType) =
         name = this.lastName + " " + this.firstName,
         type = type,
     )
+
+fun DevMobileDevice.toEvakaUser() =
+    EvakaUser(id = EvakaUserId(this.id.raw), name = this.name, type = EvakaUserType.MOBILE_DEVICE)
diff --git a/...ice/src/integrationTest/kotlin/fi/espoo/evaka/attendance/GetAttendancesIntegrationTest.kt b/...ice/src/integrationTest/kotlin/fi/espoo/evaka/attendance/GetAttendancesIntegrationTest.kt
@@ -13,6 +13,7 @@ import fi.espoo.evaka.placement.PlacementType
 import fi.espoo.evaka.reservations.ReservationResponse
 import fi.espoo.evaka.shared.ChildId
 import fi.espoo.evaka.shared.DaycareId
+import fi.espoo.evaka.shared.EmployeeId
 import fi.espoo.evaka.shared.GroupId
 import fi.espoo.evaka.shared.MobileDeviceId
 import fi.espoo.evaka.shared.PlacementId
@@ -22,6 +23,7 @@ import fi.espoo.evaka.shared.dev.DevBackupCare
 import fi.espoo.evaka.shared.dev.DevDaycareGroup
 import fi.espoo.evaka.shared.dev.DevDaycareGroupPlacement
 import fi.espoo.evaka.shared.dev.DevEmployee
+import fi.espoo.evaka.shared.dev.DevMobileDevice
 import fi.espoo.evaka.shared.dev.DevPersonType
 import fi.espoo.evaka.shared.dev.DevPlacement
 import fi.espoo.evaka.shared.dev.DevReservation
@@ -55,10 +57,8 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
 
     // TODO Re-write this a bit to use DevMobileDevice instead of what it actually does.
 
-    private val evakaUser2 = DevEmployee()
     private val mobileUser = AuthenticatedUser.MobileDevice(MobileDeviceId(UUID.randomUUID()))
-    private val mobileUser2 =
-        AuthenticatedUser.MobileDevice(MobileDeviceId(UUID.randomUUID()), evakaUser2.id)
+    private val mobileUser2 = DevMobileDevice(unitId = testDaycare2.id)
     private val groupId = GroupId(UUID.randomUUID())
     private val groupId2 = GroupId(UUID.randomUUID())
     private val groupName = "Testaajat"
@@ -67,6 +67,10 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
     private val placementStart = now.toLocalDate().minusDays(30)
     private val placementEnd = now.toLocalDate().plusDays(30)
 
+    private val user2 = mobileUser2.toEvakaUser()
+    private val employee2 =
+        DevEmployee(id = EmployeeId(user2.id.raw), lastName = user2.name, firstName = "")
+
     @BeforeEach
     fun beforeEach() {
         db.transaction { tx ->
@@ -95,7 +99,8 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                 )
             )
             tx.createMobileDeviceToUnit(mobileUser.id, testDaycare.id)
-            tx.createMobileDeviceToUnit(mobileUser2.id, testDaycare2.id)
+            tx.insert(employee2)
+            tx.insert(mobileUser2)
         }
     }
 
@@ -367,7 +372,7 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                 departed = null,
             )
         }
-        val childInBackup = expectOneChildAttendance(backupUnitId, mobileUser2)
+        val childInBackup = expectOneChildAttendance(backupUnitId, mobileUser2.user)
         assertEquals(AttendanceStatus.PRESENT, childInBackup.status)
         assertNotNull(childInBackup.attendances)
         assertNull(childInBackup.attendances[0].departed)
@@ -399,7 +404,7 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                 departed = null,
             )
         }
-        val childInBackup = expectOneChildAttendance(backupUnitId, mobileUser2)
+        val childInBackup = expectOneChildAttendance(backupUnitId, mobileUser2.user)
         assertEquals(AttendanceStatus.PRESENT, childInBackup.status)
         assertNotNull(childInBackup.attendances)
         assertNull(childInBackup.attendances[0].departed)
@@ -420,7 +425,7 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                     startTime = reservationStart,
                     endTime = reservationEnd,
                     createdAt = now,
-                    createdBy = mobileUser2.evakaUserId,
+                    createdBy = mobileUser2.toEvakaUser().id,
                 )
             )
         }
@@ -431,7 +436,7 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                     TimeRange(reservationStart, reservationEnd),
                     true,
                     now,
-                    evakaUser2.toEvakaUser(),
+                    mobileUser2.toEvakaUser(),
                 )
             ),
             child.reservations,
@@ -447,13 +452,13 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                     date = now.toLocalDate(),
                     startTime = null,
                     endTime = null,
-                    createdBy = mobileUser2.evakaUserId,
+                    createdBy = mobileUser2.toEvakaUser().id,
                 )
             )
         }
         val child = expectOneChild()
         assertEquals(
-            listOf(ReservationResponse.NoTimes(true, now, evakaUser2.toEvakaUser())),
+            listOf(ReservationResponse.NoTimes(true, now, mobileUser2.toEvakaUser())),
             child.reservations,
         )
     }
@@ -478,18 +483,18 @@ class GetAttendancesIntegrationTest : FullApplicationTest(resetDbBeforeEach = tr
                     date = now.toLocalDate(),
                     startTime = reservationStart,
                     endTime = reservationEnd,
-                    createdBy = mobileUser2.evakaUserId,
+                    createdBy = mobileUser2.toEvakaUser().id,
                 )
             )
         }
-        val childInBackup = expectOneChild(backupUnitId, mobileUser2)
+        val childInBackup = expectOneChild(backupUnitId, mobileUser2.user)
         assertEquals(
             listOf(
                 ReservationResponse.Times(
                     TimeRange(reservationStart, reservationEnd),
                     true,
                     now,
-                    evakaUser2.toEvakaUser(),
+                    mobileUser2.toEvakaUser(),
                 )
             ),
             childInBackup.reservations,

diff --git a/...ionTest/kotlin/fi/espoo/evaka/reservations/ReservationControllerCitizenIntegrationTest.kt b/...ionTest/kotlin/fi/espoo/evaka/reservations/ReservationControllerCitizenIntegrationTest.kt
@@ -1241,15 +1241,15 @@ class ReservationControllerCitizenIntegrationTest : FullApplicationTest(resetDbB
         val area = DevCareArea()
         val daycare =
             DevDaycare(areaId = area.id, enabledPilotFeatures = setOf(PilotFeature.RESERVATIONS))
-       // val employee = DevEmployee()
+        // val employee = DevEmployee()
 
         val adult = DevPerson()
         val child = DevPerson()
 
         db.transaction { tx ->
             tx.insert(area)
             tx.insert(daycare)
-            //tx.insert(employee)
+            // tx.insert(employee)
 
             tx.insert(adult, DevPersonType.ADULT)
             tx.insert(child, DevPersonType.CHILD)

diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DevApi.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DevApi.kt
@@ -2155,7 +2155,10 @@ data class DevMobileDevice(
     val name: String = "Laite",
     val longTermToken: UUID? = null,
     val pushNotificationCategories: Set<PushNotificationCategory> = emptySet(),
-)
+) {
+    val user: AuthenticatedUser.MobileDevice
+        @JsonIgnore get() = AuthenticatedUser.MobileDevice(id)
+}
 
 data class DevPersonalMobileDevice(
     val id: MobileDeviceId = MobileDeviceId(UUID.randomUUID()),