From 403e2a193e56c5eeb46068cc8fc8fad154fcad5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com> Date: Wed, 20 Mar 2024 09:57:50 +0100 Subject: [PATCH] feat: use createdAt instead of startDate --- src/models/grdfConsent.ts | 7 +++---- src/models/sgeConsent.model.ts | 4 ++-- src/services/grdfConsent.service.ts | 6 +++--- src/services/sgeConsent.service.ts | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/models/grdfConsent.ts b/src/models/grdfConsent.ts index 396b0d3f..0729f8f7 100644 --- a/src/models/grdfConsent.ts +++ b/src/models/grdfConsent.ts @@ -3,15 +3,14 @@ import { DateTime } from 'luxon' import { dateFormatter } from '../utils/dateFormatter' export interface IGrdfConsent - extends Omit<GrdfConsentEntity, 'CreatedAt' | 'endDate' | 'startDate'> { - startDate: DateTime + extends Omit<GrdfConsentEntity, 'CreatedAt' | 'endDate'> { + createdAt: DateTime endDate: DateTime } export interface GrdfConsentEntity { ID: number CreatedAt: string - startDate: string endDate: string firstname: string lastname: string @@ -63,7 +62,7 @@ export const grdfColumnDef: ColDef[] = [ filter: true, }, { - field: 'startDate', + field: 'createdAt', valueFormatter: dateFormatter, headerName: 'Début du consentement', initialWidth: 150, diff --git a/src/models/sgeConsent.model.ts b/src/models/sgeConsent.model.ts index 6746d21c..bd000c59 100644 --- a/src/models/sgeConsent.model.ts +++ b/src/models/sgeConsent.model.ts @@ -4,7 +4,7 @@ import { dateFormatter } from '../utils/dateFormatter' export interface ISgeConsent extends Omit<SgeConsentEntity, 'CreatedAt' | 'endDate' | 'inseeCode'> { - startDate: DateTime + createdAt: DateTime endDate: DateTime } @@ -82,7 +82,7 @@ export const sgeColumnDefs: ColDef[] = [ initialWidth: 100, }, { - field: 'startDate', + field: 'createdAt', valueFormatter: dateFormatter, headerName: 'Début du consentement', initialWidth: 150, diff --git a/src/services/grdfConsent.service.ts b/src/services/grdfConsent.service.ts index fcf60b47..16eab96e 100644 --- a/src/services/grdfConsent.service.ts +++ b/src/services/grdfConsent.service.ts @@ -44,7 +44,7 @@ export class GrdfConsentService { * @param consentEntity */ public parseConsent = (consentEntity: GrdfConsentEntity): IGrdfConsent => { - const startDate = DateTime.fromISO(consentEntity.startDate, { + const createdAt = DateTime.fromISO(consentEntity.CreatedAt, { zone: 'utc', }).setLocale('fr-FR') const endDate = DateTime.fromISO(consentEntity.endDate, { @@ -53,8 +53,8 @@ export class GrdfConsentService { return { ID: consentEntity.ID, - startDate: startDate, - endDate: endDate, + createdAt, + endDate, firstname: consentEntity.firstname, lastname: consentEntity.lastname, pce: consentEntity.pce, diff --git a/src/services/sgeConsent.service.ts b/src/services/sgeConsent.service.ts index ad71837d..b69ef35f 100644 --- a/src/services/sgeConsent.service.ts +++ b/src/services/sgeConsent.service.ts @@ -44,7 +44,7 @@ export class SgeConsentService { * @param consentEntity */ public parseConsent = (consentEntity: SgeConsentEntity): ISgeConsent => { - const startDate = DateTime.fromISO(consentEntity.CreatedAt, { + const createdAt = DateTime.fromISO(consentEntity.CreatedAt, { zone: 'utc', }).setLocale('fr-FR') const endDate = DateTime.fromISO(consentEntity.endDate, { @@ -53,8 +53,8 @@ export class SgeConsentService { return { ID: consentEntity.ID, - startDate: startDate, - endDate: endDate, + createdAt, + endDate, firstname: consentEntity.firstname, lastname: consentEntity.lastname, pointID: consentEntity.pointID, -- GitLab