Limit access to group account messages based on group assignment date

espoon-voltti · Nov 6, 2024 · b2267b6 · b2267b6
1 parent af51756
commit b2267b6
Show file tree

Hide file tree

Showing 17 changed files with 500 additions and 140 deletions.
diff --git a/frontend/src/e2e-test/dev-api/fixtures.ts b/frontend/src/e2e-test/dev-api/fixtures.ts
@@ -1315,7 +1315,11 @@ export class FamilyBuilder extends FixtureBuilder<Family> {
 
 export class EmployeeBuilder extends FixtureBuilder<DevEmployee> {
   daycareAcl: { unitId: string; role: ScopedRole }[]
-  groupAcl: string[]
+  groupAcl: {
+    groupId: string
+    created?: HelsinkiDateTime
+    updated?: HelsinkiDateTime
+  }[]
 
   constructor(data: DevEmployee) {
     super(data)
@@ -1370,8 +1374,12 @@ export class EmployeeBuilder extends FixtureBuilder<DevEmployee> {
     return this
   }
 
-  withGroupAcl(groupId: string): this {
-    this.groupAcl.push(groupId)
+  withGroupAcl(
+    groupId: string,
+    created?: HelsinkiDateTime,
+    updated?: HelsinkiDateTime
+  ): this {
+    this.groupAcl.push({ groupId, created, updated })
     return this
   }
 
@@ -1387,9 +1395,11 @@ export class EmployeeBuilder extends FixtureBuilder<DevEmployee> {
     }
     if (this.groupAcl.length > 0) {
       await createDaycareGroupAclRows({
-        body: this.groupAcl.map((groupId) => ({
+        body: this.groupAcl.map(({ groupId, created, updated }) => ({
           groupId,
-          employeeId: this.data.id
+          employeeId: this.data.id,
+          created: created ?? HelsinkiDateTime.now(),
+          updated: updated ?? HelsinkiDateTime.now()
         }))
       })
     }

diff --git a/frontend/src/e2e-test/generated/api-types.ts b/frontend/src/e2e-test/generated/api-types.ts
@@ -492,8 +492,10 @@ export interface DevDaycareGroup {
 * Generated from fi.espoo.evaka.shared.dev.DevDaycareGroupAcl
 */
 export interface DevDaycareGroupAcl {
+  created: HelsinkiDateTime
   employeeId: UUID
   groupId: UUID
+  updated: HelsinkiDateTime
 }
 
 /**
@@ -1316,6 +1318,15 @@ export function deserializeJsonDevDaycareGroup(json: JsonOf<DevDaycareGroup>): D
 }
 
 
+export function deserializeJsonDevDaycareGroupAcl(json: JsonOf<DevDaycareGroupAcl>): DevDaycareGroupAcl {
+  return {
+    ...json,
+    created: HelsinkiDateTime.parseIso(json.created),
+    updated: HelsinkiDateTime.parseIso(json.updated)
+  }
+}
+
+
 export function deserializeJsonDevDaycareGroupPlacement(json: JsonOf<DevDaycareGroupPlacement>): DevDaycareGroupPlacement {
   return {
     ...json,

diff --git a/frontend/src/e2e-test/specs/6_mobile/messages.spec.ts b/frontend/src/e2e-test/specs/6_mobile/messages.spec.ts
@@ -132,9 +132,9 @@ beforeEach(async () => {
     roles: []
   })
     .withDaycareAcl(testDaycare.id, 'STAFF')
-    .withGroupAcl(daycareGroup.id)
-    .withGroupAcl(daycareGroup2.id)
-    .withGroupAcl(daycareGroup3.id)
+    .withGroupAcl(daycareGroup.id, mockedDateAt10)
+    .withGroupAcl(daycareGroup2.id, mockedDateAt10)
+    .withGroupAcl(daycareGroup3.id, mockedDateAt10)
     .save()
 
   const staff2 = await Fixture.employee({

diff --git a/frontend/src/e2e-test/specs/7_messaging/messaging-by-staff.spec.ts b/frontend/src/e2e-test/specs/7_messaging/messaging-by-staff.spec.ts
@@ -77,7 +77,7 @@ beforeEach(async () => {
 
   staff = await Fixture.employee()
     .staff(testDaycare.id)
-    .withGroupAcl(testDaycareGroup.id)
+    .withGroupAcl(testDaycareGroup.id, mockedDateAt10, mockedDateAt10)
     .save()
 
   unitSupervisor = await Fixture.employee()

diff --git a/frontend/src/e2e-test/specs/7_messaging/municipal-messaging.spec.ts b/frontend/src/e2e-test/specs/7_messaging/municipal-messaging.spec.ts
@@ -120,7 +120,7 @@ beforeEach(async () => {
   messenger = await Fixture.employee().messenger().save()
   staff = await Fixture.employee()
     .staff(testDaycare.id)
-    .withGroupAcl(testDaycareGroup.id)
+    .withGroupAcl(testDaycareGroup.id, messageSendTime, messageSendTime)
     .save()
 })
 

diff --git a/...otlin/fi/espoo/evaka/attendance/MobileRealtimeStaffAttendanceControllerIntegrationTest.kt b/...otlin/fi/espoo/evaka/attendance/MobileRealtimeStaffAttendanceControllerIntegrationTest.kt
@@ -84,8 +84,8 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
             tx.insertDaycareAclRow(testDaycare2.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
-            tx.insertDaycareGroupAcl(testDaycare2.id, employee.id, listOf(groupId2))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
+            tx.insertDaycareGroupAcl(testDaycare2.id, employee.id, listOf(groupId2), now)
 
             tx.markStaffArrival(
                 employee.id,
@@ -110,7 +110,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
         }
 
         val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -146,7 +146,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
         }
 
         val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -176,7 +176,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
         }
 
         val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -211,7 +211,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -243,7 +243,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -276,7 +276,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -309,7 +309,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -351,7 +351,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -376,7 +376,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
         }
 
         val lastLoginBeforeArrival = db.read { db -> db.getEmployeeLastLogin(employee.id) }
@@ -402,7 +402,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -438,7 +438,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -464,7 +464,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -488,7 +488,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -531,7 +531,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -570,7 +570,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -596,7 +596,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -629,7 +629,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -671,7 +671,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -708,7 +708,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -757,7 +757,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -792,7 +792,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -828,7 +828,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -873,7 +873,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,
@@ -908,7 +908,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
             tx.insert(employee)
             tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
             tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId))
+            tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
             tx.insert(
                 DevStaffAttendancePlan(
                     employeeId = employee.id,

diff --git a/...Test/kotlin/fi/espoo/evaka/attendance/RealtimeStaffAttendanceControllerIntegrationTest.kt b/...Test/kotlin/fi/espoo/evaka/attendance/RealtimeStaffAttendanceControllerIntegrationTest.kt
@@ -63,7 +63,7 @@ class RealtimeStaffAttendanceControllerIntegrationTest :
             tx.insertDaycareAclRow(testDaycare2.id, supervisor.id, UserRole.UNIT_SUPERVISOR)
             tx.insertDaycareAclRow(testDaycare.id, staff.id, UserRole.STAFF)
             tx.insertDaycareAclRow(testDaycare2.id, staff.id, UserRole.STAFF)
-            tx.insertDaycareGroupAcl(testDaycare.id, staff.id, listOf(groupId1))
+            tx.insertDaycareGroupAcl(testDaycare.id, staff.id, listOf(groupId1), now)
 
             tx.upsertOccupancyCoefficient(
                 OccupancyCoefficientUpsert(testDaycare.id, staff.id, BigDecimal(7))

diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/messaging/MessageAccountQueriesTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/messaging/MessageAccountQueriesTest.kt
@@ -84,7 +84,7 @@ class MessageAccountQueriesTest : PureJdbiTest(resetDbBeforeEach = true) {
             it.insertDaycareAclRow(daycareId, supervisorId, UserRole.UNIT_SUPERVISOR)
 
             it.insertDaycareAclRow(daycareId, employee1Id, UserRole.STAFF)
-            it.insertDaycareGroupAcl(daycareId, employee1Id, listOf(groupId))
+            it.insertDaycareGroupAcl(daycareId, employee1Id, listOf(groupId), clock.now())
 
             // employee2 has no groups
             it.insertDaycareAclRow(daycareId, employee2Id, UserRole.STAFF)