feat(prélèvements): ajoute un filtre par laboratoire (#628)

vmaubert · web-flow · commit 9c36b65499a8 · 2026-03-09T16:37:50.000+01:00
diff --git a/frontend/src/components/FilterTags/FiltersTags.tsx b/frontend/src/components/FilterTags/FiltersTags.tsx
@@ -8,6 +8,7 @@ import { MatrixKindLabels } from 'maestro-shared/referential/Matrix/MatrixKind';
 import { MatrixLabels } from 'maestro-shared/referential/Matrix/MatrixLabels';
 import { Regions } from 'maestro-shared/referential/Region';
 import { Pagination } from 'maestro-shared/schema/commons/Pagination';
+import { Laboratory } from 'maestro-shared/schema/Laboratory/Laboratory';
 import {
   ContextLabels,
   ProgrammingPlanContext
@@ -47,6 +48,7 @@ interface Props {
   onChange: (filters: Partial<FilterableType>) => void;
   samplers?: UserRefined[];
   programmingPlans?: ProgrammingPlanChecked[];
+  laboratories?: Pick<Laboratory, 'id' | 'name'>[];
 }
 
 const tagProps = {
@@ -158,6 +160,11 @@ const filtersConfig = {
     prop: 'domain',
     getLabel: (value) => ProgrammingPlanDomainLabels[value]
   },
+  laboratoryId: {
+    prop: 'laboratoryId',
+    getLabel: (value, { laboratories }) =>
+      laboratories?.find(({ id }) => id === value)?.name ?? ''
+  },
   programmingPlanIds: {
     prop: 'programmingPlanIds',
     getComponent: (value, onChange, { programmingPlans }) => (
@@ -204,6 +211,7 @@ const filtersConfig = {
           value: NonNullable<FilterableType[key]>,
           data: {
             sampler?: UserRefined;
+            laboratories?: Props['laboratories'];
           }
         ) => string | null;
         getComponent?: never;
@@ -226,7 +234,8 @@ const FiltersTags = ({
   filters,
   onChange,
   samplers,
-  programmingPlans
+  programmingPlans,
+  laboratories
 }: Props) => {
   const { hasNationalView } = useAuthentication();
   const sampler = useMemo(
@@ -272,7 +281,8 @@ const FiltersTags = ({
             } else {
               // @ts-expect-error TS2345 il est perdu
               const label = conf.getLabel(value, {
-                sampler
+                sampler,
+                laboratories
               });
               if (label) {
                 return (
diff --git a/frontend/src/components/LaboratorySelect/LaboratorySelect.tsx b/frontend/src/components/LaboratorySelect/LaboratorySelect.tsx
@@ -0,0 +1,53 @@
+import { cx } from '@codegouvfr/react-dsfr/fr/cx';
+import Select from '@codegouvfr/react-dsfr/Select';
+import { sortBy } from 'lodash-es';
+import { SubstanceKind } from 'maestro-shared/schema/Substance/SubstanceKind';
+import { useContext } from 'react';
+import { ApiClientContext } from '../../services/apiClient';
+
+interface Props {
+  programmingPlanId: string | undefined;
+  substanceKind?: SubstanceKind;
+  laboratoryId?: string | null;
+  onSelect: (laboratoryId?: string) => void;
+  readonly?: boolean;
+}
+
+const LaboratorySelect = ({
+  programmingPlanId,
+  substanceKind,
+  laboratoryId,
+  onSelect,
+  readonly
+}: Props) => {
+  const apiClient = useContext(ApiClientContext);
+
+  const { data: laboratories } = apiClient.useFindLaboratoriesQuery({
+    programmingPlanId,
+    substanceKind
+  });
+
+  return (
+    <Select
+      label="Laboratoire"
+      nativeSelectProps={{
+        value: laboratoryId ?? '',
+        autoFocus: true,
+        onChange: (e) => onSelect(e.target.value || undefined)
+      }}
+      className={cx('fr-mb-0')}
+      disabled={readonly}
+    >
+      <option value="" disabled>
+        Sélectionner un laboratoire
+      </option>
+      {sortBy(laboratories ?? [], 'name').map((laboratory) => (
+        <option key={laboratory.id} value={laboratory.id}>
+          {laboratory.name}
+        </option>
+      ))}
+    </Select>
+  );
+};
+
+export default LaboratorySelect;
diff --git a/frontend/src/components/LocalPrescription/LocalPrescriptionSubstanceKindsLaboratories/LocalPrescriptionSubstanceKindsLaboratories.tsx b/frontend/src/components/LocalPrescription/LocalPrescriptionSubstanceKindsLaboratories/LocalPrescriptionSubstanceKindsLaboratories.tsx
@@ -3,8 +3,9 @@ import {
   SubstanceKindLaboratory,
   SubstanceKindLaboratorySort
 } from 'maestro-shared/schema/LocalPrescription/LocalPrescriptionSubstanceKindLaboratory';
+import { SubstanceKindLabels } from 'maestro-shared/schema/Substance/SubstanceKind';
 import { forwardRef, useImperativeHandle, useState } from 'react';
-import SubstanceKindLaboratorySelect from './SubstanceKindLaboratorySelect';
+import LaboratorySelect from '../../LaboratorySelect/LaboratorySelect';
 
 interface Props {
   programmingPlanId: string;
@@ -49,9 +50,13 @@ const LocalPrescriptionSubstanceKindsLaboratories = forwardRef<
               key={`substanceKindLaboratory_${substanceKindLaboratory.substanceKind}`}
             >
               {index > 0 && <hr className={cx('fr-mb-2w')} />}
-              <SubstanceKindLaboratorySelect
+              <div className={cx('fr-text--bold', 'fr-mb-2w')}>
+                {SubstanceKindLabels[substanceKindLaboratory.substanceKind]}
+              </div>
+              <LaboratorySelect
                 programmingPlanId={programmingPlanId}
-                substanceKindLaboratory={substanceKindLaboratory}
+                substanceKind={substanceKindLaboratory.substanceKind}
+                laboratoryId={substanceKindLaboratory.laboratoryId}
                 onSelect={(laboratoryId) =>
                   setSubstanceKindsLaboratories(
                     substanceKindsLaboratories.map((sl) =>
diff --git a/frontend/src/components/LocalPrescription/LocalPrescriptionSubstanceKindsLaboratories/SubstanceKindLaboratorySelect.tsx b/frontend/src/components/LocalPrescription/LocalPrescriptionSubstanceKindsLaboratories/SubstanceKindLaboratorySelect.tsx
diff --git a/frontend/src/views/SampleListView/SampleListView.tsx b/frontend/src/views/SampleListView/SampleListView.tsx
@@ -80,6 +80,10 @@ const SampleListView = () => {
     [programmingPlans]
   );
 
+  const { data: laboratories } = apiClient.useFindLaboratoriesQuery({
+    programmingPlanId: programmingPlan?.id
+  });
+
   const [isFilterExpanded, setIsFilterExpanded] = useState(false);
 
   useEffect(() => {
@@ -109,6 +113,7 @@ const SampleListView = () => {
         compliance:
           SampleCompliance.safeParse(searchParams.get('compliance')).data ??
           undefined,
+        laboratoryId: searchParams.get('laboratoryId'),
         withAtLeastOneResidue:
           coerceToBooleanNullish().safeParse(
             searchParams.get('withAtLeastOneResidue')
@@ -247,6 +252,7 @@ const SampleListView = () => {
                       year={Number(year)}
                       filters={findSampleOptions}
                       onChange={changeFilter}
+                      programmingPlanId={programmingPlan.id}
                     />
                   )}
                 </div>
@@ -258,6 +264,7 @@ const SampleListView = () => {
                   programmingPlans={programmingPlans}
                   samplers={samplers}
                   onChange={changeFilter}
+                  laboratories={laboratories}
                 />
               </div>
             </div>
@@ -281,6 +288,7 @@ const SampleListView = () => {
                         year={Number(year)}
                         filters={findSampleOptions}
                         onChange={changeFilter}
+                        programmingPlanId={programmingPlan?.id}
                       />
                     )}
                   </div>
@@ -289,6 +297,7 @@ const SampleListView = () => {
                     filters={findSampleOptions}
                     programmingPlans={programmingPlans}
                     samplers={samplers}
+                    laboratories={laboratories}
                     onChange={changeFilter}
                   />
                 </div>
diff --git a/frontend/src/views/SampleListView/SampleSecondaryFilters.tsx b/frontend/src/views/SampleListView/SampleSecondaryFilters.tsx
@@ -16,15 +16,22 @@ import {
 import { useAuthentication } from 'src/hooks/useAuthentication';
 import { z } from 'zod';
 import { DepartmentsSelect } from '../../components/DepartmentsSelect/DepartmentsSelect';
+import LaboratorySelect from '../../components/LaboratorySelect/LaboratorySelect';
 import { RegionsFilter } from '../../components/RegionsFilter/RegionsFilter';
 
 interface Props {
   year: number;
   filters: Partial<FindSampleOptions>;
+  programmingPlanId: string | undefined;
   onChange: (filters: Partial<FindSampleOptions>) => void;
 }
 
-const SampleSecondaryFilters = ({ year, filters, onChange }: Props) => {
+const SampleSecondaryFilters = ({
+  year,
+  filters,
+  programmingPlanId,
+  onChange
+}: Props) => {
   const { hasNationalView, hasRegionalView } = useAuthentication();
 
   return (
@@ -121,6 +128,17 @@ const SampleSecondaryFilters = ({ year, filters, onChange }: Props) => {
           ))}
         </Select>
       </div>
+      <div className={cx('fr-col-12', 'fr-col-md-6', 'fr-col-lg-3')}>
+        <LaboratorySelect
+          programmingPlanId={programmingPlanId}
+          laboratoryId={filters.laboratoryId}
+          onSelect={(laboratoryId) =>
+            onChange({
+              laboratoryId
+            })
+          }
+        />
+      </div>
       <div className={cx('fr-col-12', 'fr-col-md-6', 'fr-col-lg-3')}>
         <ToggleSwitch
           label="Avec au moins un résidu"
diff --git a/server/repositories/laboratoryRepository.ts b/server/repositories/laboratoryRepository.ts
@@ -33,7 +33,7 @@ const findMany = async (
       'laboratoryAgreements.laboratoryId',
       'laboratories.id'
     )
-    .distinct()
+    .distinctOn('laboratories.id')
     .selectAll();
 
   for (const option of FindLaboratoryOptions.keyof().options) {
diff --git a/server/repositories/sampleItemRepository.ts b/server/repositories/sampleItemRepository.ts
@@ -7,7 +7,7 @@ import { knexInstance as db } from './db';
 import { kysely } from './kysely';
 import { KyselyMaestro } from './kysely.type';
 
-const sampleItemsTable = 'sample_items';
+export const sampleItemsTable = 'sample_items';
 
 export const SampleItems = (transaction = db) =>
   transaction<PartialSampleItem>(sampleItemsTable);
diff --git a/server/repositories/sampleRepository.test.ts b/server/repositories/sampleRepository.test.ts
@@ -3,6 +3,7 @@ import { MatrixKind } from 'maestro-shared/referential/Matrix/MatrixKind';
 import { ResultKind } from 'maestro-shared/schema/Analysis/Residue/ResultKind';
 import { genPartialAnalysis } from 'maestro-shared/test/analysisFixtures';
 import { genDocument } from 'maestro-shared/test/documentFixtures';
+import { LaboratoryFixture } from 'maestro-shared/test/laboratoryFixtures';
 import {
   Sample11Fixture,
   Sample2Fixture
@@ -134,6 +135,21 @@ describe('findMany samples', async () => {
     expect(samples).not.toHaveLength(1);
   });
 
+  test('find with laboratoryId option', async () => {
+    let samples = await sampleRepository.findMany({
+      programmingPlanIds: toArray(Sample11Fixture.programmingPlanId),
+      laboratoryId: '00000000-0000-0000-0000-000000000000'
+    });
+    expect(samples).toEqual([]);
+
+    samples = await sampleRepository.findMany({
+      programmingPlanIds: toArray(Sample11Fixture.programmingPlanId),
+      laboratoryId: LaboratoryFixture.id
+    });
+    expect(samples).toHaveLength(1);
+    expect(samples[0].id).toBe(Sample11Fixture.id);
+  });
+
   test('find with withAtLeastOneResidue option', async () => {
     const document = genDocument({
       createdBy: Sampler1Fixture.id,
diff --git a/server/repositories/sampleRepository.ts b/server/repositories/sampleRepository.ts
@@ -13,6 +13,7 @@ import { companiesTable } from './companyRepository';
 import { knexInstance as db, knexInstance } from './db';
 import { kysely } from './kysely';
 import { KyselyMaestro } from './kysely.type';
+import { sampleItemsTable } from './sampleItemRepository';
 import { usersTable } from './userRepository';
 
 export const samplesTable = 'samples';
@@ -120,7 +121,8 @@ const findRequest = (findOptions: FindSampleOptions) =>
           'compliance',
           'withAtLeastOneResidue',
           'programmingPlanIds',
-          'kinds'
+          'kinds',
+          'laboratoryId'
         ),
         (_) => isNil(_) || isArray(_)
       )
@@ -201,6 +203,19 @@ const findRequest = (findOptions: FindSampleOptions) =>
             .limit(1)
         );
       }
+      if (findOptions.laboratoryId) {
+        builder.whereExists((c) =>
+          c
+            .select(knexInstance.raw(1))
+            .from(sampleItemsTable)
+            .where(
+              `${sampleItemsTable}.sampleId`,
+              knexInstance.raw(`${samplesTable}.id`)
+            )
+            .where(`${sampleItemsTable}.laboratoryId`, findOptions.laboratoryId)
+            .limit(1)
+        );
+      }
     });
 
 const findMany = async (
diff --git a/shared/schema/Sample/FindSampleOptions.ts b/shared/schema/Sample/FindSampleOptions.ts
@@ -39,7 +39,8 @@ export const FindSampleOptions = z
     sampledAt: z.string().nullish(),
     reference: z.string().nullish(),
     compliance: SampleCompliance.nullish(),
-    withAtLeastOneResidue: coerceToBooleanNullish()
+    withAtLeastOneResidue: coerceToBooleanNullish(),
+    laboratoryId: z.guid().nullish()
   })
   .merge(Pagination.partial());
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ const findMany = async (`
`33`	`33`	`'laboratoryAgreements.laboratoryId',`
`34`	`34`	`'laboratories.id'`
`35`	`35`	`)`
`36`		`- .distinct()`
	`36`	`+ .distinctOn('laboratories.id')`
`37`	`37`	`.selectAll();`
`38`	`38`
`39`	`39`	`for (const option of FindLaboratoryOptions.keyof().options) {`