Merge pull request #1073 from MTES-MCT/feat-update-owner-kind-options

Add OwnerKind type
MTES-MCT · Jan 6, 2025 · 730f02f · 730f02f
2 parents 73bede5 + 5a6771f
commit 730f02f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/frontend/src/models/HousingFilters.tsx b/frontend/src/models/HousingFilters.tsx
@@ -12,7 +12,9 @@ import {
   LocalityKind,
   Occupancy,
   OCCUPANCY_VALUES,
+  OWNER_KIND_VALUES,
   OwnerAge,
+  OwnerKind,
   OwnershipKind,
   RoomCount,
   VacancyRate
@@ -63,12 +65,11 @@ export const noCampaignOption: SelectOption = {
 };
 export type NoCampaign = typeof noCampaignOption.value;
 
-export const ownerKindOptions: SelectOption[] = [
-  { value: 'Particulier', label: 'Particulier' },
-  { value: 'Investisseur', label: 'Investisseur' },
-  { value: 'SCI', label: 'SCI' },
-  { value: 'Autre', label: 'Autres' }
-];
+export const ownerKindOptions: SelectOption<OwnerKind>[] =
+  OWNER_KIND_VALUES.map((kind) => ({
+    value: kind,
+    label: kind
+  }));
 
 export const campaignsCountOptions: SelectOption<CampaignCount>[] = [
   { value: '0', label: 'Dans aucune campagne en cours' },

diff --git a/packages/models/src/HousingFiltersDTO.ts b/packages/models/src/HousingFiltersDTO.ts
@@ -11,6 +11,7 @@ import { EnergyConsumption } from './EnergyConsumption';
 import { HousingKind } from './HousingKind';
 import { CampaignCount } from './CampaignCount';
 import { RoomCount } from './RoomCount';
+import { OwnerKind } from './OwnerKind';
 
 export interface HousingFiltersDTO {
   housingIds?: string[];
@@ -21,7 +22,7 @@ export interface HousingFiltersDTO {
   campaignsCounts?: CampaignCount[];
   campaignIds?: Array<string | null>;
   ownerIds?: string[];
-  ownerKinds?: string[];
+  ownerKinds?: OwnerKind[];
   ownerAges?: OwnerAge[];
   multiOwners?: boolean[];
   beneficiaryCounts?: BeneficiaryCount[];

diff --git a/packages/models/src/OwnerKind.ts b/packages/models/src/OwnerKind.ts
@@ -0,0 +1,11 @@
+export const OWNER_KIND_VALUES = [
+  'Particulier',
+  'SCI, Copropriété, Autres personnes morales',
+  'Promoteur, Investisseur privé',
+  'Etat et collectivité territoriale',
+  'Bailleur social, Aménageur, Investisseur public',
+  'Autres',
+  'Absence de propriétaire'
+] as const;
+
+export type OwnerKind = (typeof OWNER_KIND_VALUES)[number];
diff --git a/packages/models/src/index.ts b/packages/models/src/index.ts
@@ -33,6 +33,7 @@ export * from './NoteDTO';
 export * from './Occupancy';
 export * from './OwnerAge';
 export * from './OwnerDTO';
+export * from './OwnerKind';
 export * from './OwnershipKind';
 export * from './Pagination';
 export * from './ProspectDTO';

diff --git a/packages/schemas/src/housing-filters.ts b/packages/schemas/src/housing-filters.ts
@@ -12,6 +12,7 @@ import {
   LIVING_AREA_VALUES,
   OCCUPANCY_VALUES,
   OWNER_AGE_VALUES,
+  OWNER_KIND_VALUES,
   OWNERSHIP_KIND_VALUES,
   ROOM_COUNT_VALUES,
   VACANCY_RATE_VALUES
@@ -44,7 +45,9 @@ export const housingFilters: ObjectSchema<HousingFiltersDTO> = object({
   ownerIds: array()
     .transform(commaSeparatedString)
     .of(string().uuid().required()),
-  ownerKinds: array().transform(commaSeparatedString).of(string().required()),
+  ownerKinds: array()
+    .transform(commaSeparatedString)
+    .of(string().oneOf(OWNER_KIND_VALUES).required()),
   ownerAges: array()
     .transform(commaSeparatedString)
     .of(string().oneOf(OWNER_AGE_VALUES).required()),

diff --git a/packages/schemas/src/test/housing-filters.test.ts b/packages/schemas/src/test/housing-filters.test.ts
@@ -12,6 +12,7 @@ import {
   LIVING_AREA_VALUES,
   OCCUPANCY_VALUES,
   OWNER_AGE_VALUES,
+  OWNER_KIND_VALUES,
   OWNERSHIP_KIND_VALUES,
   ROOM_COUNT_VALUES,
   VACANCY_RATE_VALUES
@@ -28,7 +29,7 @@ describe('Housing filters', () => {
     campaignsCounts: fc.array(fc.constantFrom(...CAMPAIGN_COUNT_VALUES)),
     campaignIds: fc.array(fc.oneof(fc.constant(null), fc.uuid())),
     ownerIds: fc.array(fc.uuid()),
-    ownerKinds: fc.array(fc.string({ minLength: 1 })),
+    ownerKinds: fc.array(fc.constantFrom(...OWNER_KIND_VALUES)),
     ownerAges: fc.array(fc.constantFrom(...OWNER_AGE_VALUES)),
     multiOwners: fc.array(fc.boolean()),
     beneficiaryCounts: fc.array(fc.constantFrom(...BENEFIARY_COUNT_VALUES)),