🐛 Fix annuler rejet abandon (#1440)

* 🐛 fix annuler rejet behavior * 🚚 extract annulerRejet from domain annuler
MTES-MCT · Nov 24, 2023 · ad4efaf · ad4efaf
1 parent c7a4b20
commit ad4efaf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/packages/domain/lauréat/src/abandon/abandon.aggregate.ts b/packages/domain/lauréat/src/abandon/abandon.aggregate.ts
@@ -26,7 +26,7 @@ import {
   confirmer,
 } from './confirmer/confirmerAbandon.behavior';
 import { AucunAbandonEnCours } from './aucunAbandonEnCours.error';
-import { annulerRejet } from './annuler/annulerRejetAbandon.behavior';
+import { annulerRejet } from './annulerRejet/annulerRejetAbandon.behavior';
 import {
   transmettrePreuveRecandidature,
   PreuveRecandidatureTransmiseEvent,

diff --git a/packages/domain/lauréat/src/abandon/abandon.register.ts b/packages/domain/lauréat/src/abandon/abandon.register.ts
@@ -3,7 +3,7 @@ import { registerAccorderAbandonCommand } from './accorder/accorderAbandon.comma
 import { registerAccorderAbandonUseCase } from './accorder/accorderAbandon.usecase';
 import { registerAnnulerAbandonCommand } from './annuler/annulerAbandon.command';
 import { registerAnnulerAbandonUseCase } from './annuler/annulerAbandon.usecase';
-import { registerAnnulerRejetAbandonUseCase } from './annuler/annulerRejetAbandon.usecase';
+import { registerAnnulerRejetAbandonUseCase } from './annulerRejet/annulerRejetAbandon.usecase';
 import { registerConfirmerAbandonCommand } from './confirmer/confirmerAbandon.command';
 import { registerConfirmerAbandonUseCase } from './confirmer/confirmerAbandon.usecase';
 import {
@@ -20,7 +20,7 @@ import {
 } from './lister/listerAbandon.query';
 import { registerRejeterAbandonCommand } from './rejeter/rejeterAbandon.command';
 import { registerRejeterAbandonUseCase } from './rejeter/rejeterAbandon.usecase';
-import { registerAnnulerRejetAbandonCommand } from './annuler/annulerRejetAbandon.command';
+import { registerAnnulerRejetAbandonCommand } from './annulerRejet/annulerRejetAbandon.command';
 import { registerTransmettrePreuveRecandidatureAbandonCommand } from './transmettre/transmettrePreuveRecandidatureAbandon.command';
 import { registerTransmettrePreuveRecandidatureAbandonUseCase } from './transmettre/transmettrePreuveRecandidatureAbandon.usecase';
 import { registerDemanderPreuveRecandidatureAbandonCommand } from './demander/demanderPreuveRecandidatureAbandon.command';

diff --git a/...n/annuler/annulerRejetAbandon.behavior.ts → ...ulerRejet/annulerRejetAbandon.behavior.ts b/...n/annuler/annulerRejetAbandon.behavior.ts → ...ulerRejet/annulerRejetAbandon.behavior.ts
@@ -2,6 +2,7 @@ import { DateTime, IdentifiantProjet } from '@potentiel-domain/common';
 import { IdentifiantUtilisateur } from '@potentiel-domain/utilisateur';
 import { AbandonAggregate } from '../abandon.aggregate';
 import * as StatutAbandon from '../statutAbandon.valueType';
+import { AbandonAnnuléEvent } from '../annuler/annulerAbandon.behavior';
 
 export type AnnulerRejetOptions = {
   dateAnnulation: DateTime.ValueType;
@@ -13,13 +14,18 @@ export async function annulerRejet(
   this: AbandonAggregate,
   { dateAnnulation, utilisateur, identifiantProjet }: AnnulerRejetOptions,
 ) {
-  this.statut.vérifierQueLeChangementDeStatutEstPossibleEn(StatutAbandon.annulé);
+  this.statut.vérifierQueLeChangementDeStatutEstPossibleEn(StatutAbandon.demandé);
 
-  await this.annuler({
-    dateAnnulation,
-    identifiantProjet,
-    utilisateur,
-  });
+  const event: AbandonAnnuléEvent = {
+    type: 'AbandonAnnulé-V1',
+    payload: {
+      identifiantProjet: identifiantProjet.formatter(),
+      annuléLe: dateAnnulation.formatter(),
+      annuléPar: utilisateur.formatter(),
+    },
+  };
+
+  await this.publish(event);
 
   await this.demander({
     dateDemande: this.demande.demandéLe,

diff --git a/...on/annuler/annulerRejetAbandon.command.ts → ...nulerRejet/annulerRejetAbandon.command.ts b/...on/annuler/annulerRejetAbandon.command.ts → ...nulerRejet/annulerRejetAbandon.command.ts
diff --git a/...on/annuler/annulerRejetAbandon.usecase.ts → ...nulerRejet/annulerRejetAbandon.usecase.ts b/...on/annuler/annulerRejetAbandon.usecase.ts → ...nulerRejet/annulerRejetAbandon.usecase.ts
diff --git a/packages/domain/lauréat/src/abandon/index.ts b/packages/domain/lauréat/src/abandon/index.ts
@@ -1,6 +1,6 @@
 import { AccorderAbandonUseCase } from './accorder/accorderAbandon.usecase';
 import { AnnulerAbandonUseCase } from './annuler/annulerAbandon.usecase';
-import { AnnulerRejetAbandonUseCase } from './annuler/annulerRejetAbandon.usecase';
+import { AnnulerRejetAbandonUseCase } from './annulerRejet/annulerRejetAbandon.usecase';
 import { ConfirmerAbandonUseCase } from './confirmer/confirmerAbandon.usecase';
 import {
   ConsulterAbandonQuery,