Merge pull request #5724 from espoon-voltti/improve-unit-application-…

…process-counter Ei lasketa huoltajalla vahvistettavana olevia hakemuksia yksikön hakuprosessi-välilehden huomio-lukumäärään
espoon-voltti · Sep 26, 2024 · 0e577c2 · 0e577c2
2 parents c801158 + c99f6fd
commit 0e577c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/service/src/main/kotlin/fi/espoo/evaka/application/Application.kt b/service/src/main/kotlin/fi/espoo/evaka/application/Application.kt
@@ -158,7 +158,7 @@ enum class ApplicationType : DatabaseEnum {
     override val sqlType: String = "application_type"
 }
 
-enum class ApplicationStatus {
+enum class ApplicationStatus : DatabaseEnum {
     CREATED,
     SENT,
     WAITING_PLACEMENT,
@@ -168,7 +168,9 @@ enum class ApplicationStatus {
     WAITING_CONFIRMATION,
     REJECTED,
     ACTIVE,
-    CANCELLED,
+    CANCELLED;
+
+    override val sqlType: String = "application_status_type"
 }
 
 enum class ApplicationOrigin : DatabaseEnum {

diff --git a/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/DaycareController.kt b/service/src/main/kotlin/fi/espoo/evaka/daycare/controllers/DaycareController.kt
@@ -46,8 +46,8 @@ import fi.espoo.evaka.placement.UnitChildrenCapacityFactors
 import fi.espoo.evaka.placement.getDetailedDaycarePlacements
 import fi.espoo.evaka.placement.getMissingGroupPlacements
 import fi.espoo.evaka.placement.getTerminatedPlacements
-import fi.espoo.evaka.placement.getUnitApplicationNotifications
 import fi.espoo.evaka.placement.getUnitChildrenCapacities
+import fi.espoo.evaka.placement.getWaitingUnitConfirmationApplicationsCount
 import fi.espoo.evaka.serviceneed.application.getUndecidedServiceApplicationsByUnit
 import fi.espoo.evaka.shared.BackupCareId
 import fi.espoo.evaka.shared.DaycareCaretakerId
@@ -639,7 +639,7 @@ class DaycareController(
                                 daycareId,
                             )
                         )
-                            tx.getUnitApplicationNotifications(daycareId)
+                            tx.getWaitingUnitConfirmationApplicationsCount(daycareId)
                         else 0
 
                     val serviceApplications =

diff --git a/service/src/main/kotlin/fi/espoo/evaka/placement/PlacementPlanQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/placement/PlacementPlanQueries.kt
@@ -251,23 +251,15 @@ WHERE id = ${bind(guardianId)}
         .exactlyOneOrNull<Boolean>()
 }
 
-fun Database.Read.getUnitApplicationNotifications(unitId: DaycareId): Int {
-    val applicationStatus =
-        listOf(
-            ApplicationStatus.WAITING_UNIT_CONFIRMATION,
-            ApplicationStatus.WAITING_MAILING,
-            ApplicationStatus.WAITING_CONFIRMATION,
-        )
-    val unitConfirmationStatus = PlacementPlanConfirmationStatus.REJECTED
-
+fun Database.Read.getWaitingUnitConfirmationApplicationsCount(unitId: DaycareId): Int {
     return createQuery {
             sql(
                 """
 SELECT COUNT(*)
 FROM placement_plan pp
 JOIN application a ON pp.application_id = a.id
-WHERE unit_id = ${bind(unitId)} AND a.status = ANY(${bind(applicationStatus)}::application_status_type[])
-AND pp.unit_confirmation_status != ${bind(unitConfirmationStatus)}::confirmation_status
+WHERE unit_id = ${bind(unitId)} AND a.status = ${bind(ApplicationStatus.WAITING_UNIT_CONFIRMATION)}
+AND pp.unit_confirmation_status != ${bind(PlacementPlanConfirmationStatus.REJECTED)}
 """
             )
         }