Skip to content

Commit 257c80b

Browse files
terolaaksoterolaakso
authored
Merge pull request #6151 from espoon-voltti/fix-group-assignment-timestamps
Korjaus ryhmäpostilaatikon näkyvyyteen kun työntekijä luvitettiin toiseen ryhmään
2 parents b1235b5 + bf0599a commit 257c80b

10 files changed

+199
-88
lines changed

‎service/src/integrationTest/kotlin/fi/espoo/evaka/attendance/MobileRealtimeStaffAttendanceControllerIntegrationTest.kt

+27-27
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import fi.espoo.evaka.shared.StaffAttendanceRealtimeId
1313
import fi.espoo.evaka.shared.auth.AuthenticatedUser
1414
import fi.espoo.evaka.shared.auth.UserRole
1515
import fi.espoo.evaka.shared.auth.insertDaycareAclRow
16-
import fi.espoo.evaka.shared.auth.insertDaycareGroupAcl
16+
import fi.espoo.evaka.shared.auth.syncDaycareGroupAcl
1717
import fi.espoo.evaka.shared.db.Database
1818
import fi.espoo.evaka.shared.dev.DevDaycareGroup
1919
import fi.espoo.evaka.shared.dev.DevDaycareGroupAcl
@@ -84,8 +84,8 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
8484
tx.insert(employee)
8585
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
8686
tx.insertDaycareAclRow(testDaycare2.id, employee.id, UserRole.STAFF)
87-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
88-
tx.insertDaycareGroupAcl(testDaycare2.id, employee.id, listOf(groupId2), now)
87+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
88+
tx.syncDaycareGroupAcl(testDaycare2.id, employee.id, listOf(groupId2), now)
8989

9090
tx.markStaffArrival(
9191
employee.id,
@@ -110,7 +110,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
110110
tx.insert(employee)
111111
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
112112
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
113-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
113+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
114114
}
115115

116116
val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -146,7 +146,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
146146
tx.insert(employee)
147147
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
148148
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
149-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
149+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
150150
}
151151

152152
val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -176,7 +176,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
176176
tx.insert(employee)
177177
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
178178
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
179-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
179+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
180180
}
181181

