diff --git a/docs/sim-api/Preactivate.bru b/docs/sim-api/Preactivate.bru index 1bc990d..0920fae 100644 --- a/docs/sim-api/Preactivate.bru +++ b/docs/sim-api/Preactivate.bru @@ -15,7 +15,9 @@ params:query { } body:form-urlencoded { - iccid: 8933201125065160380 + iccid: 8934909001500954922 + offer: mensual + orderId: test } settings { diff --git a/packages/sim-consumidor-alai/aplication/SimAlai.controller.ts b/packages/sim-consumidor-alai/aplication/SimAlai.controller.ts index 6fd7e65..4f54c80 100644 --- a/packages/sim-consumidor-alai/aplication/SimAlai.controller.ts +++ b/packages/sim-consumidor-alai/aplication/SimAlai.controller.ts @@ -84,12 +84,14 @@ export class SimAlaiController { public preactivate() { return async (msg: ConsumeMessage) => { - console.log("[i] Evento activate ", msg.fields) - const data = this.validateMsg(msg) as SimEvents.activation + console.log("[i] Evento preactivate ", msg) + const data = this.validateMsg(msg) as SimEvents.preActivation const iccid = data.payload.iccid const correlation_id = data.headers?.message_id const externalId = data.payload.orderId + console.log("MSG:", data, data.headers) + const res = await this.tryUseCase(msg, this.uscases.preactivate({ iccid: iccid, correlation_id: correlation_id, @@ -133,7 +135,7 @@ export class SimAlaiController { public terminate() { return async (msg: ConsumeMessage) => { - console.log("Evento reActivate ", msg.fields) + console.log("Evento reActivate ", msg.fields, msg) const data = this.validateMsg(msg) as SimEvents.reActivation const iccid = data.payload.iccid const correlation_id = data.headers?.message_id diff --git a/packages/sim-consumidor-alai/aplication/SimAlai.router.ts b/packages/sim-consumidor-alai/aplication/SimAlai.router.ts index c0445bb..9c136e5 100644 --- a/packages/sim-consumidor-alai/aplication/SimAlai.router.ts +++ b/packages/sim-consumidor-alai/aplication/SimAlai.router.ts @@ -24,7 +24,7 @@ export class SimAlaiRouter { ["pause", this.simController.suspend()], ["reactivate", this.simController.reActivate()], ["cancel", this.simController.terminate()], - ["preActivate", this.simController.preactivate()] + ["preactivate", this.simController.preactivate()] ]); } diff --git a/packages/sim-consumidor-objenious/aplication/Sim.router.ts b/packages/sim-consumidor-objenious/aplication/Sim.router.ts index 7a34e29..c78e3b6 100644 --- a/packages/sim-consumidor-objenious/aplication/Sim.router.ts +++ b/packages/sim-consumidor-objenious/aplication/Sim.router.ts @@ -20,7 +20,7 @@ export class SimRouter { ["pause", this.simController.suspend()], ["cancel", this.simController.terminate()], ["reactivate", this.simController.reActivate()], - ["preActivate", this.simController.preActivate()] + ["preactivate", this.simController.preActivate()] ]); } diff --git a/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts b/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts index ba30c09..183b93f 100644 --- a/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts +++ b/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts @@ -185,7 +185,7 @@ export class SimUseCases { console.log("Sim preactivada con exito", resp.data) const operation: ObjeniousOperation = { correlation_id: preActivateData.correlation_id, - operation: "preActivate", + operation: "preactivate", iccids: String(preActivateData.identifier.identifiers), status: "noMassID", request_id: resp.data.requestId diff --git a/packages/sim-entrada-eventos/aplication/Sim.usecases.ts b/packages/sim-entrada-eventos/aplication/Sim.usecases.ts index 91f3278..af78708 100644 --- a/packages/sim-entrada-eventos/aplication/Sim.usecases.ts +++ b/packages/sim-entrada-eventos/aplication/Sim.usecases.ts @@ -164,15 +164,16 @@ export class SimUsecases { Promise> { const preActivationEvent = { - key: `sim.${args.compaƱia}.preActivate`, + key: `sim.${args.compaƱia}.preactivate`, payload: { iccid: args.iccid } } - console.log("[d] Pre - activation ", preActivationEvent) - await this.eventBus.publish([preActivationEvent]) - const preactivationWithId = this.addMessage_id(preActivationEvent) - const createdOrder = await this.saveOrder(preactivationWithId) + + const preActivationWithId = this.addMessage_id(preActivationEvent) + console.log("[d] Pre - activation ", preActivationWithId) + await this.eventBus.publish([preActivationWithId]) + const createdOrder = await this.saveOrder(preActivationWithId) if (createdOrder.error != undefined) { console.error(createdOrder.error) return { diff --git a/packages/sim-shared/domain/SimEvents.ts b/packages/sim-shared/domain/SimEvents.ts index 9911f04..4b54dd1 100644 --- a/packages/sim-shared/domain/SimEvents.ts +++ b/packages/sim-shared/domain/SimEvents.ts @@ -18,9 +18,10 @@ export namespace SimEvents { } export type preActivation = DomainEvent & { - key: `sim.${string}.preActivate`, + key: `sim.${string}.preactivate`, payload: { - iccid: string + iccid: string, + orderId?: string // Solo Alai }, }