WIP

espoon-voltti · Oct 2, 2024 · ed1638a · ed1638a
1 parent 94f83d2
commit ed1638a
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 22 deletions.
diff --git a/frontend/src/e2e-test/generated/api-types.ts b/frontend/src/e2e-test/generated/api-types.ts
@@ -35,6 +35,7 @@ import { DocumentContent } from 'lib-common/generated/api-types/document'
 import { DocumentStatus } from 'lib-common/generated/api-types/document'
 import { DocumentTemplateContent } from 'lib-common/generated/api-types/document'
 import { DocumentType } from 'lib-common/generated/api-types/document'
+import { EvakaUser } from 'lib-common/generated/api-types/user'
 import { FeeAlterationWithEffect } from 'lib-common/generated/api-types/invoicing'
 import { FeeDecisionThresholds } from 'lib-common/generated/api-types/invoicing'
 import { IncomeEffect } from 'lib-common/generated/api-types/invoicing'
@@ -189,7 +190,7 @@ export interface DevAssistanceFactor {
   childId: UUID
   id: UUID
   modified: HelsinkiDateTime
-  modifiedBy: UUID
+  modifiedBy: EvakaUser
   validDuring: FiniteDateRange
 }
 
@@ -467,7 +468,7 @@ export interface DevDaycareAssistance {
   id: UUID
   level: DaycareAssistanceLevel
   modified: HelsinkiDateTime
-  modifiedBy: UUID
+  modifiedBy: EvakaUser
   validDuring: FiniteDateRange
 }
 
@@ -643,7 +644,7 @@ export interface DevOtherAssistanceMeasure {
   childId: UUID
   id: UUID
   modified: HelsinkiDateTime
-  modifiedBy: UUID
+  modifiedBy: EvakaUser
   type: OtherAssistanceMeasureType
   validDuring: FiniteDateRange
 }
@@ -772,7 +773,7 @@ export interface DevPreschoolAssistance {
   id: UUID
   level: PreschoolAssistanceLevel
   modified: HelsinkiDateTime
-  modifiedBy: UUID
+  modifiedBy: EvakaUser
   validDuring: FiniteDateRange
 }
 

