diff --git a/frontend/src/components/HousingDetails/HousingDetailsSubCardMobilisation.tsx b/frontend/src/components/HousingDetails/HousingDetailsSubCardMobilisation.tsx index 2454d5659..da7c1ff2e 100644 --- a/frontend/src/components/HousingDetails/HousingDetailsSubCardMobilisation.tsx +++ b/frontend/src/components/HousingDetails/HousingDetailsSubCardMobilisation.tsx @@ -57,14 +57,6 @@ function HousingDetailsCardMobilisation({ housing, campaigns }: Props) { Dernière mise à jour {lastUpdate(housing)} - - Prise de contact - - {campaigns.length === 0 - ? 'Jamais contacté' - : `Contacté ${campaigns.length} fois`} - - Dispositifs ({housing.precisions?.length ?? 0}) diff --git a/frontend/src/components/HousingFiltersBadges/HousingFiltersBadges.tsx b/frontend/src/components/HousingFiltersBadges/HousingFiltersBadges.tsx index 93ceb30f7..b4268ef77 100644 --- a/frontend/src/components/HousingFiltersBadges/HousingFiltersBadges.tsx +++ b/frontend/src/components/HousingFiltersBadges/HousingFiltersBadges.tsx @@ -3,7 +3,6 @@ import { beneficiaryCountOptions, buildingPeriodOptions, cadastralClassificationOptions, - campaignsCountOptions, dataFileYearsExcludedOptions, dataFileYearsIncludedOptions, energyConsumptionOptions, @@ -200,12 +199,6 @@ function HousingFiltersBadges(props: HousingFiltersBadgesProps) { onChange={(values) => onChange?.({ geoPerimetersExcluded: values })} /> )} - onChange?.({ campaignsCounts: values })} - /> )} - - { - onChangeFilters({ campaignsCounts: values }, 'Prise de contact'); - posthog.capture('filtre-prise-de-contact'); - }} - /> - [] = label: OWNER_KIND_LABELS[value] })); -export const campaignsCountOptions: SelectOption[] = [ - { value: '0', label: 'Dans aucune campagne en cours' }, - { value: '1', label: 'Déjà contacté 1 fois' }, - { value: '2', label: 'Déjà contacté 2 fois' }, - { value: 'gt2', label: 'Déjà contacté 3 fois et plus' } -]; - export const statusOptions = ( statusExcluded?: HousingStatus[] ): SelectOption[] => [ diff --git a/server/src/models/HousingFiltersApi.ts b/server/src/models/HousingFiltersApi.ts index 6c7cb48bc..8e929aba0 100644 --- a/server/src/models/HousingFiltersApi.ts +++ b/server/src/models/HousingFiltersApi.ts @@ -71,7 +71,6 @@ const validators = (property = 'filters'): ValidationChain[] => [ body(`${property}.ownershipKinds`).custom(isArrayOf(isString)).optional(), body(`${property}.housingCounts`).custom(isArrayOf(isString)).optional(), body(`${property}.vacancyRates`).custom(isArrayOf(isString)).optional(), - body(`${property}.campaignsCounts`).custom(isArrayOf(isString)).optional(), body(`${property}.campaignIds`).custom(isArrayOf(isUUID)).optional(), body(`${property}.ownerIds`).custom(isArrayOf(isUUID)).optional(), body(`${property}.localities`).custom(isArrayOf(isString)).optional(), diff --git a/server/src/repositories/housingRepository.ts b/server/src/repositories/housingRepository.ts index 86dc02f1f..a4a62392d 100644 --- a/server/src/repositories/housingRepository.ts +++ b/server/src/repositories/housingRepository.ts @@ -455,32 +455,8 @@ function filteredQuery(opts: FilteredQueryOptions) { `cardinality(${campaignsTable}.campaign_ids) = 0` ); } - if (filters.campaignsCounts?.includes('current')) { - whereBuilder.orWhereRaw( - `cardinality(${campaignsTable}.campaign_ids) >= 1` - ); - } - if (filters.campaignsCounts?.indexOf('1') !== -1) { - whereBuilder.orWhereRaw( - `cardinality(${campaignsTable}.campaign_ids)`, - 1 - ); - } - if (filters.campaignsCounts?.indexOf('2') !== -1) { - whereBuilder.orWhereRaw( - `cardinality(${campaignsTable}.campaign_ids)`, - 2 - ); - } - if (filters.campaignsCounts?.indexOf('gt3') !== -1) { - whereBuilder.orWhereRaw( - `cardinality(${campaignsTable}.campaign_ids) >= ?`, - 3 - ); - } }); } - if (filters.ownerIds?.length) { queryBuilder.whereIn(`${ownerTable}.id`, filters.ownerIds); }