Tulotiedot/alennukset vapautukset ja korotukset: kuka muokannut ja mi…

…lloin (#5910)
espoon-voltti · Nov 7, 2024 · b4d467f · b4d467f
1 parent b1e8027
commit b4d467f
Show file tree

Hide file tree

Showing 41 changed files with 338 additions and 201 deletions.
diff --git a/frontend/src/e2e-test/dev-api/fixtures.ts b/frontend/src/e2e-test/dev-api/fixtures.ts
@@ -791,7 +791,7 @@ export class Fixture {
   }
 
   static income(
-    initial: SemiPartial<DevIncome, 'personId' | 'updatedBy'>
+    initial: SemiPartial<DevIncome, 'personId' | 'modifiedBy'>
   ): IncomeBuilder {
     return new IncomeBuilder({
       id: uuidv4(),
@@ -806,7 +806,7 @@ export class Fixture {
         }
       },
       effect: 'INCOME',
-      updatedAt: HelsinkiDateTime.now(),
+      modifiedAt: HelsinkiDateTime.now(),
       isEntrepreneur: false,
       worksAtEcha: false,
       ...initial

diff --git a/frontend/src/e2e-test/generated/api-types.ts b/frontend/src/e2e-test/generated/api-types.ts
@@ -626,9 +626,9 @@ export interface DevIncome {
   effect: IncomeEffect
   id: UUID
   isEntrepreneur: boolean
+  modifiedAt: HelsinkiDateTime
+  modifiedBy: UUID
   personId: UUID
-  updatedAt: HelsinkiDateTime
-  updatedBy: UUID
   validFrom: LocalDate
   validTo: LocalDate | null
   worksAtEcha: boolean
@@ -1391,7 +1391,7 @@ export function deserializeJsonDevHoliday(json: JsonOf<DevHoliday>): DevHoliday
 export function deserializeJsonDevIncome(json: JsonOf<DevIncome>): DevIncome {
   return {
     ...json,
-    updatedAt: HelsinkiDateTime.parseIso(json.updatedAt),
+    modifiedAt: HelsinkiDateTime.parseIso(json.modifiedAt),
     validFrom: LocalDate.parseIso(json.validFrom),
     validTo: (json.validTo != null) ? LocalDate.parseIso(json.validTo) : null
   }

diff --git a/frontend/src/e2e-test/specs/0_citizen/citizen-income.spec.ts b/frontend/src/e2e-test/specs/0_citizen/citizen-income.spec.ts
@@ -113,8 +113,8 @@ describe.each(e)('Citizen income (%s)', (env) => {
       personId: guardian.id,
       validFrom: placementStart,
       validTo: incomeEndDate,
-      updatedBy: financeAdminId,
-      updatedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
+      modifiedBy: financeAdminId,
+      modifiedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
     }).save()
 
     await Fixture.fridgeChild({

diff --git a/frontend/src/e2e-test/specs/5_employee/fridge-head-information.spec.ts b/frontend/src/e2e-test/specs/5_employee/fridge-head-information.spec.ts
@@ -211,7 +211,7 @@ describe('Employee - Head of family details', () => {
           coefficient: 'MONTHLY_NO_HOLIDAY_BONUS'
         }
       },
-      updatedBy: employee.id
+      modifiedBy: employee.id
     }).save()
 
     const totalChildIncome = 1234
@@ -229,7 +229,7 @@ describe('Employee - Head of family details', () => {
           coefficient: 'MONTHLY_NO_HOLIDAY_BONUS'
         }
       },
-      updatedBy: employee.id
+      modifiedBy: employee.id
     }).save()
 
     await guardianInformation.navigateToGuardian(regularPerson.id)

diff --git a/frontend/src/e2e-test/specs/5_employee/income.spec.ts b/frontend/src/e2e-test/specs/5_employee/income.spec.ts
@@ -270,8 +270,8 @@ describe('Income', () => {
       personId: personId,
       validFrom: placementStart,
       validTo: incomeEndDate,
-      updatedBy: financeAdminId,
-      updatedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
+      modifiedBy: financeAdminId,
+      modifiedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
     }).save()
 
     await Fixture.incomeNotification({
@@ -312,8 +312,8 @@ describe('Income', () => {
       personId: personId,
       validFrom: placementStart,
       validTo: incomeEndDate,
-      updatedBy: financeAdminId,
-      updatedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
+      modifiedBy: financeAdminId,
+      modifiedAt: placementStart.toHelsinkiDateTime(LocalTime.of(0, 0))
     }).save()
 
     await page.reload()

diff --git a/frontend/src/employee-frontend/components/child-information/FeeAlteration.tsx b/frontend/src/employee-frontend/components/child-information/FeeAlteration.tsx
@@ -99,7 +99,7 @@ export default React.memo(function FeeAlteration({
             cancel={() => clearUiMode()}
             create={(data) =>
               createFeeAlteration({
-                body: { ...data, updatedBy: null, updatedAt: null }
+                body: { ...data, modifiedBy: null, modifiedAt: null }
               })
             }
             onSuccess={clearUiMode}

diff --git a/...d/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx b/...d/src/employee-frontend/components/child-information/fee-alteration/FeeAlterationList.tsx
@@ -14,6 +14,7 @@ import {
   FeeAlterationWithPermittedActions
 } from 'lib-common/generated/api-types/invoicing'
 import { UUID } from 'lib-common/types'
+import Tooltip from 'lib-components/atoms/Tooltip'
 import { IconOnlyButton } from 'lib-components/atoms/buttons/IconOnlyButton'
 import ListGrid from 'lib-components/layout/ListGrid'
 import {
@@ -87,6 +88,22 @@ export default React.memo(function FeeAlterationList({
                 }`}</Dates>
                 <span>{feeAlteration.notes}</span>
               </FixedSpaceRow>
+              {feeAlteration.modifiedAt && (
+                <FixedSpaceRow spacing="L">
+                  <Tooltip
+                    tooltip={
+                      feeAlteration.modifiedBy &&
+                      i18n.childInformation.feeAlteration.lastModifiedBy(
+                        feeAlteration.modifiedBy.name
+                      )
+                    }
+                  >
+                    {i18n.childInformation.feeAlteration.lastModifiedAt(
+                      feeAlteration.modifiedAt.format()
+                    )}
+                  </Tooltip>
+                </FixedSpaceRow>
+              )}
               <FixedSpaceRow>
                 {permittedActions.includes('UPDATE') && (
                   <IconOnlyButton

diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemBody.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemBody.tsx
@@ -65,12 +65,12 @@ const IncomeItemBody = React.memo(function IncomeItemBody({
         <Label>{i18n.personProfile.income.details.notes}</Label>
         <span>{income.notes}</span>
         <Label>{i18n.personProfile.income.details.updated}</Label>
-        <span>{income.updatedAt?.toLocalDate().format()}</span>
+        <span>{income.modifiedAt?.toLocalDate().format()}</span>
         <Label>{i18n.personProfile.income.details.handler}</Label>
         <span>
           {income.applicationId
             ? i18n.personProfile.income.details.originApplication
-            : income.updatedBy}
+            : income.modifiedBy.name}
         </span>
         {income.applicationId !== null && (
           <>

diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemEditor.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemEditor.tsx
@@ -346,10 +346,10 @@ const IncomeItemEditor = React.memo(function IncomeItemEditor(props: Props) {
           <Gap size="L" />
           <ListGrid labelWidth="fit-content(40%)" rowGap="xs" columnGap="L">
             <Label>{i18n.personProfile.income.details.updated}</Label>
-            <span>{props.baseIncome.updatedAt.toLocalDate().format()}</span>
+            <span>{props.baseIncome.modifiedAt.toLocalDate().format()}</span>
 
             <Label>{i18n.personProfile.income.details.handler}</Label>
-            <span>{props.baseIncome.updatedBy}</span>
+            <span>{props.baseIncome.modifiedBy.name}</span>
           </ListGrid>
         </>
       ) : null}

diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeItemHeader.tsx
@@ -7,8 +7,11 @@ import styled from 'styled-components'
 
 import { useTranslation } from 'employee-frontend/state/i18n'
 import { Action } from 'lib-common/generated/action'
+import { EvakaUser } from 'lib-common/generated/api-types/user'
+import HelsinkiDateTime from 'lib-common/helsinki-date-time'
 import { scrollRefIntoView } from 'lib-common/utils/scrolling'
 import Title from 'lib-components/atoms/Title'
+import Tooltip from 'lib-components/atoms/Tooltip'
 import { IconOnlyButton } from 'lib-components/atoms/buttons/IconOnlyButton'
 import { FixedSpaceRow } from 'lib-components/layout/flex-helpers'
 import colors from 'lib-customizations/common'
@@ -47,11 +50,15 @@ interface Props {
   startEditing: () => void
   startDeleting: () => void
   permittedActions: Action.Income[]
+  modifiedBy?: EvakaUser | null
+  modifiedAt?: HelsinkiDateTime | null
   children?: React.JSX.Element[] | React.JSX.Element
 }
 
 const IncomeItemHeader = React.memo(function IncomeItemHeader({
   title: period,
+  modifiedBy,
+  modifiedAt,
   isOpen,
   toggle,
   editable,
@@ -76,6 +83,18 @@ const IncomeItemHeader = React.memo(function IncomeItemHeader({
           <span>{period}</span>
         </Title>
       </ItemTitle>
+      {modifiedAt && (
+        <Row>
+          <Tooltip
+            tooltip={
+              modifiedBy &&
+              i18n.personProfile.income.lastModifiedBy(modifiedBy.name)
+            }
+          >
+            {i18n.personProfile.income.lastModifiedAt(modifiedAt.format())}
+          </Tooltip>
+        </Row>
+      )}
       <Row>
         {permittedActions.includes('UPDATE') && (
           <Button

diff --git a/frontend/src/employee-frontend/components/person-profile/income/IncomeList.tsx b/frontend/src/employee-frontend/components/person-profile/income/IncomeList.tsx
@@ -151,6 +151,8 @@ const IncomeList = React.memo(function IncomeList({
             startEditing={() => setEditing(item.id)}
             startDeleting={() => setDeleting(item.id)}
             permittedActions={permittedActions}
+            modifiedBy={item.modifiedBy}
+            modifiedAt={item.modifiedAt}
           />
           {incomeNotificationsForIncome(item).length > 0 && (
             <IncomeNotifications

diff --git a/frontend/src/employee-frontend/types/fee-alteration.ts b/frontend/src/employee-frontend/types/fee-alteration.ts
@@ -6,5 +6,5 @@ import { FeeAlteration } from 'lib-common/generated/api-types/invoicing'
 
 export type PartialFeeAlteration = Omit<
   FeeAlteration,
-  'updatedAt' | 'updatedBy'
+  'modifiedAt' | 'modifiedBy'
 >
diff --git a/frontend/src/lib-common/generated/api-types/invoicing.ts b/frontend/src/lib-common/generated/api-types/invoicing.ts
@@ -11,6 +11,7 @@ import LocalDate from '../../local-date'
 import YearMonth from '../../year-month'
 import { Action } from '../action'
 import { CareType } from './daycare'
+import { EvakaUser } from './user'
 import { IncomeAttachment } from './attachment'
 import { JsonOf } from '../../json'
 import { PlacementType } from './placement'
@@ -75,11 +76,11 @@ export interface FeeAlteration {
   attachments: FeeAlterationAttachment[]
   id: UUID | null
   isAbsolute: boolean
+  modifiedAt: HelsinkiDateTime | null
+  modifiedBy: EvakaUser | null
   notes: string
   personId: UUID
   type: FeeAlterationType
-  updatedAt: HelsinkiDateTime | null
-  updatedBy: UUID | null
   validFrom: LocalDate
   validTo: LocalDate | null
 }
@@ -389,13 +390,13 @@ export interface Income {
   effect: IncomeEffect
   id: UUID
   isEntrepreneur: boolean
+  modifiedAt: HelsinkiDateTime
+  modifiedBy: EvakaUser
   notes: string
   personId: UUID
   total: number
   totalExpenses: number
   totalIncome: number
-  updatedAt: HelsinkiDateTime
-  updatedBy: string
   validFrom: LocalDate
   validTo: LocalDate | null
   worksAtECHA: boolean
@@ -1125,7 +1126,7 @@ export function deserializeJsonCreateRetroactiveFeeDecisionsBody(json: JsonOf<Cr
 export function deserializeJsonFeeAlteration(json: JsonOf<FeeAlteration>): FeeAlteration {
   return {
     ...json,
-    updatedAt: (json.updatedAt != null) ? HelsinkiDateTime.parseIso(json.updatedAt) : null,
+    modifiedAt: (json.modifiedAt != null) ? HelsinkiDateTime.parseIso(json.modifiedAt) : null,
     validFrom: LocalDate.parseIso(json.validFrom),
     validTo: (json.validTo != null) ? LocalDate.parseIso(json.validTo) : null
   }
@@ -1216,7 +1217,7 @@ export function deserializeJsonFeeThresholdsWithId(json: JsonOf<FeeThresholdsWit
 export function deserializeJsonIncome(json: JsonOf<Income>): Income {
   return {
     ...json,
-    updatedAt: HelsinkiDateTime.parseIso(json.updatedAt),
+    modifiedAt: HelsinkiDateTime.parseIso(json.modifiedAt),
     validFrom: LocalDate.parseIso(json.validFrom),
     validTo: (json.validTo != null) ? LocalDate.parseIso(json.validTo) : null
   }

diff --git a/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx b/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx
@@ -1419,6 +1419,8 @@ export const fi = {
       updateError: 'Maksumuutoksen tallennus epäonnistui',
       deleteError: 'Maksumuutoksen poisto epäonnistui',
       confirmDelete: 'Haluatko poistaa maksumuutoksen?',
+      lastModifiedAt: (date: string) => `Viimeksi muokattu ${date}`,
+      lastModifiedBy: (name: string) => `Muokkaaja: ${name}`,
       editor: {
         titleNew: 'Lisää uusi alennus tai korotus',
         titleEdit: 'Muokkaa alennusta tai korotusta',
@@ -1869,6 +1871,8 @@ export const fi = {
       title: 'Tulotiedot',
       itemHeader: 'Tulotiedot ajalle',
       itemHeaderNew: 'Uusi tulotieto',
+      lastModifiedAt: (date: string) => `Viimeksi muokattu ${date}`,
+      lastModifiedBy: (name: string) => `Muokkaaja: ${name}`,
       details: {
         attachments: 'Liitteet',
         name: 'Nimi',

diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/TestFixtures.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/TestFixtures.kt
@@ -743,6 +743,6 @@ fun DevEmployee.toEmployeeWithName() =
 fun DevEmployee.toEvakaUser() =
     EvakaUser(
         id = EvakaUserId(this.id.raw),
-        name = this.firstName + " " + this.lastName,
+        name = this.lastName + " " + this.firstName,
         type = EvakaUserType.EMPLOYEE,
     )
diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/attachments/AttachmentQueriesTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/attachments/AttachmentQueriesTest.kt
@@ -66,7 +66,7 @@ class AttachmentQueriesTest : PureJdbiTest(resetDbBeforeEach = true) {
                 )
             income =
                 AttachmentParent.Income(
-                    tx.insert(DevIncome(personId = guardian.id, updatedBy = admin.evakaUserId))
+                    tx.insert(DevIncome(personId = guardian.id, modifiedBy = admin.evakaUserId))
                 )
         }
     }

diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/attachments/AttachmentServiceTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/attachments/AttachmentServiceTest.kt
@@ -147,7 +147,7 @@ class AttachmentServiceTest : PureJdbiTest(resetDbBeforeEach = true) {
             insert(
                 DevIncome(
                     personId = insert(DevPerson(), DevPersonType.ADULT),
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                 )
             )
         )

diff --git a/...ionTest/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementControllerIntegrationTest.kt b/...ionTest/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementControllerIntegrationTest.kt
@@ -304,15 +304,15 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
             tx.insert(
                 DevIncome(
                     personId = citizenId,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     validFrom = incomeDate1.minusYears(1),
                     validTo = incomeDate1.minusMonths(1).minusDays(1),
                 )
             )
             tx.insert(
                 DevIncome(
                     personId = citizenId,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     validFrom = incomeDate1.minusMonths(1),
                     validTo = incomeDate1,
                 )
@@ -366,15 +366,15 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
             tx.insert(
                 DevIncome(
                     personId = testAdult_2.id,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     validFrom = incomeDate2.minusMonths(1),
                     validTo = incomeDate2.minusDays(1),
                 )
             )
             tx.insert(
                 DevIncome(
                     personId = testAdult_2.id,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     effect = IncomeEffect.MAX_FEE_ACCEPTED,
                     validFrom = incomeDate2,
                     validTo = null,
@@ -1138,7 +1138,7 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
             tx.insert(
                 DevIncome(
                     personId = citizenId,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     validFrom = incomeRange1.start,
                     validTo = incomeRange1.end,
                 )
@@ -1164,7 +1164,7 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
             tx.insert(
                 DevIncome(
                     personId = testAdult_2.id,
-                    updatedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
+                    modifiedBy = AuthenticatedUser.SystemInternalUser.evakaUserId,
                     validFrom = incomeRange2.start,
                     validTo = incomeRange2.end,
                 )