From fe085cf128624066ccf76081a175e52ee1546030 Mon Sep 17 00:00:00 2001 From: Alvar San Martin Date: Tue, 27 Jan 2026 14:48:44 +0100 Subject: [PATCH] Rename del proyecto de objenious --- deployment/rabbit/definitions.json | 39 +++++-------------- .../.env | 0 .../aplication/JWT.service.test.ts | 4 +- .../aplication/JWT.service.ts | 0 .../aplication/SimActivation.controller.ts | 0 .../config/env/index.ts | 0 .../config/eventBusConfig.ts | 18 +++++++++ .../index.ts | 4 +- .../mykey.pub | 0 .../obj.pub | 0 .../package.json | 2 +- .../tsconfig.json | 2 +- .../vitest.config.ts | 0 .../aplication/Sim.controller.ts | 3 +- .../aplication/Sim.usecases.ts | 3 +- yarn.lock | 4 +- 16 files changed, 38 insertions(+), 41 deletions(-) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/.env (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/aplication/JWT.service.test.ts (80%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/aplication/JWT.service.ts (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/aplication/SimActivation.controller.ts (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/config/env/index.ts (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/config/eventBusConfig.ts (50%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/index.ts (76%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/mykey.pub (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/obj.pub (100%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/package.json (94%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/tsconfig.json (91%) rename packages/{sim-consumidor-activaciones => sim-consumidor-objenious}/vitest.config.ts (100%) diff --git a/deployment/rabbit/definitions.json b/deployment/rabbit/definitions.json index cdaca00..539e8c0 100644 --- a/deployment/rabbit/definitions.json +++ b/deployment/rabbit/definitions.json @@ -47,6 +47,15 @@ "auto_delete": false, "internal": false, "argurments": {} + }, + { + "name": "sim.dlx", + "vhost": "sim-vhost", + "type": "topic", + "durable": true, + "auto_delete": false, + "internal": false, + "argurments": {} } ], "queues": [ @@ -56,39 +65,9 @@ "durable": true, "auto_delete": false, "arguments": {} - }, - { - "name": "sim.activations", - "vhost": "sim-vhost", - "durable": true, - "auto_delete": false, - "arguments": {} - }, - { - "name": "sim.cancelations", - "vhost": "sim-vhost", - "durable": true, - "auto_delete": false, - "arguments": {} } ], "bindings": [ - { - "source": "sim.exchange", - "vhost": "sim-vhost", - "destination": "sim.activations", - "destination_type": "queue", - "routing_key": "sim.activation", - "arguments": {} - }, - { - "source": "sim.exchange", - "vhost": "sim-vhost", - "destination": "sim.cancelations", - "destination_type": "queue", - "routing_key": "sim.cancelation", - "arguments": {} - }, { "source": "sim.exchange", "vhost": "sim-vhost", diff --git a/packages/sim-consumidor-activaciones/.env b/packages/sim-consumidor-objenious/.env similarity index 100% rename from packages/sim-consumidor-activaciones/.env rename to packages/sim-consumidor-objenious/.env diff --git a/packages/sim-consumidor-activaciones/aplication/JWT.service.test.ts b/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts similarity index 80% rename from packages/sim-consumidor-activaciones/aplication/JWT.service.test.ts rename to packages/sim-consumidor-objenious/aplication/JWT.service.test.ts index 0c424bf..8cd3932 100644 --- a/packages/sim-consumidor-activaciones/aplication/JWT.service.test.ts +++ b/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts @@ -3,9 +3,6 @@ import { JWTService } from "./JWT.service" describe("Tokens Objenious", () => { const jwtService = new JWTService() - // loadEnvFile("packages/sim-consumidor-activaciones/.env") - - console.log("test env", process.env.OBJ_CLIENT_ID) test("Solicicitud normal de auth", async () => { const token = await jwtService.getAccessToken() @@ -17,3 +14,4 @@ describe("Tokens Objenious", () => { console.log("acceso refresh objenious", token) }) }) + diff --git a/packages/sim-consumidor-activaciones/aplication/JWT.service.ts b/packages/sim-consumidor-objenious/aplication/JWT.service.ts similarity index 100% rename from packages/sim-consumidor-activaciones/aplication/JWT.service.ts rename to packages/sim-consumidor-objenious/aplication/JWT.service.ts diff --git a/packages/sim-consumidor-activaciones/aplication/SimActivation.controller.ts b/packages/sim-consumidor-objenious/aplication/SimActivation.controller.ts similarity index 100% rename from packages/sim-consumidor-activaciones/aplication/SimActivation.controller.ts rename to packages/sim-consumidor-objenious/aplication/SimActivation.controller.ts diff --git a/packages/sim-consumidor-activaciones/config/env/index.ts b/packages/sim-consumidor-objenious/config/env/index.ts similarity index 100% rename from packages/sim-consumidor-activaciones/config/env/index.ts rename to packages/sim-consumidor-objenious/config/env/index.ts diff --git a/packages/sim-consumidor-activaciones/config/eventBusConfig.ts b/packages/sim-consumidor-objenious/config/eventBusConfig.ts similarity index 50% rename from packages/sim-consumidor-activaciones/config/eventBusConfig.ts rename to packages/sim-consumidor-objenious/config/eventBusConfig.ts index f74e427..74f4f33 100644 --- a/packages/sim-consumidor-activaciones/config/eventBusConfig.ts +++ b/packages/sim-consumidor-objenious/config/eventBusConfig.ts @@ -23,5 +23,23 @@ export const rabbitmqEventBus = new RabbitMQEventBus({ export async function startRMQClient() { await rabbitmqEventBus.connect() + const channel = rabbitmqEventBus.channel + // Bindings especificos, deberia meterlos en la clase + + try { + await rabbitmqEventBus.channel?.assertQueue("sim.objenious", {}) + console.log("[i] Las colas para objenious existen") + } catch (e) { + console.log("[i] Cola de sims de objenious creada") + await channel?.bindQueue("sim.objenious", "sim.exchange", "sim.objenious.*") + } + + try { + await rabbitmqEventBus.channel?.assertQueue("sim.dlx.objenious") + console.log("[i] Las colas dlx para objenious existen") + } catch (e) { + console.log("[i] Cola de dlx de objenious creada") + await channel?.bindQueue("sim.dlx.objenious", "sim.dlx", "sim.objenious.*") + } return rabbitmqEventBus } diff --git a/packages/sim-consumidor-activaciones/index.ts b/packages/sim-consumidor-objenious/index.ts similarity index 76% rename from packages/sim-consumidor-activaciones/index.ts rename to packages/sim-consumidor-objenious/index.ts index 58bc29e..6687b93 100644 --- a/packages/sim-consumidor-activaciones/index.ts +++ b/packages/sim-consumidor-objenious/index.ts @@ -11,10 +11,10 @@ async function startWorker() { startWorker() .then(e => { - console.log("[o] Worker de activacion de SIM iniciado") + console.log("[o] Worker de SIM de Objenious[FR] iniciado") }) .catch(e => { - console.log("[x] Error iniciando worker de activacion de SIM") + console.error("[x] Error iniciando worker de SIM de Objenious[FR]", e) }) export default {} diff --git a/packages/sim-consumidor-activaciones/mykey.pub b/packages/sim-consumidor-objenious/mykey.pub similarity index 100% rename from packages/sim-consumidor-activaciones/mykey.pub rename to packages/sim-consumidor-objenious/mykey.pub diff --git a/packages/sim-consumidor-activaciones/obj.pub b/packages/sim-consumidor-objenious/obj.pub similarity index 100% rename from packages/sim-consumidor-activaciones/obj.pub rename to packages/sim-consumidor-objenious/obj.pub diff --git a/packages/sim-consumidor-activaciones/package.json b/packages/sim-consumidor-objenious/package.json similarity index 94% rename from packages/sim-consumidor-activaciones/package.json rename to packages/sim-consumidor-objenious/package.json index aa72fd7..6c99eb8 100644 --- a/packages/sim-consumidor-activaciones/package.json +++ b/packages/sim-consumidor-objenious/package.json @@ -1,5 +1,5 @@ { - "name": "sim-consumidor", + "name": "sim-consumidor-objenious", "version": "1.0.0", "description": "consumidor generico de envetos de RMQ", "main": "index.ts", diff --git a/packages/sim-consumidor-activaciones/tsconfig.json b/packages/sim-consumidor-objenious/tsconfig.json similarity index 91% rename from packages/sim-consumidor-activaciones/tsconfig.json rename to packages/sim-consumidor-objenious/tsconfig.json index d97e9ea..5abd440 100644 --- a/packages/sim-consumidor-activaciones/tsconfig.json +++ b/packages/sim-consumidor-objenious/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../dist/sim-consumidor-activaciones", + "outDir": "../../dist/sim-consumidor-objenioius", "baseUrl": ".", "paths": { "#config/*": [ diff --git a/packages/sim-consumidor-activaciones/vitest.config.ts b/packages/sim-consumidor-objenious/vitest.config.ts similarity index 100% rename from packages/sim-consumidor-activaciones/vitest.config.ts rename to packages/sim-consumidor-objenious/vitest.config.ts diff --git a/packages/sim-entrada-eventos/aplication/Sim.controller.ts b/packages/sim-entrada-eventos/aplication/Sim.controller.ts index dcc7c59..c4e9eb4 100644 --- a/packages/sim-entrada-eventos/aplication/Sim.controller.ts +++ b/packages/sim-entrada-eventos/aplication/Sim.controller.ts @@ -8,7 +8,8 @@ import { SimUsecases } from "aplication/Sim.usecases" const COMPAÑIASICCID = new Map( [ ["3490", "alai"], - ["3510", "nos"] + ["3510", "nos"], + ["3399", "objenious"] ]) export class SimController { diff --git a/packages/sim-entrada-eventos/aplication/Sim.usecases.ts b/packages/sim-entrada-eventos/aplication/Sim.usecases.ts index 39e6504..38a94e4 100644 --- a/packages/sim-entrada-eventos/aplication/Sim.usecases.ts +++ b/packages/sim-entrada-eventos/aplication/Sim.usecases.ts @@ -35,13 +35,14 @@ export class SimUsecases { } async activation(args: { iccid: string, compañia: string }) { + const activationEvent = { key: `sim.${args.compañia}.activate`, payload: { iccid: args.iccid } } - + console.log("[d] Activation ", activationEvent) return this.eventBus.publish([activationEvent]) } diff --git a/yarn.lock b/yarn.lock index d7cff42..e322957 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2341,9 +2341,9 @@ __metadata: languageName: unknown linkType: soft -"sim-consumidor@workspace:packages/sim-consumidor-activaciones": +"sim-consumidor-objenious@workspace:packages/sim-consumidor-objenious": version: 0.0.0-use.local - resolution: "sim-consumidor@workspace:packages/sim-consumidor-activaciones" + resolution: "sim-consumidor-objenious@workspace:packages/sim-consumidor-objenious" dependencies: "@tsconfig/node22": "npm:*" "@types/amqplib": "npm:^0.10.8"