wip inProgress / history

src/orientation/dto/orientation.dto.ts

@@ -136,8 +136,8 @@ export class OrientationDto {
   @Type(() => customStructureDto)
   structureOrientator: string | customStructureDto;
 
-  @ApiProperty({ enum: ['pending', 'acknowledged', 'completed'] })
+  @ApiProperty({ enum: ['pending', 'acknowledged', 'completed', 'uncompleted', 'expired'] })
   @IsNotEmpty()
-  @IsEnum(['pending', 'acknowledged', 'completed'])
-  status: 'pending' | 'acknowledged' | 'completed';
+  @IsEnum(['pending', 'acknowledged', 'completed', 'uncompleted', 'expired'])
+  status: 'pending' | 'acknowledged' | 'completed' | 'uncompleted' | 'expired';
 }

src/orientation/orientation.schema.ts

@@ -98,7 +98,11 @@ export class Orientation {
   @Prop({ type: mongoose.Schema.Types.Mixed })
   structureOrientator: string | customStructure;
 
-  @Prop({ required: true, enum: ['pending', 'acknowledged', 'completed'], default: 'pending' })
+  @Prop({
+    required: true,
+    enum: ['pending', 'acknowledged', 'completed', 'uncompleted', 'expired'],
+    default: 'pending',
+  })
   status: string;
 }
 

src/orientation/orientation.service.ts

@@ -39,6 +39,7 @@ export class OrientationService {
 
   public async find(userId: string, structureId: string = null): Promise<any> {
     try {
+      const historyStatus = ['completed', 'uncompleted', 'expired'];
       let myOrientationsFilters;
       let todoOrientationsFilters;
 
@@ -58,8 +59,14 @@ export class OrientationService {
       }
 
       return {
-        myOrientations: await this.findWithFilters(myOrientationsFilters),
-        todoOrientations: await this.findWithFilters(todoOrientationsFilters),
+        myOrientations: {
+          inProgress: await this.findWithFilters({ ...myOrientationsFilters, status: { $nin: historyStatus } }),
+          history: await this.findWithFilters({ ...myOrientationsFilters, status: { $in: historyStatus } }),
+        },
+        todoOrientations: {
+          inProgress: await this.findWithFilters({ ...todoOrientationsFilters, status: { $nin: historyStatus } }),
+          history: await this.findWithFilters({ ...todoOrientationsFilters, status: { $in: historyStatus } }),
+        },
       };
     } catch (e) {
       this.logger.error(`Error fetching orientations with details: ${e.message}`);