Merge pull request #7942 from espoon-voltti/present-in-group-fix

Korjataan mobiiliin "Muu syy" -tyyppisten työaikakirjausten muokkaus

Author: patari

frontend/src/employee-mobile-frontend/staff-attendance/StaffAttendanceEditPage.tsx

@@ -40,6 +40,7 @@ import HelsinkiDateTime from 'lib-common/helsinki-date-time'
 import LocalDate from 'lib-common/local-date'
 import LocalTime from 'lib-common/local-time'
 import { useQueryResult } from 'lib-common/query'
+import { presentInGroup } from 'lib-common/staff-attendance'
 import { useIdRouteParam } from 'lib-common/useRouteParams'
 import UnderRowStatusIcon from 'lib-components/atoms/StatusIcon'
 import Title from 'lib-components/atoms/Title'
@@ -73,7 +74,9 @@ import { StaffMemberPageContainer } from './components/StaffMemberPageContainer'
 import { staffAttendanceMutation, staffAttendanceQuery } from './queries'
 import { toStaff } from './utils'
 
-const typesWithoutGroup: StaffAttendanceType[] = ['TRAINING', 'OTHER_WORK']
+const typesWithoutGroup: StaffAttendanceType[] = staffAttendanceTypes.filter(
+  (type) => !presentInGroup(type)
+)
 const emptyGroupIdDomValue = ''
 
 const getDeparted = (
@@ -126,7 +129,7 @@ const staffAttendanceForm = mapped(
       output.arrivedTime,
       output.departedTime
     ),
-    hasStaffOccupancyEffect: ['TRAINING', 'OTHER_WORK'].includes(output.type)
+    hasStaffOccupancyEffect: typesWithoutGroup.includes(output.type)
       ? false
       : output.occupancyEffect
   })