diff --git a/...d-information/assistance-need/voucher-coefficient/AssistanceNeedVoucherCoefficientRow.tsx b/...d-information/assistance-need/voucher-coefficient/AssistanceNeedVoucherCoefficientRow.tsx
@@ -51,7 +51,7 @@ export default React.memo(function AssistanceNeedVoucherCoefficientRow({
   const { i18n } = useTranslation()
   const t = i18n.childInformation.assistanceNeedVoucherCoefficient
 
-  const { coefficient, id, modifiedAt, modifiedByName, validityPeriod } =
+  const { coefficient, id, modifiedAt, modifiedBy, validityPeriod } =
     voucherCoefficient
 
   const isUpdating =
@@ -96,7 +96,7 @@ export default React.memo(function AssistanceNeedVoucherCoefficientRow({
         >
           {!isUpdating && modifiedAt ? (
             <Tooltip
-              tooltip={modifiedByName ? t.lastModifiedBy(modifiedByName) : null}
+              tooltip={modifiedBy ? t.lastModifiedBy(modifiedBy.name) : null}
               position="left"
             >
               {modifiedAt.format()}

diff --git a/frontend/src/lib-common/generated/api-types/assistanceneed.ts b/frontend/src/lib-common/generated/api-types/assistanceneed.ts
@@ -9,6 +9,7 @@ import FiniteDateRange from '../../finite-date-range'
 import HelsinkiDateTime from '../../helsinki-date-time'
 import LocalDate from '../../local-date'
 import { Action } from '../action'
+import { EvakaUser } from './user'
 import { JsonOf } from '../../json'
 import { OfficialLanguage } from './shared'
 import { UUID } from '../../types'
@@ -372,7 +373,7 @@ export interface AssistanceNeedVoucherCoefficient {
   coefficient: number
   id: UUID
   modifiedAt: HelsinkiDateTime | null
-  modifiedByName: string | null
+  modifiedBy: EvakaUser | null
   validityPeriod: FiniteDateRange
 }
 

diff --git a/...tlin/fi/espoo/evaka/assistanceneed/vouchercoefficient/AssistanceNeedVoucherCoefficient.kt b/...tlin/fi/espoo/evaka/assistanceneed/vouchercoefficient/AssistanceNeedVoucherCoefficient.kt
@@ -9,6 +9,7 @@ import fi.espoo.evaka.shared.ChildId
 import fi.espoo.evaka.shared.domain.FiniteDateRange
 import fi.espoo.evaka.shared.domain.HelsinkiDateTime
 import fi.espoo.evaka.shared.security.Action
+import fi.espoo.evaka.user.EvakaUser
 import java.math.BigDecimal
 
 data class AssistanceNeedVoucherCoefficient(
@@ -17,7 +18,7 @@ data class AssistanceNeedVoucherCoefficient(
     val coefficient: BigDecimal,
     val validityPeriod: FiniteDateRange,
     val modifiedAt: HelsinkiDateTime?,
-    val modifiedByName: String?,
+    val modifiedBy: EvakaUser?,
 )
 
 data class AssistanceNeedVoucherCoefficientRequest(

diff --git a/.../espoo/evaka/assistanceneed/vouchercoefficient/AssistanceNeedVoucherCoefficientQueries.kt b/.../espoo/evaka/assistanceneed/vouchercoefficient/AssistanceNeedVoucherCoefficientQueries.kt
@@ -12,7 +12,7 @@ import fi.espoo.evaka.shared.domain.FiniteDateRange
 import fi.espoo.evaka.shared.domain.HelsinkiDateTime
 import fi.espoo.evaka.shared.domain.NotFound
 
-private val selectModifiedBy = "(SELECT name FROM evaka_user WHERE id = modified_by) AS modified_by"
+private val selectModifiedBy = "(SELECT * FROM evaka_user WHERE id = modified_by) AS modified_by"
 
 fun Database.Transaction.insertAssistanceNeedVoucherCoefficient(
     user: AuthenticatedUser,
@@ -25,7 +25,7 @@ fun Database.Transaction.insertAssistanceNeedVoucherCoefficient(
                 """
 INSERT INTO assistance_need_voucher_coefficient (child_id, coefficient, validity_period, modified_at, modified_by)
 VALUES (${bind(childId)}, ${bind(data.coefficient)}, ${bind(data.validityPeriod)}, ${bind(now)}, ${bind(user.evakaUserId)})
-RETURNING id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+RETURNING id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 """
             )
         }
@@ -37,7 +37,7 @@ fun Database.Read.getAssistanceNeedVoucherCoefficientById(
     createQuery {
             sql(
                 """
-SELECT id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+SELECT id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 FROM assistance_need_voucher_coefficient
 WHERE id = ${bind(id)}
 """
@@ -51,7 +51,7 @@ fun Database.Read.getAssistanceNeedVoucherCoefficientsForChild(
     createQuery {
             sql(
                 """
-SELECT id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+SELECT id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 FROM assistance_need_voucher_coefficient
 WHERE child_id = ${bind(childId)}
 """
@@ -74,7 +74,7 @@ SET coefficient = ${bind(data.coefficient)},
     modified_at = ${bind(now)},
     modified_by = ${bind(user.evakaUserId)}
 WHERE id = ${bind(id)}
-RETURNING id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+RETURNING id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 """
             )
         }
@@ -88,7 +88,7 @@ fun Database.Transaction.deleteAssistanceNeedVoucherCoefficient(
                 """
 DELETE FROM assistance_need_voucher_coefficient
 WHERE id = ${bind(id)}
-RETURNING id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+RETURNING id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 """
             )
         }
@@ -101,7 +101,7 @@ fun Database.Read.getOverlappingAssistanceNeedVoucherCoefficientsForChild(
     createQuery {
             sql(
                 """
-SELECT id, child_id, coefficient, validity_period, modified_at, ${selectModifiedBy}
+SELECT id, child_id, coefficient, validity_period, modified_at, $selectModifiedBy
 FROM assistance_need_voucher_coefficient
 WHERE child_id = ${bind(childId)}
   AND ${bind(range)} && validity_period

diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DataInitializers.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DataInitializers.kt
@@ -1387,7 +1387,7 @@ fun Database.Transaction.insert(row: DevAssistanceFactor): AssistanceFactorId =
             sql(
                 """
 INSERT INTO assistance_factor (id, child_id, valid_during, capacity_factor, modified, modified_by)
-VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.capacityFactor)}, ${bind(row.modified)}, ${bind(row.modifiedBy)})
+VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.capacityFactor)}, ${bind(row.modified)}, ${bind(row.modifiedBy.id)})
 """
             )
         }
@@ -1399,7 +1399,7 @@ fun Database.Transaction.insert(row: DevDaycareAssistance): DaycareAssistanceId
             sql(
                 """
 INSERT INTO daycare_assistance (id, child_id, valid_during, level, modified, modified_by)
-VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.level)}, ${bind(row.modified)}, ${bind(row.modifiedBy)})
+VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.level)}, ${bind(row.modified)}, ${bind(row.modifiedBy.id)})
 """
             )
         }
@@ -1423,7 +1423,7 @@ fun Database.Transaction.insert(row: DevOtherAssistanceMeasure): OtherAssistance
             sql(
                 """
 INSERT INTO other_assistance_measure (id, child_id, valid_during, type, modified, modified_by)
-VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.type)}, ${bind(row.modified)}, ${bind(row.modifiedBy)})
+VALUES (${bind(row.id)}, ${bind(row.childId)}, ${bind(row.validDuring)}, ${bind(row.type)}, ${bind(row.modified)}, ${bind(row.modifiedBy.id)})
 """
             )
         }

diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DevApi.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/dev/DevApi.kt
@@ -200,6 +200,8 @@ import fi.espoo.evaka.shared.security.upsertEmployeeUser
 import fi.espoo.evaka.specialdiet.SpecialDiet
 import fi.espoo.evaka.specialdiet.resetSpecialDietsNotContainedWithin
 import fi.espoo.evaka.specialdiet.setSpecialDiets
+import fi.espoo.evaka.user.EvakaUser
+import fi.espoo.evaka.user.EvakaUserType
 import fi.espoo.evaka.vtjclient.dto.VtjPerson
 import fi.espoo.evaka.vtjclient.service.persondetails.MockPersonDetailsService
 import fi.espoo.evaka.vtjclient.service.persondetails.MockVtjDataset
@@ -2349,7 +2351,12 @@ data class DevAssistanceFactor(
         FiniteDateRange(LocalDate.of(2019, 1, 1), LocalDate.of(2019, 6, 1)),
     val capacityFactor: Double = 1.0,
     val modified: HelsinkiDateTime = HelsinkiDateTime.now(),
-    val modifiedByName: String = "eVaka",
+    val modifiedBy: EvakaUser =
+        EvakaUser(
+            id = AuthenticatedUser.SystemInternalUser.evakaUserId,
+            name = "eVaka",
+            type = EvakaUserType.EMPLOYEE,
+        ),
 )
 
 data class DevDaycareAssistance(
@@ -2359,7 +2366,12 @@ data class DevDaycareAssistance(
         FiniteDateRange(LocalDate.of(2019, 1, 1), LocalDate.of(2019, 6, 1)),
     val level: DaycareAssistanceLevel = DaycareAssistanceLevel.GENERAL_SUPPORT,
     val modified: HelsinkiDateTime = HelsinkiDateTime.now(),
-    val modifiedBy: String = "eVaka",
+    val modifiedBy: EvakaUser =
+        EvakaUser(
+            id = AuthenticatedUser.SystemInternalUser.evakaUserId,
+            name = "eVaka",
+            type = EvakaUserType.EMPLOYEE,
+        ),
 )
 
 data class DevPreschoolAssistance(
@@ -2369,7 +2381,12 @@ data class DevPreschoolAssistance(
         FiniteDateRange(LocalDate.of(2019, 1, 1), LocalDate.of(2019, 6, 1)),
     val level: PreschoolAssistanceLevel = PreschoolAssistanceLevel.INTENSIFIED_SUPPORT,
     val modified: HelsinkiDateTime = HelsinkiDateTime.now(),
-    val modifiedBy: String = "eVaka",
+    val modifiedBy: EvakaUser =
+        EvakaUser(
+            id = AuthenticatedUser.SystemInternalUser.evakaUserId,
+            name = "eVaka",
+            type = EvakaUserType.EMPLOYEE,
+        ),
 )
 
 data class DevOtherAssistanceMeasure(
@@ -2379,7 +2396,12 @@ data class DevOtherAssistanceMeasure(
         FiniteDateRange(LocalDate.of(2019, 1, 1), LocalDate.of(2019, 6, 1)),
     val type: OtherAssistanceMeasureType,
     val modified: HelsinkiDateTime = HelsinkiDateTime.now(),
-    val modifiedByName: String = "eVaka",
+    val modifiedBy: EvakaUser =
+        EvakaUser(
+            id = AuthenticatedUser.SystemInternalUser.evakaUserId,
+            name = "eVaka",
+            type = EvakaUserType.EMPLOYEE,
+        ),
 )
 
 data class DevVardaOrganizerChild(