fix bug status conflict in exec publication

BaseAdresseNationale · Jan 15, 2024 · 931ec28 · 931ec28
1 parent dae48d2
commit 931ec28
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/apps/api/src/modules/base_locale/base_locale.service.ts b/apps/api/src/modules/base_locale/base_locale.service.ts
@@ -206,7 +206,7 @@ export class BaseLocaleService {
     const updatedBaseLocale = await this.baseLocaleModel.findOneAndUpdate(
       { _id: baseLocale._id },
       { $set: update },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     // If emails fields is overrided, we compare with current array to send a notification to new email addresses
@@ -246,7 +246,7 @@ export class BaseLocaleService {
           status: StatusBaseLocalEnum.DRAFT,
         },
       },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     const templateEmail = createBalCreationNotificationEmail({
@@ -419,7 +419,7 @@ export class BaseLocaleService {
     const recoveredBaseLocale = await this.baseLocaleModel.findByIdAndUpdate(
       { _id: baseLocale._id },
       { $set: { _deleted: null, _updated: now } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     return recoveredBaseLocale;
@@ -430,7 +430,7 @@ export class BaseLocaleService {
     const updatedBaseLocale = await this.baseLocaleModel.findByIdAndUpdate(
       { _id: baseLocale._id },
       { $set: { token } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     const email = createTokenRenewalNotificationEmail({

diff --git a/apps/api/src/modules/numeros/numero.service.ts b/apps/api/src/modules/numeros/numero.service.ts
@@ -235,7 +235,7 @@ export class NumeroService {
     const numeroUpdated: Numero = await this.numeroModel.findOneAndUpdate(
       { _id: numero._id, _deleted: null },
       { $set: { ...updateNumeroDto, _updated: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     if (numeroUpdated) {
@@ -273,7 +273,7 @@ export class NumeroService {
     const numeroUpdated: Numero = await this.numeroModel.findOneAndUpdate(
       { _id: numero._id },
       { $set: { _deleted: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     // UPDATE TILES VOIE

diff --git a/apps/api/src/modules/toponyme/toponyme.service.ts b/apps/api/src/modules/toponyme/toponyme.service.ts
@@ -140,7 +140,7 @@ export class ToponymeService {
     const toponymeUpdated = await this.toponymeModel.findOneAndUpdate(
       { _id: toponyme._id, _deleted: null },
       { $set: { ...updateToponymeDto, _updated: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     // SET _updated BAL
@@ -156,7 +156,7 @@ export class ToponymeService {
     const toponymeUpdated: Toponyme = await this.toponymeModel.findOneAndUpdate(
       { _id: toponyme._id },
       { $set: { _deleted: new Date(), _updated: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     await this.numeroService.updateMany(
@@ -176,7 +176,7 @@ export class ToponymeService {
     const updatedToponyme = await this.toponymeModel.findOneAndUpdate(
       { _id: toponyme._id },
       { $set: { _deleted: null, _updated: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
     // SET _updated OF TOPONYME
     await this.baseLocaleService.touch(toponyme._bal);

diff --git a/apps/api/src/modules/voie/voie.service.ts b/apps/api/src/modules/voie/voie.service.ts
@@ -272,7 +272,7 @@ export class VoieService {
     const voieUpdated: Voie = await this.voieModel.findOneAndUpdate(
       { _id: voie._id },
       { $set: { _deleted: new Date(), _updated: new Date() } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     // SET _updated OF VOIE

diff --git a/libs/shared/src/modules/publication/publication.service.ts b/libs/shared/src/modules/publication/publication.service.ts
@@ -2,6 +2,7 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model, Types } from 'mongoose';
 import * as hasha from 'hasha';
+import { assignIn } from 'lodash';
 
 import {
   Habilitation,
@@ -171,7 +172,7 @@ export class PublicationService {
         },
       },
       { $set: { 'sync.isPaused': isPaused } },
-      { returnDocument: 'after' },
+      { new: true },
     );
 
     if (!baseLocale) {
@@ -188,21 +189,19 @@ export class PublicationService {
     baseLocale: BaseLocale,
     syncChanges: Partial<Sync>,
   ): Promise<Sync> {
+    const sync: Sync = baseLocale.sync;
+    assignIn(sync, syncChanges);
     const changes: Partial<BaseLocale> = {
-      sync: {
-        ...baseLocale.sync,
-        ...syncChanges,
-      },
+      sync,
       ...(syncChanges.status === 'conflict' && {
         status: StatusBaseLocalEnum.REPLACED,
       }),
     };
-
     const baseLocaleChanged: BaseLocale =
       await this.baseLocaleModel.findOneAndUpdate(
         { _id: baseLocale._id },
         { $set: changes },
-        { returnDocument: 'after' },
+        { new: true },
       );
 
     return baseLocaleChanged.sync;
@@ -223,7 +222,7 @@ export class PublicationService {
       await this.baseLocaleModel.findOneAndUpdate(
         { _id: baseLocale._id },
         { $set: { status: StatusBaseLocalEnum.PUBLISHED, sync } },
-        { returnDocument: 'after' },
+        { new: true },
       );
 
     return baseLocaleSynced;
@@ -257,8 +256,7 @@ export class PublicationService {
 
     // On vérifie si la dernière publication de la BAL est la révision courante
     if (
-      new Types.ObjectId(currentRevision?._id) !==
-      baseLocale.sync.lastUploadedRevisionId
+      currentRevision?._id !== baseLocale.sync.lastUploadedRevisionId.toString()
     ) {
       return this.updateSync(baseLocale, {
         status: StatusSyncEnum.CONFLICT,
@@ -268,7 +266,7 @@ export class PublicationService {
 
     // Si la date du changement de BAL est la même que la date du currentUpdated du sync de la BAL
     // On met le status du sync de la BAL a sync et on le retourne
-    // ???
+
     if (baseLocale._updated === baseLocale.sync.currentUpdated) {
       if (baseLocale.sync.status === StatusSyncEnum.SYNCED) {
         return baseLocale.sync;