Merge pull request #6401 from espoon-voltti/planned-absences-cannot-be-deleted-from-confirmed-range

Estetään sopimuspoissaolojen muuttaminen suljetulta ajalta

Author: Joosakur

service/src/integrationTest/kotlin/fi/espoo/evaka/reservations/ReservationControllerCitizenIntegrationTest.kt

@@ -1791,78 +1791,7 @@ class ReservationControllerCitizenIntegrationTest : FullApplicationTest(resetDbB
     }
 
     @Test
-    fun `citizen can override billable planned absence in non contract day placement with sick leave after threshold`() {
-        val area = DevCareArea()
-        val daycare =
-            DevDaycare(areaId = area.id, enabledPilotFeatures = setOf(PilotFeature.RESERVATIONS))
-        val employee = DevEmployee()
-
-        val adult = DevPerson()
-        val child = DevPerson()
-
-        db.transaction { tx ->
-            tx.insert(area)
-            tx.insert(daycare)
-            tx.insert(employee)
-
-            tx.insert(adult, DevPersonType.ADULT)
-            tx.insert(child, DevPersonType.CHILD)
-            tx.insertGuardian(adult.id, child.id)
-
-            tx.insert(
-                DevPlacement(
-                    type = PlacementType.PRESCHOOL_DAYCARE,
-                    childId = child.id,
-                    unitId = daycare.id,
-                    startDate = monday,
-                    endDate = tuesday,
-                )
-            )
-
-            tx.insert(
-                DevAbsence(
-                    childId = child.id,
-                    date = monday,
-                    absenceType = AbsenceType.PLANNED_ABSENCE,
-                    modifiedBy = adult.evakaUserId(),
-                    absenceCategory = AbsenceCategory.NONBILLABLE,
-                )
-            )
-            tx.insert(
-                DevAbsence(
-                    childId = child.id,
-                    date = monday,
-                    absenceType = AbsenceType.PLANNED_ABSENCE,
-                    modifiedBy = adult.evakaUserId(),
-                    absenceCategory = AbsenceCategory.BILLABLE,
-                )
-            )
-        }
-
-        postAbsences(
-            adult.user(CitizenAuthLevel.WEAK),
-            AbsenceRequest(
-                childIds = setOf(child.id),
-                dateRange = FiniteDateRange(monday, tuesday),
-                absenceType = AbsenceType.SICKLEAVE,
-            ),
-            mockNow = afterThreshold,
-        )
-
-        assertThat(
-                db.read { tx -> tx.getAbsencesOfChildByRange(child.id, DateRange(monday, tuesday)) }
-            )
-            .extracting({ it.date }, { it.absenceType }, { it.category })
-            .containsExactlyInAnyOrder(
-                Tuple(monday, AbsenceType.SICKLEAVE, AbsenceCategory.NONBILLABLE),
-                Tuple(monday, AbsenceType.SICKLEAVE, AbsenceCategory.BILLABLE),
-                Tuple(tuesday, AbsenceType.SICKLEAVE, AbsenceCategory.NONBILLABLE),
-                Tuple(tuesday, AbsenceType.SICKLEAVE, AbsenceCategory.BILLABLE),
-            )
-    }
-
-    @Test
-    fun `citizen cannot override billable planned absence in contract day placement with sick leave after threshold`() {
+    fun `citizen cannot override planned absence with sick leave after threshold`() {
         val area = DevCareArea()
         val daycare =
             DevDaycare(areaId = area.id, enabledPilotFeatures = setOf(PilotFeature.RESERVATIONS))
@@ -1938,7 +1867,7 @@ class ReservationControllerCitizenIntegrationTest : FullApplicationTest(resetDbB
             )
             .extracting({ it.date }, { it.absenceType }, { it.category })
             .containsExactlyInAnyOrder(
-                Tuple(monday, AbsenceType.SICKLEAVE, AbsenceCategory.NONBILLABLE),
+                Tuple(monday, AbsenceType.PLANNED_ABSENCE, AbsenceCategory.NONBILLABLE),
                 Tuple(monday, AbsenceType.PLANNED_ABSENCE, AbsenceCategory.BILLABLE),
                 Tuple(tuesday, AbsenceType.SICKLEAVE, AbsenceCategory.NONBILLABLE),
                 Tuple(tuesday, AbsenceType.SICKLEAVE, AbsenceCategory.BILLABLE),

service/src/main/kotlin/fi/espoo/evaka/absence/AbsenceQueries.kt

@@ -254,14 +254,8 @@ DELETE FROM absence a
 WHERE child_id = ${bind { (childId, _) -> childId }}
 AND date = ${bind { (_, date) -> date }}
 AND absence_type <> 'FREE_ABSENCE'::absence_type
--- Planned absences cannot be deleted from confirmed range if the child has a contract days service need
-AND (${bind(reservableRange)} @> date OR absence_type <> 'PLANNED_ABSENCE'::absence_type OR category = 'NONBILLABLE' OR NOT EXISTS (
-    SELECT
-    FROM service_need_option sno
-    JOIN service_need sn ON sn.option_id = sno.id AND a.date BETWEEN sn.start_date AND sn.end_date
-    JOIN placement p ON p.id = sn.placement_id AND p.child_id = a.child_id AND a.date BETWEEN p.start_date AND p.end_date
-    WHERE sno.contract_days_per_month IS NOT NULL
-))
+-- Planned absences cannot be deleted from confirmed range
+AND (${bind(reservableRange)} @> date OR absence_type <> 'PLANNED_ABSENCE'::absence_type)
 AND modified_by IN (SELECT id FROM evaka_user where type = 'CITIZEN')
 RETURNING id
 """