Merge pull request #5904 from espoon-voltti/income-statements-unit-filter

patari · web-flow · commit 8e52e7ca2a77 · 2024-11-04T08:33:36.000+02:00
Lisätään tuloselvitykset-listaan yksikön mukaan suodatus
diff --git a/frontend/src/employee-frontend/components/common/Filters.tsx b/frontend/src/employee-frontend/components/common/Filters.tsx
@@ -299,8 +299,8 @@ export function AreaFilter({
 }
 
 interface UnitFilterProps {
-  units: { id: string; label: string }[]
-  selected?: { id: string; label: string }
+  units: { id: string; name: string }[]
+  selected?: { id: string; name: string }
   select: (unit?: string) => void
 }
 
@@ -310,19 +310,18 @@ export const UnitFilter = React.memo(function UnitFilter({
   select
 }: UnitFilterProps) {
   const { i18n } = useTranslation()
-  const options = units.map(({ id, label }) => ({ id, label, value: id }))
   return (
     <>
       <Label>{i18n.filters.unit}</Label>
       <Gap size="xs" />
       <Combobox
-        items={options}
+        items={units}
         placeholder={i18n.filters.unitPlaceholder}
         selectedItem={selected ?? null}
         onChange={(option) => select(option?.id)}
         clearable
         fullWidth
-        getItemLabel={(item) => item.label}
+        getItemLabel={(item) => item.name}
       />
     </>
   )
diff --git a/frontend/src/employee-frontend/components/fee-decisions/FeeDecisionFilters.tsx b/frontend/src/employee-frontend/components/fee-decisions/FeeDecisionFilters.tsx
@@ -186,15 +186,9 @@ function FeeDecisionFilters() {
           />
           <Gap size="L" />
           <UnitFilter
-            units={units
-              .map((us) => us.map(({ id, name }) => ({ id, label: name })))
-              .getOrElse([])}
+            units={units.getOrElse([])}
             selected={units
-              .map((us) =>
-                us
-                  .map(({ id, name }) => ({ id, label: name }))
-                  .find((unit) => unit.id === searchFilters.unit)
-              )
+              .map((us) => us.find((unit) => unit.id === searchFilters.unit))
               .getOrElse(undefined)}
             select={selectUnit}
           />
diff --git a/frontend/src/employee-frontend/components/income-statements/IncomeStatementFilters.tsx b/frontend/src/employee-frontend/components/income-statements/IncomeStatementFilters.tsx
@@ -6,18 +6,22 @@ import React, { Fragment, useCallback, useContext } from 'react'
 
 import { ProviderType } from 'lib-common/generated/api-types/daycare'
 import LocalDate from 'lib-common/local-date'
+import { useQueryResult } from 'lib-common/query'
 import { DatePickerClearableDeprecated } from 'lib-components/molecules/DatePickerDeprecated'
 import { Label } from 'lib-components/typography'
 import { Gap } from 'lib-components/white-space'
 
 import { useTranslation } from '../../state/i18n'
 import { InvoicingUiContext } from '../../state/invoicing-ui'
+import { renderResult } from '../async-rendering'
 import {
   AreaFilter,
   DateFilter,
   Filters,
-  ProviderTypeFilter
+  ProviderTypeFilter,
+  UnitFilter
 } from '../common/Filters'
+import { unitFilterQuery } from '../unit/queries'
 
 export default React.memo(function IncomeStatementsFilters({
   onSearch
@@ -28,6 +32,9 @@ export default React.memo(function IncomeStatementsFilters({
     incomeStatements: { searchFilters, setSearchFilters, clearSearchFilters },
     shared: { availableAreas }
   } = useContext(InvoicingUiContext)
+  const unitsResult = useQueryResult(
+    unitFilterQuery({ areaIds: null, type: 'DAYCARE', from: null })
+  )
 
   const { i18n } = useTranslation()
 
@@ -48,6 +55,11 @@ export default React.memo(function IncomeStatementsFilters({
     [setSearchFilters]
   )
 
+  const setUnit = useCallback(
+    (unit: string | undefined) => setSearchFilters((old) => ({ ...old, unit })),
+    [setSearchFilters]
+  )
+
   const setSentStartDate = useCallback(
     (sentStartDate: LocalDate | undefined) =>
       setSearchFilters((old) => ({ ...old, sentStartDate })),
@@ -80,11 +92,21 @@ export default React.memo(function IncomeStatementsFilters({
       clearFilters={clearSearchFilters}
       onSearch={onSearch}
       column1={
-        <AreaFilter
-          areas={availableAreas.getOrElse([])}
-          toggled={searchFilters.area}
-          toggle={toggleArea}
-        />
+        <>
+          <AreaFilter
+            areas={availableAreas.getOrElse([])}
+            toggled={searchFilters.area}
+            toggle={toggleArea}
+          />
+          <Gap size="L" />
+          {renderResult(unitsResult, (units) => (
+            <UnitFilter
+              units={units}
+              select={setUnit}
+              selected={units.find(({ id }) => id === searchFilters.unit)}
+            />
+          ))}
+        </>
       }
       column2={
         <Fragment>
diff --git a/frontend/src/employee-frontend/components/income-statements/IncomeStatementsPage.tsx b/frontend/src/employee-frontend/components/income-statements/IncomeStatementsPage.tsx
@@ -156,6 +156,7 @@ export default React.memo(function IncomeStatementsPage() {
   const [sortDirection, setSortDirection] = useState<SortDirection>('ASC')
   const [searchParams, setSearchParams] = useState<{
     areas: string[] | null
+    unit: string | null
     providerTypes: ProviderType[] | null
     sentStartDate: LocalDate | null
     sentEndDate: LocalDate | null
@@ -182,6 +183,7 @@ export default React.memo(function IncomeStatementsPage() {
     ) {
       setSearchParams({
         areas: searchFilters.area.length > 0 ? searchFilters.area : null,
+        unit: searchFilters.unit ?? null,
         providerTypes:
           searchFilters.providerTypes.length > 0
             ? searchFilters.providerTypes
diff --git a/frontend/src/employee-frontend/components/invoices/InvoiceFilters.tsx b/frontend/src/employee-frontend/components/invoices/InvoiceFilters.tsx
@@ -134,15 +134,9 @@ export default React.memo(function InvoiceFilters() {
           />
           <Gap size="L" />
           <UnitFilter
-            units={units
-              .map((us) => us.map(({ id, name }) => ({ id, label: name })))
-              .getOrElse([])}
+            units={units.getOrElse([])}
             selected={units
-              .map((us) =>
-                us
-                  .map(({ id, name }) => ({ id, label: name }))
-                  .find((unit) => unit.id === searchFilters.unit)
-              )
+              .map((us) => us.find((unit) => unit.id === searchFilters.unit))
               .getOrElse(undefined)}
             select={selectUnit}
           />
diff --git a/frontend/src/employee-frontend/components/payments/PaymentFilters.tsx b/frontend/src/employee-frontend/components/payments/PaymentFilters.tsx
@@ -131,15 +131,9 @@ export default React.memo(function PaymentFilters() {
           />
           <Gap size="L" />
           <UnitFilter
-            units={units
-              .map((us) => us.map(({ id, name }) => ({ id, label: name })))
-              .getOrElse([])}
+            units={units.getOrElse([])}
             selected={units
-              .map((us) =>
-                us
-                  .map(({ id, name }) => ({ id, label: name }))
-                  .find((unit) => unit.id === searchFilters.unit)
-              )
+              .map((us) => us.find((unit) => unit.id === searchFilters.unit))
               .getOrElse(undefined)}
             select={selectUnit}
           />
diff --git a/frontend/src/employee-frontend/components/unit/queries.ts b/frontend/src/employee-frontend/components/unit/queries.ts
@@ -26,6 +26,7 @@ import {
   getGroups,
   getUnitGroupDetails,
   getUnitNotifications,
+  getUnits,
   updateDaycare,
   updateGroup
 } from '../../generated/api-clients/daycare'
@@ -51,6 +52,7 @@ import { createQueryKeys } from '../../query'
 
 export const queryKeys = createQueryKeys('unit', {
   areas: () => ['areas'],
+  unitFilters: (arg: Arg0<typeof getUnits>) => ['unitFilters', arg],
   units: (arg: Arg0<typeof getDaycares>) => ['units', arg],
   unit: (unitId: UUID) => ['unit', unitId],
   unitNotifications: (unitId: UUID) => ['unitNotifications', unitId],
@@ -106,6 +108,11 @@ export const areaQuery = query({
   queryKey: queryKeys.areas
 })
 
+export const unitFilterQuery = query({
+  api: getUnits,
+  queryKey: queryKeys.unitFilters
+})
+
 export const unitsQuery = query({
   api: getDaycares,
   queryKey: queryKeys.units
diff --git a/frontend/src/employee-frontend/components/voucher-value-decisions/VoucherValueDecisionFilters.tsx b/frontend/src/employee-frontend/components/voucher-value-decisions/VoucherValueDecisionFilters.tsx
@@ -191,15 +191,9 @@ export default React.memo(function VoucherValueDecisionFilters() {
           />
           <Gap size="L" />
           <UnitFilter
-            units={units
-              .map((us) => us.map(({ id, name }) => ({ id, label: name })))
-              .getOrElse([])}
+            units={units.getOrElse([])}
             selected={units
-              .map((us) =>
-                us
-                  .map(({ id, name }) => ({ id, label: name }))
-                  .find((unit) => unit.id === searchFilters.unit)
-              )
+              .map((us) => us.find((unit) => unit.id === searchFilters.unit))
               .getOrElse(undefined)}
             select={selectUnit}
           />
diff --git a/frontend/src/employee-frontend/state/invoicing-ui.tsx b/frontend/src/employee-frontend/state/invoicing-ui.tsx
@@ -123,6 +123,7 @@ interface PaymentSearchFilterState {
 
 export interface IncomeStatementSearchFilters {
   area: string[]
+  unit: string | undefined
   providerTypes: ProviderType[]
   sentStartDate: LocalDate | undefined
   sentEndDate: LocalDate | undefined
@@ -224,6 +225,7 @@ const defaultState: UiState = {
   incomeStatements: {
     searchFilters: {
       area: [],
+      unit: undefined,
       providerTypes: [],
       sentStartDate: undefined,
       sentEndDate: undefined,
diff --git a/frontend/src/lib-common/generated/api-types/incomestatement.ts b/frontend/src/lib-common/generated/api-types/incomestatement.ts
@@ -294,6 +294,7 @@ export interface SearchIncomeStatementsRequest {
   sentStartDate: LocalDate | null
   sortBy: IncomeStatementSortParam | null
   sortDirection: SortDirection | null
+  unit: UUID | null
 }
 
 /**
diff --git a/service/src/integrationTest/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementControllerIntegrationTest.kt b/service/src/integrationTest/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementControllerIntegrationTest.kt
@@ -576,6 +576,77 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
         )
     }
 
+    @Test
+    fun `list income statements awaiting handler - unit filter`() {
+        val placementId1 = PlacementId(UUID.randomUUID())
+        val placementId2 = PlacementId(UUID.randomUUID())
+        val placementStart = today.minusDays(30)
+        val placementEnd = today.plusDays(30)
+        db.transaction { tx ->
+            tx.insert(
+                DevParentship(
+                    childId = testChild_1.id,
+                    headOfChildId = citizenId,
+                    startDate = placementStart,
+                    endDate = placementEnd,
+                )
+            )
+            tx.insert(
+                DevPlacement(
+                    id = placementId1,
+                    type = PlacementType.PRESCHOOL_DAYCARE,
+                    childId = testChild_1.id,
+                    unitId = daycare1.id,
+                    startDate = placementStart,
+                    endDate = placementEnd,
+                )
+            )
+
+            tx.insert(
+                DevParentship(
+                    childId = testChild_2.id,
+                    headOfChildId = testAdult_2.id,
+                    startDate = placementStart,
+                    endDate = placementEnd,
+                )
+            )
+            tx.insert(
+                DevPlacement(
+                    id = placementId2,
+                    type = PlacementType.PRESCHOOL_DAYCARE,
+                    childId = testChild_2.id,
+                    unitId = daycare2.id,
+                    startDate = placementStart,
+                    endDate = placementEnd,
+                )
+            )
+        }
+
+        createTestIncomeStatement(citizenId)
+        val incomeStatement2 = createTestIncomeStatement(testAdult_2.id)
+
+        assertEquals(
+            PagedIncomeStatementsAwaitingHandler(
+                listOf(
+                    IncomeStatementAwaitingHandler(
+                        id = incomeStatement2.id,
+                        created = incomeStatement2.created,
+                        startDate = incomeStatement2.startDate,
+                        incomeEndDate = null,
+                        handlerNote = "",
+                        type = IncomeStatementType.HIGHEST_FEE,
+                        personId = testAdult_2.id,
+                        personName = "Doe Joan",
+                        primaryCareArea = area2.name,
+                    )
+                ),
+                1,
+                1,
+            ),
+            getIncomeStatementsAwaitingHandler(SearchIncomeStatementsRequest(unit = daycare2.id)),
+        )
+    }
+
     @Test
     fun `list income statements awaiting handler - provider type filter`() {
         val placementId1 = PlacementId(UUID.randomUUID())
@@ -1184,7 +1255,16 @@ class IncomeStatementControllerIntegrationTest : FullApplicationTest(resetDbBefo
 
     private fun getIncomeStatementsAwaitingHandler(
         body: SearchIncomeStatementsRequest =
-            SearchIncomeStatementsRequest(1, null, null, emptyList(), emptyList(), null, null),
+            SearchIncomeStatementsRequest(
+                1,
+                null,
+                null,
+                emptyList(),
+                null,
+                emptyList(),
+                null,
+                null,
+            ),
         clock: EvakaClock = MockEvakaClock(now),
     ): PagedIncomeStatementsAwaitingHandler {
         return incomeStatementController.getIncomeStatementsAwaitingHandler(
diff --git a/service/src/main/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementController.kt b/service/src/main/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementController.kt
@@ -8,6 +8,7 @@ import fi.espoo.evaka.Audit
 import fi.espoo.evaka.AuditId
 import fi.espoo.evaka.daycare.domain.ProviderType
 import fi.espoo.evaka.invoicing.controller.SortDirection
+import fi.espoo.evaka.shared.DaycareId
 import fi.espoo.evaka.shared.IncomeStatementId
 import fi.espoo.evaka.shared.PersonId
 import fi.espoo.evaka.shared.auth.AuthenticatedUser
@@ -135,6 +136,7 @@ class IncomeStatementController(private val accessControl: AccessControl) {
                     it.fetchIncomeStatementsAwaitingHandler(
                         clock.now().toLocalDate(),
                         body.areas ?: emptyList(),
+                        body.unit,
                         body.providerTypes ?: emptyList(),
                         body.sentStartDate,
                         body.sentEndDate,
@@ -182,6 +184,7 @@ data class SearchIncomeStatementsRequest(
     val sortBy: IncomeStatementSortParam? = null,
     val sortDirection: SortDirection? = null,
     val areas: List<String>? = emptyList(),
+    val unit: DaycareId? = null,
     val providerTypes: List<ProviderType>? = emptyList(),
     val sentStartDate: LocalDate? = null,
     val sentEndDate: LocalDate? = null,
diff --git a/service/src/main/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementQueries.kt b/service/src/main/kotlin/fi/espoo/evaka/incomestatement/IncomeStatementQueries.kt

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ export interface SearchIncomeStatementsRequest {`
`294`	`294`	`sentStartDate: LocalDate \| null`
`295`	`295`	`sortBy: IncomeStatementSortParam \| null`
`296`	`296`	`sortDirection: SortDirection \| null`
	`297`	`+ unit: UUID \| null`
`297`	`298`	`}`
`298`	`299`
`299`	`300`	`/**`