Merge pull request #8026 from espoon-voltti/annulment-reason-in-migration

Wnt · web-flow · commit f703220c2a27 · 2025-10-31T16:07:07.000+02:00
Tuen päätösten migraatio: kumoamisen syyn siirto uuteen tietomalliin
diff --git a/frontend/src/lib-common/generated/api-types/document.ts b/frontend/src/lib-common/generated/api-types/document.ts
@@ -179,6 +179,7 @@ export interface ChildDocumentCreateRequest {
 * Generated from fi.espoo.evaka.document.childdocument.ChildDocumentDecision
 */
 export interface ChildDocumentDecision {
+  annulmentReason: string
   createdAt: HelsinkiDateTime
   daycareName: string | null
   decisionNumber: number
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/AssistanceDecisionMigrationService.kt b/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/AssistanceDecisionMigrationService.kt
@@ -128,6 +128,7 @@ class AssistanceDecisionMigrationService(asyncJobRunner: AsyncJobRunner<AsyncJob
                 decisionNumber = decisionNumber,
                 daycareId = decision.selectedUnit?.id,
                 processId = processId,
+                annulmentReason = decision.annulmentReason,
             )
         }
     }
@@ -217,6 +218,7 @@ class AssistanceDecisionMigrationService(asyncJobRunner: AsyncJobRunner<AsyncJob
                 decisionNumber = decisionNumber,
                 daycareId = decision.form.selectedUnit,
                 processId = processId,
+                annulmentReason = decision.annulmentReason,
             )
         }
     }
