Skip to content
Snippets Groups Projects
Commit 656ca463 authored by SAFINE LAGET Anis's avatar SAFINE LAGET Anis Committed by BITARD Michaël
Browse files

fix(substances): màj d'étape qui échoue à cause de substance fiscale (au lieu...

fix(substances): màj d'étape qui échoue à cause de substance fiscale (au lieu de substance légale) (!1565)
parent 55f57920
No related branches found
No related tags found
1 merge request!1565fix(substances): màj d'étape qui échoue à cause de substance fiscale (au lieu de substance légale)
Pipeline #441637 passed
...@@ -156,7 +156,7 @@ describe('etapeModifier', () => { ...@@ -156,7 +156,7 @@ describe('etapeModifier', () => {
duree: null, duree: null,
dateDebut: null, dateDebut: null,
dateFin: null, dateFin: null,
substances: [], substances: ['geob'],
geojson4326Perimetre: null, geojson4326Perimetre: null,
geojsonOriginePerimetre: null, geojsonOriginePerimetre: null,
geojson4326Points: null, geojson4326Points: null,
......
...@@ -13,7 +13,7 @@ import { shortCircuitError, ZodUnparseable } from '../../tools/fp-tools' ...@@ -13,7 +13,7 @@ import { shortCircuitError, ZodUnparseable } from '../../tools/fp-tools'
import { etapeTypeIdValidator } from 'camino-common/src/static/etapesTypes' import { etapeTypeIdValidator } from 'camino-common/src/static/etapesTypes'
import { MultiPolygon, multiPolygonValidator } from 'camino-common/src/perimetre' import { MultiPolygon, multiPolygonValidator } from 'camino-common/src/perimetre'
import { DeepReadonly, isNotNullNorUndefined } from 'camino-common/src/typescript-tools' import { DeepReadonly, isNotNullNorUndefined } from 'camino-common/src/typescript-tools'
import { SubstanceFiscaleId, substanceFiscaleIdValidator } from 'camino-common/src/static/substancesFiscales' import { SubstanceLegaleId, substanceLegaleIdValidator } from 'camino-common/src/static/substancesLegales'
type GetEtapeConsentement = Omit<GetEtapeConsentementDb, 'geojson4326_perimetre'> & { geojson4326_perimetre: MultiPolygon } type GetEtapeConsentement = Omit<GetEtapeConsentementDb, 'geojson4326_perimetre'> & { geojson4326_perimetre: MultiPolygon }
export const getEtapeConsentement = (pool: Pool, etapeId: EtapeId): Effect.Effect<GetEtapeConsentement | null, CaminoError<DBNotFound | DbQueryAccessError | ZodUnparseable>> => { export const getEtapeConsentement = (pool: Pool, etapeId: EtapeId): Effect.Effect<GetEtapeConsentement | null, CaminoError<DBNotFound | DbQueryAccessError | ZodUnparseable>> => {
...@@ -39,7 +39,7 @@ const getEtapeConsentementDbValidator = z.object({ ...@@ -39,7 +39,7 @@ const getEtapeConsentementDbValidator = z.object({
type_id: etapeTypeIdValidator, type_id: etapeTypeIdValidator,
date: caminoDateValidator, date: caminoDateValidator,
geojson4326_perimetre: multiPolygonValidator.nullable(), geojson4326_perimetre: multiPolygonValidator.nullable(),
substances: z.array(substanceFiscaleIdValidator), substances: z.array(substanceLegaleIdValidator),
titre_type_id: titreTypeIdValidator, titre_type_id: titreTypeIdValidator,
demarche_ids_consentement: z.array(demarcheIdValidator), demarche_ids_consentement: z.array(demarcheIdValidator),
}) })
...@@ -67,7 +67,7 @@ export const updateEtapeConsentement = ( ...@@ -67,7 +67,7 @@ export const updateEtapeConsentement = (
etapeId: EtapeId, etapeId: EtapeId,
dateDemande: CaminoDate, dateDemande: CaminoDate,
perimetreDemande: MultiPolygon, perimetreDemande: MultiPolygon,
substancesDemande: SubstanceFiscaleId[], substancesDemande: SubstanceLegaleId[],
oldDemarcheIds: DemarcheId[] oldDemarcheIds: DemarcheId[]
): Effect.Effect<UpdateEtapeConsentement, CaminoError<DbQueryAccessError | ZodUnparseable>> => { ): Effect.Effect<UpdateEtapeConsentement, CaminoError<DbQueryAccessError | ZodUnparseable>> => {
return pipe( return pipe(
...@@ -102,7 +102,7 @@ type GetDemarchesEnSuperpositionPourConsentement = z.infer<typeof getDemarchesEn ...@@ -102,7 +102,7 @@ type GetDemarchesEnSuperpositionPourConsentement = z.infer<typeof getDemarchesEn
const getDemarchesEnSuperpositionPourConsentementDb = sql< const getDemarchesEnSuperpositionPourConsentementDb = sql<
Redefine< Redefine<
IGetDemarchesEnSuperpositionPourConsentementDbQuery, IGetDemarchesEnSuperpositionPourConsentementDbQuery,
{ dateDemande: CaminoDate; perimetreDemande: DeepReadonly<MultiPolygon>; substancesDemande: DeepReadonly<SubstanceFiscaleId[]> }, { dateDemande: CaminoDate; perimetreDemande: DeepReadonly<MultiPolygon>; substancesDemande: DeepReadonly<SubstanceLegaleId[]> },
GetDemarchesEnSuperpositionPourConsentement GetDemarchesEnSuperpositionPourConsentement
> >
>` >`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment