Merge pull request #7988 from espoon-voltti/transition-period-preschool-assistance-level-for-vammainen2

Lisätään esiopetuksen tuen taso siirtymäkaudella myös vaikeavammaisille

Author: Joosakur

frontend/src/employee-frontend/components/child-information/assistance/PreschoolAssistanceForm.tsx

@@ -62,6 +62,10 @@ export const levelConfigs: Record<PreschoolAssistanceLevel, LevelConfig> = {
     minStartDate: LocalDate.of(2025, 8, 1),
     maxEndDate: LocalDate.of(2026, 7, 31)
   },
+  CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION: {
+    minStartDate: LocalDate.of(2025, 8, 1),
+    maxEndDate: LocalDate.of(2026, 7, 31)
+  },
   GROUP_SUPPORT: { minStartDate: LocalDate.of(2025, 8, 1) }
 }
 

frontend/src/employee-frontend/components/reports/AssistanceNeedsAndActions.tsx

@@ -201,6 +201,7 @@ const emptyGroupingDataByGroup = (
     CHILD_SUPPORT: 0,
     CHILD_SUPPORT_AND_EXTENDED_COMPULSORY_EDUCATION: 0,
     CHILD_SUPPORT_AND_OLD_EXTENDED_COMPULSORY_EDUCATION: 0,
+    CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION: 0,
     GROUP_SUPPORT: 0
   },
   otherAssistanceMeasureCounts: {
@@ -252,6 +253,7 @@ const emptyGroupingDataByChild = (name: string): GroupingDataByChild => ({
     CHILD_SUPPORT: 0,
     CHILD_SUPPORT_AND_EXTENDED_COMPULSORY_EDUCATION: 0,
     CHILD_SUPPORT_AND_OLD_EXTENDED_COMPULSORY_EDUCATION: 0,
+    CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION: 0,
     GROUP_SUPPORT: 0
   },
   otherAssistanceMeasureCounts: {

frontend/src/lib-common/generated/api-types/assistance.ts

@@ -161,6 +161,7 @@ export const preschoolAssistanceLevels = [
   'CHILD_SUPPORT',
   'CHILD_SUPPORT_AND_EXTENDED_COMPULSORY_EDUCATION',
   'CHILD_SUPPORT_AND_OLD_EXTENDED_COMPULSORY_EDUCATION',
+  'CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION',
   'GROUP_SUPPORT'
 ] as const
 

frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx

@@ -817,9 +817,11 @@ export const fi = {
           CHILD_SUPPORT:
             'Lapsikohtainen tuki ilman varhennettua oppivelvollisuutta (Koskeen)',
           CHILD_SUPPORT_AND_EXTENDED_COMPULSORY_EDUCATION:
-            'Lapsikohtainen tuki ja varhennettu oppivelvollisuus (Koskeen, älä käytä ennen 1.10.2025)',
+            'Lapsikohtainen tuki ja varhennettu oppivelvollisuus (Koskeen)',
           CHILD_SUPPORT_AND_OLD_EXTENDED_COMPULSORY_EDUCATION:
-            'Lapsikohtainen tuki ja vanhan mallinen pidennetty ov - muu kuin vaikeimmin kehitysvammainen (Koskeen, käytössä siirtymäkautena 1.8.2025 - 31.7.2026)',
+            'Lapsikohtainen tuki ja vanhan mallinen pidennetty ov - muu (Koskeen, käytössä siirtymäkautena 1.8.2025 - 31.7.2026)',
+          CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION:
+            'Lapsikohtainen tuki ja vanhan mallinen pidennetty ov - kehitysvamma 2 (Koskeen, käytössä siirtymäkautena 1.8.2025 - 31.7.2026)',
           GROUP_SUPPORT: 'Ryhmäkohtaiset tukimuodot'
         },
         otherAssistanceMeasureType: {

service/src/integrationTest/kotlin/fi/espoo/evaka/koski/KoskiIntegrationTest.kt

@@ -469,7 +469,7 @@ class KoskiIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
     }
 
     @Test
-    fun `transition period preschool assistance info is converted to Koski extra information`() {
+    fun `transition period preschool assistance info (vammainen) is converted to Koski extra information`() {
         val assistance =
             DevPreschoolAssistance(
                 modifiedBy = testDecisionMaker_1.toEvakaUser(),
@@ -497,6 +497,36 @@ class KoskiIntegrationTest : FullApplicationTest(resetDbBeforeEach = true) {
         )
     }
 
+    @Test
+    fun `transition period preschool assistance info (vaikeasti vammainen) is converted to Koski extra information`() {
+        val assistance =
+            DevPreschoolAssistance(
+                modifiedBy = testDecisionMaker_1.toEvakaUser(),
+                childId = testChild_1.id,
+                validDuring = testPeriod(0L to 1L),
+                level =
+                    PreschoolAssistanceLevel.CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION,
+            )
+
+        insertPlacement(testChild_1)
+        db.transaction { tx -> tx.insert(assistance) }
+
+        koskiTester.triggerUploads(today = preschoolTerm2019.end.plusDays(1))
+
+        assertEquals(
+            Lisätiedot(
+                vammainen = null,
+                vaikeastiVammainen = listOf(Aikajakso.from(assistance.validDuring)),
+                pidennettyOppivelvollisuus = Aikajakso.from(assistance.validDuring),
+                varhennetunOppivelvollisuudenJaksot = null,
+                kuljetusetu = null,
+                erityisenTuenPäätökset = null,
+                tuenPäätöksenJaksot = listOf(Tukijakso.from(assistance.validDuring)),
+            ),
+            koskiEndpoint.getStudyRights().values.single().opiskeluoikeus.lisätiedot,
+        )
+    }
+
     @Test
     fun `post-2026 preschool assistance info is converted to Koski extra information`() {
         data class TestCase(val period: FiniteDateRange, val level: PreschoolAssistanceLevel)

service/src/main/kotlin/fi/espoo/evaka/assistance/Assistance.kt

@@ -74,6 +74,11 @@ enum class PreschoolAssistanceLevel(
         minStartDate = LocalDate.of(2025, 8, 1),
         maxEndDate = LocalDate.of(2026, 7, 31),
     ),
+    // deprecated, only available during the transition year
+    CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION(
+        minStartDate = LocalDate.of(2025, 8, 1),
+        maxEndDate = LocalDate.of(2026, 7, 31),
+    ),
     GROUP_SUPPORT(minStartDate = LocalDate.of(2025, 8, 1));
 
     override val sqlType: String = "preschool_assistance_level"

service/src/main/kotlin/fi/espoo/evaka/koski/KoskiData.kt

@@ -280,6 +280,7 @@ data class KoskiActivePreschoolDataRaw(
     val childSupport: DateSet,
     val childSupportAndExtendedCompulsoryEducation: DateSet,
     val childSupportAndOldExtendedCompulsoryEducation: DateSet,
+    val childSupport2AndOldExtendedCompulsoryEducation: DateSet,
 ) : KoskiActiveDataRaw(OpiskeluoikeudenTyyppiKoodi.PRESCHOOL) {
     override fun getHolidayDates(): DateSet = DateSet.of()
 
@@ -314,6 +315,8 @@ data class KoskiActivePreschoolDataRaw(
         // used only during the transition year
         val childSupportWithOldEce =
             childSupportAndOldExtendedCompulsoryEducation.intersection(listOf(placementSpan))
+        val childSupport2WithOldEce =
+            childSupport2AndOldExtendedCompulsoryEducation.intersection(listOf(placementSpan))
 
         // these are deprecated after about 1.8.2026
         val specialSupportWithoutEce = specialSupport.intersection(listOf(placementSpan))
@@ -324,17 +327,23 @@ data class KoskiActivePreschoolDataRaw(
 
         // Koski only accepts one range of old pidennetty oppivelvollisuus
         val longestOldEce =
-            level1.addAll(level2).addAll(childSupportWithOldEce).ranges().maxByOrNull {
-                it.durationInDays()
-            }
+            level1
+                .addAll(level2)
+                .addAll(childSupportWithOldEce)
+                .addAll(childSupport2WithOldEce)
+                .ranges()
+                .maxByOrNull { it.durationInDays() }
 
         // these replacements are introduced around 1.8.2026
         val childSupportWithoutEce = childSupport.intersection(listOf(placementSpan))
         val childSupportWithNewEce =
             childSupportAndExtendedCompulsoryEducation.intersection(listOf(placementSpan))
 
         val allChildSupport =
-            childSupportWithoutEce.addAll(childSupportWithNewEce).addAll(childSupportWithOldEce)
+            childSupportWithoutEce
+                .addAll(childSupportWithNewEce)
+                .addAll(childSupportWithOldEce)
+                .addAll(childSupport2WithOldEce)
 
         // Koski only accepts one range
         val longestTransportBenefit =
@@ -351,7 +360,12 @@ data class KoskiActivePreschoolDataRaw(
                         .takeIf { it.isNotEmpty() },
                 // deprecated
                 vaikeastiVammainen =
-                    level2.ranges().map { Aikajakso.from(it) }.toList().takeIf { it.isNotEmpty() },
+                    level2
+                        .addAll(childSupport2WithOldEce)
+                        .ranges()
+                        .map { Aikajakso.from(it) }
+                        .toList()
+                        .takeIf { it.isNotEmpty() },
                 // deprecated
                 pidennettyOppivelvollisuus = longestOldEce?.let { Aikajakso.from(it) },
                 varhennetunOppivelvollisuudenJaksot =

service/src/main/resources/db/migration/R__koski_views.sql

@@ -80,7 +80,8 @@ BEGIN ATOMIC
             coalesce(transport_benefit, '{}'),
             coalesce(child_support, '{}'),
             coalesce(child_support_and_extended_compulsory_education, '{}'),
-            coalesce(child_support_and_old_extended_compulsory_education, '{}')
+            coalesce(child_support_and_old_extended_compulsory_education, '{}'),
+            coalesce(child_support_2_and_old_extended_compulsory_education, '{}')
         ) AS input_data
     FROM koski_placement(today, sync_range_start) p
     JOIN koski_unit d ON p.unit_id = d.id
@@ -110,7 +111,10 @@ BEGIN ATOMIC
             ) AS child_support_and_extended_compulsory_education,
             range_agg(valid_during) FILTER (
                 WHERE level = 'CHILD_SUPPORT_AND_OLD_EXTENDED_COMPULSORY_EDUCATION'
-            ) AS child_support_and_old_extended_compulsory_education
+            ) AS child_support_and_old_extended_compulsory_education,
+            range_agg(valid_during) FILTER (
+                WHERE level = 'CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION'
+            ) AS child_support_2_and_old_extended_compulsory_education
         FROM preschool_assistance pa
         WHERE pa.child_id = p.child_id
         AND pa.valid_during && range_merge(placements)

service/src/main/resources/db/migration/V566__new_preschool_assistance_levels_v3.sql

@@ -0,0 +1,3 @@
+ALTER TYPE preschool_assistance_level ADD VALUE 'CHILD_SUPPORT_2_AND_OLD_EXTENDED_COMPULSORY_EDUCATION';
+
+ALTER TYPE koski_preschool_input_data ADD ATTRIBUTE child_support_2_and_old_extended_compulsory_education datemultirange;

service/src/main/resources/migrations.txt

@@ -561,3 +561,4 @@ V562__calendar_event_nekku_unordered_meals.sql
 V563__staff_attendance_realtime_constraint_change.sql
 V564__add_nekku_order_time.sql
 V565__placement_draft_start_date.sql
+V566__new_preschool_assistance_levels_v3.sql