@@ -680,7 +683,7 @@ const StaffAttendanceEditor = ({
       </FixedSpaceRow>
       <Gap size="s" />
       {featureFlags.staffAttendanceTypes &&
-      ['TRAINING', 'OTHER_WORK'].includes(type.value()) ? null : (
+      typesWithoutGroup.includes(type.value()) ? null : (
         <CheckboxF
           bind={occupancyEffect}
           label={i18n.staff.staffOccupancyEffect}

frontend/src/lib-common/staff-attendance.ts

@@ -4,11 +4,15 @@
 
 import type { StaffAttendanceType } from './generated/api-types/attendance'
 
-export function presentInGroup(type: StaffAttendanceType) {
-  return !(
-    type === 'TRAINING' ||
-    type === 'OTHER_WORK' ||
-    type === 'SICKNESS' ||
-    type === 'CHILD_SICKNESS'
-  )
+const presentInGroupByType: Record<StaffAttendanceType, boolean> = {
+  PRESENT: true,
+  OTHER_WORK: false,
+  TRAINING: false,
+  OVERTIME: true,
+  JUSTIFIED_CHANGE: true,
+  SICKNESS: false,
+  CHILD_SICKNESS: false
 }
+
+export const presentInGroup = (type: StaffAttendanceType): boolean =>
+  presentInGroupByType[type]

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

@@ -30,6 +30,8 @@ import kotlin.test.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.EnumSource
 import org.springframework.beans.factory.annotation.Autowired
 
 class RealtimeStaffAttendanceControllerIntegrationTest :
@@ -269,6 +271,32 @@ class RealtimeStaffAttendanceControllerIntegrationTest :
         }
     }
 
+    @ParameterizedTest
+    @EnumSource(StaffAttendanceType::class)
+    fun `Staff attendance type upsert works`(type: StaffAttendanceType) {
+        realtimeStaffAttendanceController.upsertDailyStaffRealtimeAttendances(
+            dbInstance(),
+            unitSupervisor,
+            MockEvakaClock(now),
+            RealtimeStaffAttendanceController.StaffAttendanceBody(
+                unitId = testDaycare.id,
+                date = now.toLocalDate(),
+                employeeId = testDecisionMaker_2.id,
+                entries =
+                    listOf(
+                        RealtimeStaffAttendanceController.StaffAttendanceUpsert(
+                            id = null,
+                            groupId = groupId1.takeIf { type.presentInGroup() },
+                            arrived = now.minusHours(3),
+                            departed = now.minusHours(2),
+                            type = type,
+                            hasStaffOccupancyEffect = false,
+                        )
+                    ),
+            ),
+        )
+    }
+
     private fun getAttendances(unitId: DaycareId): StaffAttendanceResponse {
         return realtimeStaffAttendanceController.getRealtimeStaffAttendances(
             dbInstance(),

service/src/integrationTest/kotlin/fi/espoo/evaka/occupancy/OccupancyTest.kt

@@ -626,18 +626,7 @@ class OccupancyTest : PureJdbiTest(resetDbBeforeEach = true) {
     }
 
     @ParameterizedTest(name = "Realized occupancy with realtime staff attendance type {0}")
-    @EnumSource(
-        names =
-            [
-                "PRESENT",
-                "OVERTIME",
-                "JUSTIFIED_CHANGE",
-                "TRAINING",
-                "OTHER_WORK",
-                "SICKNESS",
-                "CHILD_SICKNESS",
-            ]
-    )
+    @EnumSource(StaffAttendanceType::class)
     fun `calculateDailyGroupOccupancyValues with different realtime staff attendance types`(
         type: StaffAttendanceType
     ) {

service/src/main/kotlin/fi/espoo/evaka/attendance/MobileUnitController.kt

@@ -198,7 +198,7 @@ fun Database.Read.fetchUnitInfo(unitId: DaycareId, date: LocalDate): UnitInfo {
                 WHERE sa.departed IS NULL AND dc.id = ${bind(unitId)}
                   AND daterange(dg.start_date, dg.end_date, '[]') @> ${bind(date)}
                   AND 'REALTIME_STAFF_ATTENDANCE' = ANY(dc.enabled_pilot_features)
-                  AND sa.type NOT IN ('OTHER_WORK', 'TRAINING')
+                  AND sa.type = ANY (${bind(StaffAttendanceType.PRESENT_IN_GROUP_TYPES)})
         
                 UNION ALL
         

service/src/main/kotlin/fi/espoo/evaka/attendance/StaffAttendance.kt

@@ -41,6 +41,10 @@ enum class StaffAttendanceType : DatabaseEnum {
             CHILD_SICKNESS -> false
             else -> true
         }
+
+    companion object {
+        val PRESENT_IN_GROUP_TYPES = entries.filter { it.presentInGroup() }
+    }
 }
 
 data class CurrentDayStaffAttendanceResponse(

service/src/main/kotlin/fi/espoo/evaka/occupancy/Occupancy.kt

@@ -6,6 +6,7 @@ package fi.espoo.evaka.occupancy
 
 import fi.espoo.evaka.absence.AbsenceCategory
 import fi.espoo.evaka.application.fetchApplicationDetails
+import fi.espoo.evaka.attendance.StaffAttendanceType
 import fi.espoo.evaka.attendance.occupancyCoefficientSeven
 import fi.espoo.evaka.daycare.CareType
 import fi.espoo.evaka.daycare.domain.ProviderType
@@ -299,7 +300,7 @@ FROM staff_attendance_realtime
 WHERE departed IS NOT NULL
 AND group_id = ANY(${bind(groups)})
 AND tstzrange(arrived, departed) && ${bind(range)}
-AND type = ANY($presentStaffAttendanceTypes)
+AND type = ANY(${bind(StaffAttendanceType.PRESENT_IN_GROUP_TYPES)})
 
 UNION ALL
 

service/src/main/kotlin/fi/espoo/evaka/occupancy/RealtimeOccupancy.kt

@@ -175,9 +175,6 @@ WHERE
         .toList<ChildOccupancyAttendance>()
 }
 
-val presentStaffAttendanceTypes =
-    "'{${StaffAttendanceType.entries.filter { it.presentInGroup() }.joinToString()}}'::staff_attendance_type[]"
-
 fun Database.Read.getStaffOccupancyAttendances(
     unitId: DaycareId,
     timeRange: HelsinkiDateTimeRange,
@@ -194,7 +191,7 @@ FROM staff_attendance_realtime sa
 JOIN daycare_group dg ON dg.id = sa.group_id
 WHERE
     dg.daycare_id = ${bind(unitId)} AND tstzrange(sa.arrived, sa.departed) && ${bind(timeRange)} AND
-    type = ANY($presentStaffAttendanceTypes) AND
+    type = ANY(${bind(StaffAttendanceType.PRESENT_IN_GROUP_TYPES)}) AND
     ${predicate(groupFilter.forTable("sa"))}
 
 UNION ALL