From ad4efaffd01123be3c853c8b10c0836662b2129a Mon Sep 17 00:00:00 2001 From: HanaeY <72154904+HanaeY@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:24:09 +0100 Subject: [PATCH] :bug: Fix annuler rejet abandon (#1440) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 fix annuler rejet behavior * 🚚 extract annulerRejet from domain annuler --- .../src/abandon/abandon.aggregate.ts" | 2 +- .../src/abandon/abandon.register.ts" | 4 ++-- .../annulerRejetAbandon.behavior.ts" | 18 ++++++++++++------ .../annulerRejetAbandon.command.ts" | 0 .../annulerRejetAbandon.usecase.ts" | 0 .../laur\303\251at/src/abandon/index.ts" | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) rename "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.behavior.ts" => "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.behavior.ts" (71%) rename "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.command.ts" => "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.command.ts" (100%) rename "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.usecase.ts" => "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.usecase.ts" (100%) diff --git "a/packages/domain/laur\303\251at/src/abandon/abandon.aggregate.ts" "b/packages/domain/laur\303\251at/src/abandon/abandon.aggregate.ts" index 62da213423..6de03f5f55 100644 --- "a/packages/domain/laur\303\251at/src/abandon/abandon.aggregate.ts" +++ "b/packages/domain/laur\303\251at/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\303\251at/src/abandon/abandon.register.ts" "b/packages/domain/laur\303\251at/src/abandon/abandon.register.ts" index ad722e8025..b4d2de8da0 100644 --- "a/packages/domain/laur\303\251at/src/abandon/abandon.register.ts" +++ "b/packages/domain/laur\303\251at/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/packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.behavior.ts" "b/packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.behavior.ts" similarity index 71% rename from "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.behavior.ts" rename to "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.behavior.ts" index e6e687ff87..0f136e1807 100644 --- "a/packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.behavior.ts" +++ "b/packages/domain/laur\303\251at/src/abandon/annulerRejet/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/packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.command.ts" "b/packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.command.ts" similarity index 100% rename from "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.command.ts" rename to "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.command.ts" diff --git "a/packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.usecase.ts" "b/packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.usecase.ts" similarity index 100% rename from "packages/domain/laur\303\251at/src/abandon/annuler/annulerRejetAbandon.usecase.ts" rename to "packages/domain/laur\303\251at/src/abandon/annulerRejet/annulerRejetAbandon.usecase.ts" diff --git "a/packages/domain/laur\303\251at/src/abandon/index.ts" "b/packages/domain/laur\303\251at/src/abandon/index.ts" index 258eb61c9b..79894af53c 100644 --- "a/packages/domain/laur\303\251at/src/abandon/index.ts" +++ "b/packages/domain/laur\303\251at/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,