@@ -610,6 +612,7 @@ private fun Database.Transaction.insertMigratedDocument(
     decisionNumber: Long,
     daycareId: DaycareId?,
     processId: CaseProcessId?,
+    annulmentReason: String,
 ) {
     val userId = EvakaUserId(decisionMaker.raw)
     val systemUser = AuthenticatedUser.SystemInternalUser.evakaUserId
@@ -626,8 +629,8 @@ private fun Database.Transaction.insertMigratedDocument(
         createQuery {
                 sql(
                     """
-        INSERT INTO child_document_decision (created_at, created_by, modified_at, modified_by, status, valid_from, valid_to, decision_number, daycare_id) 
-        VALUES (${bind(decidedAt)}, ${bind(userId)}, ${bind(decidedAt)}, ${bind(userId)}, ${bind(decisionStatus)}, ${bind(validFrom)}, ${bind(decisionValidity.end)}, ${bind(decisionNumber)}, ${bind(daycareId)})
+        INSERT INTO child_document_decision (created_at, created_by, modified_at, modified_by, status, valid_from, valid_to, decision_number, daycare_id, annulment_reason) 
+        VALUES (${bind(decidedAt)}, ${bind(userId)}, ${bind(decidedAt)}, ${bind(userId)}, ${bind(decisionStatus)}, ${bind(validFrom)}, ${bind(decisionValidity.end)}, ${bind(decisionNumber)}, ${bind(daycareId)}, ${bind(annulmentReason)})
         RETURNING id
     """
                 )
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocument.kt b/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocument.kt
@@ -184,6 +184,7 @@ data class ChildDocumentDecision(
     val validity: DateRange?,
     val decisionNumber: Int,
     val daycareName: String?,
+    val annulmentReason: String,
 )
 
 data class ChildDocumentSummary(
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocumentQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocumentQueries.kt
@@ -106,7 +106,8 @@ SELECT
     cdd.created_at AS decision_created_at,
     CASE WHEN cdd.valid_from IS NOT NULL THEN daterange(cdd.valid_from, cdd.valid_to, '[]') END AS decision_validity,
     cdd.decision_number AS decision_decision_number,
-    d.name AS decision_daycare_name
+    d.name AS decision_daycare_name,
+    cdd.annulment_reason AS decision_annulment_reason
 FROM child_document cd
 JOIN document_template dt on cd.template_id = dt.id
 JOIN person ch ON cd.child_id = ch.id
@@ -207,7 +208,8 @@ SELECT
     cdd.created_at AS decision_created_at,
     CASE WHEN cdd.valid_from IS NOT NULL THEN daterange(cdd.valid_from, cdd.valid_to, '[]') END AS decision_validity,
     cdd.decision_number AS decision_decision_number,
-    d.name AS decision_daycare_name
+    d.name AS decision_daycare_name,
+    cdd.annulment_reason AS decision_annulment_reason
 FROM child_document cd
 JOIN document_template dt on cd.template_id = dt.id
 JOIN person p on cd.child_id = p.id
@@ -547,12 +549,13 @@ fun Database.Transaction.insertChildDocumentDecision(
     userId: EvakaUserId,
     validity: DateRange?,
     daycareId: DaycareId?,
+    annulmentReason: String = "",
 ): ChildDocumentDecisionId {
     return createUpdate {
             sql(
                 """
-                INSERT INTO child_document_decision (created_by, modified_by, status, valid_from, valid_to, daycare_id) 
-                VALUES (${bind(userId)}, ${bind(userId)}, ${bind(status)}, ${bind(validity?.start)}, ${bind(validity?.end)}, ${bind(daycareId)})
+                INSERT INTO child_document_decision (created_by, modified_by, status, valid_from, valid_to, daycare_id, annulment_reason) 
+                VALUES (${bind(userId)}, ${bind(userId)}, ${bind(status)}, ${bind(validity?.start)}, ${bind(validity?.end)}, ${bind(daycareId)}, ${bind(annulmentReason)})
                 RETURNING id
             """
             )
diff --git a/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocumentQueriesCitizen.kt b/service/src/main/kotlin/fi/espoo/evaka/document/childdocument/ChildDocumentQueriesCitizen.kt
@@ -44,7 +44,8 @@ SELECT
     cdd.status AS decision_status,
     cdd.created_at AS decision_created_at,
     CASE WHEN cdd.valid_from IS NOT NULL THEN daterange(cdd.valid_from, cdd.valid_to, '[]') END AS decision_validity,
-    cdd.decision_number AS decision_decision_number
+    cdd.decision_number AS decision_decision_number,
+    cdd.annulment_reason AS decision_annulment_reason
 FROM child_document cd
 JOIN document_template dt ON cd.template_id = dt.id
 JOIN person child ON cd.child_id = child.id
@@ -111,7 +112,8 @@ fun Database.Read.getCitizenChildDocument(id: ChildDocumentId): ChildDocumentCit
                     cdd.status AS decision_status,
                     cdd.created_at AS decision_created_at,
                     CASE WHEN cdd.valid_from IS NOT NULL THEN daterange(cdd.valid_from, cdd.valid_to, '[]') END AS decision_validity,
-                    cdd.decision_number AS decision_decision_number
+                    cdd.decision_number AS decision_decision_number,
+                    cdd.annulment_reason AS decision_annulment_reason
                 FROM child_document cd
                 JOIN document_template dt on cd.template_id = dt.id
                 JOIN person p on cd.child_id = p.id
diff --git a/service/src/main/resources/db/migration/V568__child_document_decision_annulment_reason.sql b/service/src/main/resources/db/migration/V568__child_document_decision_annulment_reason.sql
@@ -0,0 +1,2 @@
+ALTER TABLE child_document_decision
+    ADD COLUMN annulment_reason text NOT NULL DEFAULT '';
diff --git a/service/src/main/resources/migrations.txt b/service/src/main/resources/migrations.txt
@@ -563,3 +563,4 @@ V564__add_nekku_order_time.sql
 V565__placement_draft_start_date.sql
 V566__new_preschool_assistance_levels_v3.sql
 V567__nekku_orders_report_index.sql
+V568__child_document_decision_annulment_reason.sql

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ class AssistanceDecisionMigrationService(asyncJobRunner: AsyncJobRunner<AsyncJob`
`128`	`128`	`decisionNumber = decisionNumber,`
`129`	`129`	`daycareId = decision.selectedUnit?.id,`
`130`	`130`	`processId = processId,`
	`131`	`+ annulmentReason = decision.annulmentReason,`
`131`	`132`	`)`
`132`	`133`	`}`
`133`	`134`	`}`
`@@ -217,6 +218,7 @@ class AssistanceDecisionMigrationService(asyncJobRunner: AsyncJobRunner<AsyncJob`
`217`	`218`	`decisionNumber = decisionNumber,`
`218`	`219`	`daycareId = decision.form.selectedUnit,`
`219`	`220`	`processId = processId,`
	`221`	`+ annulmentReason = decision.annulmentReason,`
`220`	`222`	`)`
`221`	`223`	`}`
`222`	`224`	`}`
`@@ -610,6 +612,7 @@ private fun Database.Transaction.insertMigratedDocument(`
`610`	`612`	`decisionNumber: Long,`
`611`	`613`	`daycareId: DaycareId?,`
`612`	`614`	`processId: CaseProcessId?,`
	`615`	`+ annulmentReason: String,`
`613`	`616`	`) {`
`614`	`617`	`val userId = EvakaUserId(decisionMaker.raw)`
`615`	`618`	`val systemUser = AuthenticatedUser.SystemInternalUser.evakaUserId`
`@@ -626,8 +629,8 @@ private fun Database.Transaction.insertMigratedDocument(`
`626`	`629`	`createQuery {`
`627`	`630`	`sql(`
`628`	`631`	`"""`
`629`		`- INSERT INTO child_document_decision (created_at, created_by, modified_at, modified_by, status, valid_from, valid_to, decision_number, daycare_id)`
`630`		`- VALUES (${bind(decidedAt)}, ${bind(userId)}, ${bind(decidedAt)}, ${bind(userId)}, ${bind(decisionStatus)}, ${bind(validFrom)}, ${bind(decisionValidity.end)}, ${bind(decisionNumber)}, ${bind(daycareId)})`
	`632`	`+ INSERT INTO child_document_decision (created_at, created_by, modified_at, modified_by, status, valid_from, valid_to, decision_number, daycare_id, annulment_reason)`
	`633`	`+ VALUES (${bind(decidedAt)}, ${bind(userId)}, ${bind(decidedAt)}, ${bind(userId)}, ${bind(decisionStatus)}, ${bind(validFrom)}, ${bind(decisionValidity.end)}, ${bind(decisionNumber)}, ${bind(daycareId)}, ${bind(annulmentReason)})`
`631`	`634`	`RETURNING id`
`632`	`635`	`"""`
`633`	`636`	`)`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ data class ChildDocumentDecision(`
`184`	`184`	`val validity: DateRange?,`
`185`	`185`	`val decisionNumber: Int,`
`186`	`186`	`val daycareName: String?,`
	`187`	`+ val annulmentReason: String,`
`187`	`188`	`)`
`188`	`189`
`189`	`190`	`data class ChildDocumentSummary(`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTER TABLE child_document_decision`
	`2`	`+ ADD COLUMN annulment_reason text NOT NULL DEFAULT '';`