182182
val arrivalTime = HelsinkiDateTime.of(today, LocalTime.of(8, 0))
@@ -211,7 +211,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
211211
tx.insert(employee)
212212
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
213213
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
214-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
214+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
215215
tx.insert(
216216
DevStaffAttendancePlan(
217217
employeeId = employee.id,
@@ -243,7 +243,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
243243
tx.insert(employee)
244244
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
245245
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
246-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
246+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
247247
tx.insert(
248248
DevStaffAttendancePlan(
249249
employeeId = employee.id,
@@ -276,7 +276,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
276276
tx.insert(employee)
277277
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
278278
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
279-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
279+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
280280
tx.insert(
281281
DevStaffAttendancePlan(
282282
employeeId = employee.id,
@@ -309,7 +309,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
309309
tx.insert(employee)
310310
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
311311
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
312-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
312+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
313313
tx.insert(
314314
DevStaffAttendancePlan(
315315
employeeId = employee.id,
@@ -351,7 +351,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
351351
tx.insert(employee)
352352
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
353353
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
354-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
354+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
355355
tx.insert(
356356
DevStaffAttendancePlan(
357357
employeeId = employee.id,
@@ -376,7 +376,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
376376
tx.insert(employee)
377377
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
378378
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
379-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
379+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
380380
}
381381

382382
val lastLoginBeforeArrival = db.read { db -> db.getEmployeeLastLogin(employee.id) }
@@ -402,7 +402,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
402402
tx.insert(employee)
403403
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
404404
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
405-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
405+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
406406
tx.insert(
407407
DevStaffAttendancePlan(
408408
employeeId = employee.id,
@@ -438,7 +438,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
438438
tx.insert(employee)
439439
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
440440
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
441-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
441+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
442442
tx.insert(
443443
DevStaffAttendancePlan(
444444
employeeId = employee.id,
@@ -464,7 +464,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
464464
tx.insert(employee)
465465
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
466466
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
467-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
467+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
468468
tx.insert(
469469
DevStaffAttendancePlan(
470470
employeeId = employee.id,
@@ -488,7 +488,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
488488
tx.insert(employee)
489489
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
490490
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
491-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
491+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
492492
tx.insert(
493493
DevStaffAttendancePlan(
494494
employeeId = employee.id,
@@ -531,7 +531,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
531531
tx.insert(employee)
532532
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
533533
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
534-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
534+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
535535
tx.insert(
536536
DevStaffAttendancePlan(
537537
employeeId = employee.id,
@@ -570,7 +570,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
570570
tx.insert(employee)
571571
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
572572
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
573-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
573+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
574574
tx.insert(
575575
DevStaffAttendancePlan(
576576
employeeId = employee.id,
@@ -596,7 +596,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
596596
tx.insert(employee)
597597
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
598598
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
599-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
599+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
600600
tx.insert(
601601
DevStaffAttendancePlan(
602602
employeeId = employee.id,
@@ -629,7 +629,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
629629
tx.insert(employee)
630630
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
631631
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
632-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
632+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
633633
tx.insert(
634634
DevStaffAttendancePlan(
635635
employeeId = employee.id,
@@ -671,7 +671,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
671671
tx.insert(employee)
672672
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
673673
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
674-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
674+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
675675
tx.insert(
676676
DevStaffAttendancePlan(
677677
employeeId = employee.id,
@@ -708,7 +708,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
708708
tx.insert(employee)
709709
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
710710
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
711-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
711+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
712712
tx.insert(
713713
DevStaffAttendancePlan(
714714
employeeId = employee.id,
@@ -757,7 +757,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
757757
tx.insert(employee)
758758
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
759759
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
760-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
760+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
761761
tx.insert(
762762
DevStaffAttendancePlan(
763763
employeeId = employee.id,
@@ -792,7 +792,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
792792
tx.insert(employee)
793793
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
794794
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
795-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
795+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
796796
tx.insert(
797797
DevStaffAttendancePlan(
798798
employeeId = employee.id,
@@ -828,7 +828,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
828828
tx.insert(employee)
829829
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
830830
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
831-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
831+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
832832
tx.insert(
833833
DevStaffAttendancePlan(
834834
employeeId = employee.id,
@@ -873,7 +873,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
873873
tx.insert(employee)
874874
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
875875
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
876-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
876+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
877877
tx.insert(
878878
DevStaffAttendancePlan(
879879
employeeId = employee.id,
@@ -908,7 +908,7 @@ class MobileRealtimeStaffAttendanceControllerIntegrationTest :
908908
tx.insert(employee)
909909
tx.insert(DevEmployeePin(userId = employee.id, pin = pinCode))
910910
tx.insertDaycareAclRow(testDaycare.id, employee.id, UserRole.STAFF)
911-
tx.insertDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
911+
tx.syncDaycareGroupAcl(testDaycare.id, employee.id, listOf(groupId), now)
912912
tx.insert(
913913
DevStaffAttendancePlan(
914914
employeeId = employee.id,

‎service/src/integrationTest/kotlin/fi/espoo/evaka/attendance/RealtimeStaffAttendanceControllerIntegrationTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import fi.espoo.evaka.shared.GroupId
1010
import fi.espoo.evaka.shared.auth.AuthenticatedUser
1111
import fi.espoo.evaka.shared.auth.UserRole
1212
import fi.espoo.evaka.shared.auth.insertDaycareAclRow
13-
import fi.espoo.evaka.shared.auth.insertDaycareGroupAcl
13+
import fi.espoo.evaka.shared.auth.syncDaycareGroupAcl
1414
import fi.espoo.evaka.shared.dev.DevDaycareGroup
1515
import fi.espoo.evaka.shared.dev.insert
1616
import fi.espoo.evaka.shared.domain.BadRequest
@@ -63,7 +63,7 @@ class RealtimeStaffAttendanceControllerIntegrationTest :
6363
tx.insertDaycareAclRow(testDaycare2.id, supervisor.id, UserRole.UNIT_SUPERVISOR)
6464
tx.insertDaycareAclRow(testDaycare.id, staff.id, UserRole.STAFF)
6565
tx.insertDaycareAclRow(testDaycare2.id, staff.id, UserRole.STAFF)
66-
tx.insertDaycareGroupAcl(testDaycare.id, staff.id, listOf(groupId1), now)
66+
tx.syncDaycareGroupAcl(testDaycare.id, staff.id, listOf(groupId1), now)
6767

6868
tx.upsertOccupancyCoefficient(
6969
OccupancyCoefficientUpsert(testDaycare.id, staff.id, BigDecimal(7))

0 commit comments

Comments
 (0)