diff --git a/src/indicator/dto/orientation-indicator.dto.ts b/src/indicator/dto/orientation-indicator.dto.ts index e922c498d2828286e1dbbac621ffd78ba2f65be8..f18c0383c449fb8cca82e9da0241b08b53e91f15 100644 --- a/src/indicator/dto/orientation-indicator.dto.ts +++ b/src/indicator/dto/orientation-indicator.dto.ts @@ -35,6 +35,7 @@ export class OrientationIndicator { @Type(() => StructureDto) origin: { nom: string; + prescripteur: string; adresse: Address; }; @@ -55,5 +56,5 @@ export class OrientationIndicator { @IsNumber() progress: number; - createdAt?: Date; + createdAt: Date; } diff --git a/src/indicator/schemas/orientation-indicator.schema.ts b/src/indicator/schemas/orientation-indicator.schema.ts index b4f715d8710b2236ac91350a73946ad215d3f143..3f672a8071d943be6ba2a3a6317dde052730a76f 100644 --- a/src/indicator/schemas/orientation-indicator.schema.ts +++ b/src/indicator/schemas/orientation-indicator.schema.ts @@ -35,11 +35,12 @@ export class Type { export type OrientationIndicatorDocument = OrientationIndicator & Document; -@Schema({ timestamps: true }) +@Schema() export class OrientationIndicator { @Prop({ type: Object }) origin: { nom: string; + prescripteur: string; adresse: Address; }; @@ -57,6 +58,9 @@ export class OrientationIndicator { @Prop({ required: true }) progress: number; + + @Prop({ type: Date, default: Date.now }) + createdAt: Date; } export const OrientationIndicatorSchema = SchemaFactory.createForClass(OrientationIndicator); diff --git a/src/indicator/services/indicator.service.ts b/src/indicator/services/indicator.service.ts index f07f5f7a8c5cac9dc8184198d0408b7735674876..a77c3d9bac467ecf786d882cd74151f0315fb263 100644 --- a/src/indicator/services/indicator.service.ts +++ b/src/indicator/services/indicator.service.ts @@ -34,7 +34,7 @@ export class IndicatorService { const query = {}; if (startDate || endDate) { - query['createdAt'] = {}; // replace 'dateField' with the name of your date attribute in the collection + query['createdAt'] = {}; if (startDate) { query['createdAt']['$gte'] = new Date(startDate); } diff --git a/test/mock/data/indicators/orientationIndicators.mock.data.ts b/test/mock/data/indicators/orientationIndicators.mock.data.ts index b641bf90f7c808b67fa88370df1c5112e7953c50..8dd425a2c9ce53aae1fa27204a307208e872569c 100644 --- a/test/mock/data/indicators/orientationIndicators.mock.data.ts +++ b/test/mock/data/indicators/orientationIndicators.mock.data.ts @@ -3,6 +3,7 @@ import { OrientationIndicator } from '../../../../src/indicator/dto/orientation- export const mockIndicator: OrientationIndicator = { origin: { nom: 'Structure 1', + prescripteur: 'Prescripteur 1', adresse: { numero: '1', street: 'Rue de la structure 1', @@ -40,6 +41,7 @@ export const mockIndicators: OrientationIndicator[] = [ { origin: { nom: 'Structure 1', + prescripteur: 'Prescripteur 1', adresse: { numero: '1', street: 'Rue de la structure 1', @@ -75,6 +77,7 @@ export const mockIndicators: OrientationIndicator[] = [ { origin: { nom: 'Structure 3', + prescripteur: 'Prescripteur 3', adresse: { numero: '3', street: 'Rue de la structure 3',