Merge pull request #6353 from espoon-voltti/application-without-agree…

…ing-guardians-requires-checking Hakemus on tarkistettava jos huoltajat eivät ole sopineet hakemisesta yhdessä
espoon-voltti · Feb 13, 2025 · 376a2ec · 376a2ec
2 parents 29d527f + 8ffe5d7
commit 376a2ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/e2e-test/specs/5_employee/application-details.spec.ts b/frontend/src/e2e-test/specs/5_employee/application-details.spec.ts
@@ -79,7 +79,7 @@ beforeEach(async () => {
       familyWithRestrictedDetailsGuardian.guardian,
       familyWithRestrictedDetailsGuardian.otherGuardian,
       'DAYCARE',
-      'NOT_AGREED'
+      'AGREED'
     ),
     id: fromUuid<ApplicationId>('6a9b1b1e-3fdf-11eb-b378-0242ac130002')
   }

diff --git a/frontend/src/e2e-test/specs/5_employee/application-transitions.spec.ts b/frontend/src/e2e-test/specs/5_employee/application-transitions.spec.ts
@@ -444,7 +444,7 @@ describe('Application transitions', () => {
         familyWithRestrictedDetailsGuardian.guardian,
         familyWithRestrictedDetailsGuardian.otherGuardian,
         'DAYCARE',
-        'NOT_AGREED'
+        'AGREED'
       ),
       id: fromUuid<ApplicationId>('6a9b1b1e-3fdf-11eb-b378-0242ac130002')
     }

diff --git a/service/src/main/kotlin/fi/espoo/evaka/application/ApplicationQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/application/ApplicationQueries.kt
@@ -1063,7 +1063,8 @@ fun Database.Transaction.resetCheckedByAdminAndConfidentiality(
             form.child.assistanceNeeded ||
             form.child.allergies.isNotBlank() ||
             form.child.diet.isNotBlank() ||
-            form.otherInfo.isNotBlank()
+            form.otherInfo.isNotBlank() ||
+            form.secondGuardian?.agreementStatus == OtherGuardianAgreementStatus.NOT_AGREED
 
     execute {
         sql(