Merge pull request #1808 from Tampere/placement-tool-config

patari · web-flow · commit 7ad20f67a76b · 2025-10-13T16:14:00.000+03:00
Add placement tool config (nokia, kangasala, ylojarvi)
diff --git a/service/src/main/kotlin/fi/kangasala/evaka/KangasalaConfig.kt b/service/src/main/kotlin/fi/kangasala/evaka/KangasalaConfig.kt
@@ -4,6 +4,7 @@
 
 package fi.kangasala.evaka
 
+import fi.espoo.evaka.application.ApplicationStatus
 import fi.espoo.evaka.document.archival.ArchivalIntegrationClient
 import fi.espoo.evaka.espoo.DefaultPasswordSpecification
 import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient
@@ -86,6 +87,7 @@ class KangasalaConfig {
             }
         },
         daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),
+        placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,
     )
 
     @Bean
diff --git a/service/src/main/kotlin/fi/nokiankaupunki/evaka/NokiaConfig.kt b/service/src/main/kotlin/fi/nokiankaupunki/evaka/NokiaConfig.kt
@@ -4,6 +4,7 @@
 
 package fi.nokiankaupunki.evaka
 
+import fi.espoo.evaka.application.ApplicationStatus
 import fi.espoo.evaka.document.archival.ArchivalIntegrationClient
 import fi.espoo.evaka.espoo.DefaultPasswordSpecification
 import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient
@@ -86,6 +87,7 @@ class NokiaConfig {
             }
         },
         daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),
+        placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,
     )
 
     @Bean
diff --git a/service/src/main/kotlin/fi/ylojarvi/evaka/YlojarviConfig.kt b/service/src/main/kotlin/fi/ylojarvi/evaka/YlojarviConfig.kt
@@ -4,6 +4,7 @@
 
 package fi.ylojarvi.evaka
 
+import fi.espoo.evaka.application.ApplicationStatus
 import fi.espoo.evaka.document.archival.ArchivalIntegrationClient
 import fi.espoo.evaka.espoo.DefaultPasswordSpecification
 import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient
@@ -90,6 +91,7 @@ class YlojarviConfig {
             }
         },
         daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),
+        placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,
     )
 
     @Bean
diff --git a/service/src/main/resources/application-kangasala_evaka.yaml b/service/src/main/resources/application-kangasala_evaka.yaml
@@ -19,5 +19,7 @@ evaka:
         post_office: "Kangasala"
   planned_absence:
     enabled_for_hour_based_service_needs: true
+  placement_tool:
+    service_need_option_id: "3b94630b-e01e-4b61-b040-8910baf96e97"
 trevaka:
   municipality: kangasala
diff --git a/service/src/main/resources/application-nokia_evaka.yaml b/service/src/main/resources/application-nokia_evaka.yaml
@@ -19,6 +19,8 @@ evaka:
         post_office: "Nokia"
   planned_absence:
     enabled_for_hour_based_service_needs: true
+  placement_tool:
+    service_need_option_id: "1c5d7ea4-669f-4b4e-8593-353be4c9cea0"
 trevaka:
   municipality: nokia
 nokia:
diff --git a/service/src/main/resources/application-ylojarvi_evaka.yaml b/service/src/main/resources/application-ylojarvi_evaka.yaml
@@ -19,6 +19,8 @@ evaka:
         post_office: "Ylöjärvi"
   planned_absence:
     enabled_for_hour_based_service_needs: true
+  placement_tool:
+    service_need_option_id: "9e6a4660-2f83-40e3-bf27-d9590e93dbf2"
 trevaka:
   municipality: ylojarvi
 ylojarvi:
diff --git a/service/src/test/kotlin/fi/kangasala/evaka/application/KangasalaPlacementToolTest.kt b/service/src/test/kotlin/fi/kangasala/evaka/application/KangasalaPlacementToolTest.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023-2025 Tampere region
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+package fi.kangasala.evaka.application
+
+import fi.espoo.evaka.EvakaEnv
+import fi.kangasala.evaka.AbstractKangasalaIntegrationTest
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import trevaka.assertPlacementToolServiceNeedOptionIdExists
+
+class KangasalaPlacementToolTest : AbstractKangasalaIntegrationTest() {
+    @Autowired
+    private lateinit var evakaEnv: EvakaEnv
+
+    @Test
+    fun `placement tool service need option id exists`() {
+        assertPlacementToolServiceNeedOptionIdExists(db, evakaEnv, "Täydentävä varhaiskasvatus 86–120 tuntia / kuukausi")
+    }
+}
diff --git a/service/src/test/kotlin/fi/nokiankaupunki/evaka/application/NokiaPlacementToolTest.kt b/service/src/test/kotlin/fi/nokiankaupunki/evaka/application/NokiaPlacementToolTest.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023-2025 Tampere region
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+package fi.nokiankaupunki.evaka.application
+
+import fi.espoo.evaka.EvakaEnv
+import fi.nokiankaupunki.evaka.AbstractNokiaIntegrationTest
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import trevaka.assertPlacementToolServiceNeedOptionIdExists
+
+class NokiaPlacementToolTest : AbstractNokiaIntegrationTest() {
+    @Autowired
+    private lateinit var evakaEnv: EvakaEnv
+
+    @Test
+    fun `placement tool service need option id exists`() {
+        assertPlacementToolServiceNeedOptionIdExists(db, evakaEnv, "Täydentävä varhaiskasvatus 0–50 tuntia / kuukausi")
+    }
+}
diff --git a/service/src/test/kotlin/fi/tampere/trevaka/application/TamperePlacementToolTest.kt b/service/src/test/kotlin/fi/tampere/trevaka/application/TamperePlacementToolTest.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023-2025 Tampere region
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+package fi.tampere.trevaka.application
+
+import fi.espoo.evaka.EvakaEnv
+import fi.tampere.trevaka.AbstractTampereIntegrationTest
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import trevaka.assertPlacementToolServiceNeedOptionIdExists
+
+class TamperePlacementToolTest : AbstractTampereIntegrationTest() {
+    @Autowired
+    private lateinit var evakaEnv: EvakaEnv
+
+    @Test
+    fun `placement tool service need option id exists`() {
+        assertPlacementToolServiceNeedOptionIdExists(db, evakaEnv, "Täydentävä varhaiskasvatus, max 5h päivässä")
+    }
+}
diff --git a/service/src/test/kotlin/fi/ylojarvi/evaka/application/YlojarviPlacementToolTest.kt b/service/src/test/kotlin/fi/ylojarvi/evaka/application/YlojarviPlacementToolTest.kt
@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2023-2025 Tampere region
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+package fi.ylojarvi.evaka.application
+
+import fi.espoo.evaka.EvakaEnv
+import fi.ylojarvi.evaka.AbstractYlojarviIntegrationTest
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import trevaka.assertPlacementToolServiceNeedOptionIdExists
+
+class YlojarviPlacementToolTest : AbstractYlojarviIntegrationTest() {
+    @Autowired
+    private lateinit var evakaEnv: EvakaEnv
+
+    @Test
+    fun `placement tool service need option id exists`() {
+        assertPlacementToolServiceNeedOptionIdExists(db, evakaEnv, "Täydentävä varhaiskasvatus 51–85 tuntia / kuukausi")
+    }
+}
diff --git a/service/src/test/kotlin/trevaka/PlacementToolUtils.kt b/service/src/test/kotlin/trevaka/PlacementToolUtils.kt
@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023-2025 Tampere region
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+package trevaka
+
+import fi.espoo.evaka.EvakaEnv
+import fi.espoo.evaka.placement.PlacementType
+import fi.espoo.evaka.serviceneed.findServiceNeedOptionById
+import fi.espoo.evaka.shared.db.Database
+import fi.espoo.evaka.shared.domain.DateRange
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Assertions.assertTrue
+import java.time.LocalDate
+import java.time.Month
+
+fun assertPlacementToolServiceNeedOptionIdExists(db: Database.Connection, evakaEnv: EvakaEnv, nameFi: String) {
+    val serviceNeedOptionId = evakaEnv.placementToolServiceNeedOptionId
+        ?: error("Service need option id is not configured")
+    val serviceNeedOption = db.read { tx -> tx.findServiceNeedOptionById(serviceNeedOptionId) }
+        ?: error("Service need option id $serviceNeedOptionId not found")
+
+    assertThat(serviceNeedOption)
+        .returns(PlacementType.PRESCHOOL_DAYCARE) { it.validPlacementType }
+        .returns(false) { it.defaultOption }
+        .returns(nameFi) { it.nameFi }
+
+    val nextFirstOfAugust = LocalDate.now().withDayOfMonth(1)
+        .let { (if (it.month >= Month.AUGUST) it.plusYears(1) else it).withMonth(8) }
+    assertTrue(DateRange(serviceNeedOption.validFrom, serviceNeedOption.validTo).includes(nextFirstOfAugust))
+}

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`package fi.kangasala.evaka`
`6`	`6`
	`7`	`+import fi.espoo.evaka.application.ApplicationStatus`
`7`	`8`	`import fi.espoo.evaka.document.archival.ArchivalIntegrationClient`
`8`	`9`	`import fi.espoo.evaka.espoo.DefaultPasswordSpecification`
`9`	`10`	`import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient`
`@@ -86,6 +87,7 @@ class KangasalaConfig {`
`86`	`87`	`}`
`87`	`88`	`},`
`88`	`89`	`daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),`
	`90`	`+ placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,`
`89`	`91`	`)`
`90`	`92`
`91`	`93`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`package fi.nokiankaupunki.evaka`
`6`	`6`
	`7`	`+import fi.espoo.evaka.application.ApplicationStatus`
`7`	`8`	`import fi.espoo.evaka.document.archival.ArchivalIntegrationClient`
`8`	`9`	`import fi.espoo.evaka.espoo.DefaultPasswordSpecification`
`9`	`10`	`import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient`
`@@ -86,6 +87,7 @@ class NokiaConfig {`
`86`	`87`	`}`
`87`	`88`	`},`
`88`	`89`	`daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),`
	`90`	`+ placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,`
`89`	`91`	`)`
`90`	`92`
`91`	`93`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`package fi.ylojarvi.evaka`
`6`	`6`
	`7`	`+import fi.espoo.evaka.application.ApplicationStatus`
`7`	`8`	`import fi.espoo.evaka.document.archival.ArchivalIntegrationClient`
`8`	`9`	`import fi.espoo.evaka.espoo.DefaultPasswordSpecification`
`9`	`10`	`import fi.espoo.evaka.invoicing.domain.PaymentIntegrationClient`
`@@ -90,6 +91,7 @@ class YlojarviConfig {`
`90`	`91`	`}`
`91`	`92`	`},`
`92`	`93`	`daycarePlacementPlanEndMonthDay = MonthDay.of(8, 15),`
	`94`	`+ placementToolApplicationStatus = ApplicationStatus.WAITING_DECISION,`
`93`	`95`	`)`
`94`	`96`
`95`	`97`	`@Bean`