probleme de synchronisation des jobs resolution partielle

Author: alainabbas

src/core/backends/backends.service.ts

@@ -6,19 +6,19 @@ import {
   RequestTimeoutException,
   UnprocessableEntityException,
 } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
-import { Document, ModifyResult, Query, Types } from 'mongoose';
-import { AbstractQueueProcessor } from '~/_common/abstracts/abstract.queue.processor';
-import { IdentityState } from '~/management/identities/_enums/states.enum';
-import { Identities } from '~/management/identities/_schemas/identities.schema';
-import { IdentitiesService } from '~/management/identities/identities.service';
-import { JobState } from '../jobs/_enums/state.enum';
-import { Jobs } from '../jobs/_schemas/jobs.schema';
-import { JobsService } from '../jobs/jobs.service';
-import { Tasks } from '../tasks/_schemas/tasks.schema';
-import { TasksService } from '../tasks/tasks.service';
-import { ActionType } from './_enum/action-type.enum';
-import { ExecuteJobOptions } from './_interfaces/execute-job-options.interface';
+import {ModuleRef} from '@nestjs/core';
+import {Document, ModifyResult, Query, Types} from 'mongoose';
+import {AbstractQueueProcessor} from '~/_common/abstracts/abstract.queue.processor';
+import {IdentityState} from '~/management/identities/_enums/states.enum';
+import {Identities} from '~/management/identities/_schemas/identities.schema';
+import {IdentitiesService} from '~/management/identities/identities.service';
+import {JobState} from '../jobs/_enums/state.enum';
+import {Jobs} from '../jobs/_schemas/jobs.schema';
+import {JobsService} from '../jobs/jobs.service';
+import {Tasks} from '../tasks/_schemas/tasks.schema';
+import {TasksService} from '../tasks/tasks.service';
+import {ActionType} from './_enum/action-type.enum';
+import {ExecuteJobOptions} from './_interfaces/execute-job-options.interface';
 
 const DEFAULT_SYNC_TIMEOUT = 30_000;
 
@@ -45,7 +45,7 @@ export class BackendsService extends AbstractQueueProcessor {
     const jobsCompleted = await this._queue.getCompleted();
     for (const job of jobsCompleted) {
       const isSyncedJob = await this.jobsService.model.findOneAndUpdate<Jobs>(
-        { jobId: job.id, state: { $ne: JobState.COMPLETED } },
+        { jobId: job.id, state: { $nin: [JobState.COMPLETED, JobState.FAILED] } },
         {
           $set: {
             state: JobState.COMPLETED,
@@ -105,11 +105,17 @@ export class BackendsService extends AbstractQueueProcessor {
     });
 
     this.queueEvents.on('completed', async (payload) => {
+      let jState = JobState.COMPLETED;
+      let iState = IdentityState.SYNCED;
+      if (payload.returnvalue.status !== 0) {
+        jState = JobState.FAILED;
+        iState = IdentityState.ON_ERROR;
+      }
       const completedJob = await this.jobsService.model.findOneAndUpdate<Jobs>(
-        { jobId: payload.jobId, state: { $ne: JobState.COMPLETED } },
+        { jobId: payload.jobId },
         {
           $set: {
-            state: JobState.COMPLETED,
+            state: jState,
             finishedAt: new Date(),
             result: payload.returnvalue,
           },
@@ -119,10 +125,14 @@ export class BackendsService extends AbstractQueueProcessor {
 
       await this.identitiesService.model.findByIdAndUpdate(completedJob?.concernedTo?.id, {
         $set: {
-          state: IdentityState.SYNCED,
+          state: iState,
         },
       });
-      this.logger.log(`Job completed... Syncing [${payload.jobId}]`);
+      if (jState === JobState.COMPLETED) {
+        this.logger.log(`Job completed... Syncing [${payload.jobId}]`);
+      } else {
+        this.logger.error(`Job FAILED... Syncing [${payload.jobId}]`);
+      }
     });
   }
 

src/core/jobs/_dto/jobs.dto.ts

@@ -1,9 +1,10 @@
 import { ApiProperty, PartialType } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { IsMongoId, IsNotEmpty, IsObject, IsString, ValidateNested } from 'class-validator';
+import {IsMongoId, IsNotEmpty, IsNumber, IsObject, IsString, ValidateNested} from 'class-validator';
 import { Types } from 'mongoose';
 import { CustomFieldsDto } from '~/_common/abstracts/dto/custom-fields.dto';
 import { ConcernedToPartDTO } from './_parts/concerned-to.part.dto';
+import {JobState} from "~/core/jobs/_enums/state.enum";
 
 export class JobsCreateDto extends CustomFieldsDto {
   @IsString()
@@ -35,6 +36,10 @@ export class JobsCreateDto extends CustomFieldsDto {
   @IsObject()
   @ApiProperty()
   public result: object;
+
+  @IsNumber()
+  @ApiProperty()
+  public state: number;
 }
 
 export class JobsDto extends JobsCreateDto {

src/core/jobs/jobs.controller.ts

@@ -27,6 +27,7 @@ export class JobsController extends AbstractController {
     metadata: 1,
     params: 1,
     result: 1,
+    state: 1,
   };
 
   public constructor(private readonly _service: JobsService) {