Limpieza

Reviewed-on: #1

.env

@@ -1,29 +0,0 @@
-PORT=3000
-API_HOSTNAME=0.0.0.0
-RABBITMQ_USER=guest
-RABBITMQ_PASSWORD=guest
-
-ENVIORMENT=development
-
-#RABBITMQ_HOST=rabbitmq-sim-broker
-RABBITMQ_HOST=localhost
-RABBITMQ_PORT=5672
-RABBITMQ_USER=guest
-RABBITMQ_PASSWORD=guest
-RABBITMQ_SECURE=false
-RABBITMQ_VHOST=sim-vhost
-
-# Hay cosas que unificar de varios servicios
-#POSTGRES_HOST=postgresql-sim
-POSTGRES_HOST=localhost
-POSTGRES_DB=postgres
-POSTGRES_DATABASE=postgres
-POSTGRES_PORT=5433
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=1234
-
-# Para el postgres local para generar el script de resultado de migraciones
-PGHOST=localhost
-PGUSER=alvar
-PGPASSWORD=alvar
-PGPORT=5433

.gitignore

@@ -20,3 +20,5 @@ node_modules
 
 
 dist/*
+
+.env

.yarnrc.yml

@@ -3,3 +3,9 @@ compressionLevel: mixed
 enableGlobalCache: false
 
 nodeLinker: node-modules
+
+npmScopes:
+  sf-alvar:
+    npmRegistryServer: "https://git.savefamilygps.net/api/packages/SaveFamily/npm/"
+
+npmRegistryServer: "https://registry.npmjs.org/"

README.md

@@ -12,13 +12,13 @@ La compañia a la que pertenece cada peticion y por tanto el servicio que lo va
 
 ## Decisiones pendientes
 
-- [x] La capa worker según acción y la de operaciones de proveedores, se podrían unir en una sola con un enrutamiento por acción y compañía, pasando de tener claves `sim.[acción]` a `sim.[compañia].[acción]`. *Se ha aplicado el cambio ahora las routing keys tienen la estructura `sim.[compañia].[acción]`*
-- [x] La estructura de RMQ se genera por medio del JSON, igual habría que definir cada cola en el worker que la consuma para poder añadir workers sin parar el RMQ. *Se ha aplicado el cambio, ahora solo se define en el json el broker principal para garantizar que exita sin servicios consumidores. Sin embargo tal como estan estructurdos los proyectos no es posible reiniciar solo un servicio*
+- [x] La capa worker según acción y la de operaciones de proveedores, se podrían unir en una sola con un enrutamiento por acción y compañía, pasando de tener claves `sim.[acción]` a `sim.[compañia].[acción]`. _Se ha aplicado el cambio ahora las routing keys tienen la estructura `sim.[compañia].[acción]`_
+- [x] La estructura de RMQ se genera por medio del JSON, igual habría que definir cada cola en el worker que la consuma para poder añadir workers sin parar el RMQ. _Se ha aplicado el cambio, ahora solo se define en el json el broker principal para garantizar que exita sin servicios consumidores. Sin embargo tal como estan estructurdos los proyectos no es posible reiniciar solo un servicio_
 - [ ] Versionado de la API.
-- [x] Método para sacar la compañía a partir del iccid, o buscar en la BDD si no es posible. *De momento es un objeto Map en el servicio de gateway*
-- [ ] Cola de mensajes que no se han podido procesar. Distinguir según error de red; se reintenta; o error del propio mensaje; se envía a la cola de errores. v2 Se ha creado una cola de delay pero no se distingue el tipo de error, despues de n reintentos el mensaje va a la cola de dead-letter.
-- [ ] Seguimiento de las peticiones de Objenious, por cada peticion hay qye hacer un seguimiento del request y de los mass action para saber si las activaciones han tenido exito. Habria que crear otra cola para consultar cada x tiempo o mejor un cron?
-- [ ] Actualizar en la base de datos el estado de las peticiones de las sim y añadir el número de telefono cuando se activen o cuando se cumpla una accion. 
+- [x] Método para sacar la compañía a partir del iccid, o buscar en la BDD si no es posible. _De momento es un objeto Map en el servicio de gateway_
+- [ ] Cola de mensajes que no se han podido procesar. Distinguir según error de red; se reintenta; o error del propio mensaje; se envía a la cola de errores. v2 Se ha creado una cola de delay pero no se distingue el tipo de error, después de n reintentos el mensaje va a la cola de dead-letter.
+- [x] Seguimiento de las peticiones de Objenious, por cada peticion hay qye hacer un seguimiento del request y de los mass action para saber si las activaciones han tenido exito. Habria que crear otra cola para consultar cada x tiempo o mejor un cron?
+- [x] Actualizar en la base de datos el estado de las peticiones de las sim y añadir el número de telefono cuando se activen o cuando se cumpla una accion.
 
 ## Versión con consumidores basados en la compañia
 
@@ -32,8 +32,14 @@ OBJENIOUS (33)2011a
 
 ## Diagrama de las colas de Rabbitmq
 
-Actualmente la topologia de las colas consiste en un exchage principal que recibe todos los mensajes y los redistribuye en las colas de cada empresa y a la de logs. Para evitar reintentos de mensajes instantaneos, que podrian ser inutiles si algún servicio se ha caido, se ha añadido una cola de delay que alamcena los mesajes fallidos durante n segundos antes de ser reenviados al exchange principal. Si despues de n reintentos el mensaje sigue fallando se envia a la cola de dead-letter para ser procesado manualmente.
+Actualmente la topología de las colas consiste en un exchage principal que recibe todos los mensajes y los redistribuye en las colas de cada empresa y a la de logs. Para evitar reintentos de mensajes instantáneos, que podrían ser inútiles si algún servicio se ha caído, se ha añadido una cola de delay que almacena los mensajes fallidos durante n segundos antes de ser reenviados al exchange principal. Si después de n reintentos el mensaje sigue fallando se envía a la cola de dead-letter para ser procesado manualmente.
 
 ![img](./imgs/diagrama-rabbit.png)
 
-La decisión del numero de reintentos y la cola de dlx se hace en los servicios, con una configuracion global en shared.
+La decisión del numero de reintentos y la cola de dlx se hace en los servicios, con una configuración global en shared.
+
+## Puertos internos para comunicaciones entre sub-servicios
+
+- **3000**: Gateway (sim-entrada-eventos)
+- **3001**: Consumidor NOS (sim-consumidor-nos)
+- **3002**: Consumidor Objenious (sim-consumidor-objenious)

build.local.sh

@@ -1,10 +1,3 @@
 #/bin/bash
-rm deployment/database/init.sql
-# cat deployment/database/*.sql >deployment/database/init.sql
-cp deployment/database/esquema_final* deployment/database/init.sql
-
-# compatibilidad con postgresql < 17
-sed -i '/\\restrict/d' deployment/database/init.sql
-sed -i '/\\unrestrict/d' deployment/database/init.sql
 
 docker compose -f deployment/local/docker/docker-compose.yaml --project-directory ./ build

deployment/database/base/xx-volcado-objenious.sql

@@ -0,0 +1,20 @@
+CREATE table if not exists objenious_lines (
+    id      INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    simId   BIGINT UNIQUE,
+    status  TEXT,
+    iccid   TEXT NOT NULL,
+    msisdn  TEXT,
+    imei    TEXT,
+    imeiChangeDate  TIMESTAMPTZ,
+    offerCode       TEXT,
+    preactivationDate TIMESTAMPTZ, -- No viene con hora
+    activationDate    TIMESTAMPTZ,
+    commercialStatus  TEXT, 
+    commercialStatusDate TIMESTAMPTZ,
+    billingStatus  TEXT, 
+    billingStatusChangeDate TIMESTAMPTZ,
+    billingActivationDate   TIMESTAMPTZ,
+    createDate TIMESTAMPTZ,
+    raw JSONB,
+    hash TEXT
+)

deployment/database/migrations/1.2.0_Cola-pausa-cancelacion.sql

@@ -0,0 +1,32 @@
+/**
+* Para la tarea WEBINT-328-Pausas-cacelaciones.
+* Almacena las pausas/cancelaciones que no se han podido hacer porque la linea esta en
+* "Test"
+*/
+
+
+DO $$ BEGIN
+  CREATE TYPE SUSPENDTERMINATE AS ENUM ('suspend','terminate');
+EXCEPTION
+    WHEN duplicate_object THEN null;
+END $$;
+
+CREATE TABLE IF NOT EXISTS pause_cancel_tasks (
+    id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    iccid TEXT NOT NULL,
+    operation_type SUSPENDTERMINATE,
+    last_checked TIMESTAMPTZ, -- Última vez que se ha comprobado que no esté en test
+    activation_date TIMESTAMPTZ, -- Fecha de activacion para comprobar si ha pasdo un mes
+    next_check TIMESTAMPTZ, -- Si se ha comprobado se asignará la siguiente fecha de revision
+
+    completed_date TIMESTAMPTZ, -- Cuando se ha completado, para bien o mal.
+    error TEXT,
+    action_data JSONB -- datos de la operacion original.
+);
+
+-- Indice de las tareas que no han terminado 
+CREATE INDEX idx_pause_cancel_tasks_pending 
+ON pause_cancel_tasks (next_check) 
+WHERE completed_date IS NULL;
+
+

deployment/develop/docker/Dockerfile

@@ -6,12 +6,13 @@ WORKDIR /home/node/app
 RUN corepack enable
 
 COPY ./dist/packages ./packages
+COPY ./.yarnrc.yml ./
+COPY ./docs ./docs
+# Para las migraciones
+COPY ./deployment ./deployment
 
 COPY ./package.json ./
 
-# Force node-modules linker (no .yarnrc.yml in build context)
-RUN echo 'nodeLinker: node-modules' > .yarnrc.yml
-
 RUN yarn install 
 
 RUN mkdir -p dist && ln -sf ../packages dist/packages

deployment/develop/docker/entrypoint.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
 cd /home
 
-cd /home/node/app && yarn start
+cd /home/node/app
+yarn migrate
+yarn start

deployment/develop/jenkinsfile.groovy

@@ -17,12 +17,12 @@ pipeline {
 				sh 'npm install -g yarn'
 				sh 'corepack enable'
 				sh 'corepack prepare yarn@4.12.0 --activate'
-				sh 'yarn install'
+				sh 'yarn install --immutable'
 			}
 		}
 		stage("🧱 Building") {
 			steps {
-        		sh 'rm -rf dist/'
+        sh 'rm -rf dist/'
 				sh 'yarn run build'
 			}
 		}
@@ -60,11 +60,15 @@ pipeline {
 									sourceFiles: "dist/**/*",
 									excludes: "dist/**/node_modules/**"
 								),
+								sshTransfer(
+									cleanRemote: false,
+									remoteDirectory: "$APP_REMOTE_PATH",
+									sourceFiles: "docs/**/*",
+								),
 								sshTransfer(
 									cleanRemote: false,
 									remoteDirectory: "$APP_REMOTE_PATH",
 									sourceFiles: "deployment/database/**/*",
-									removePrefix: "deployment",
 								),
 								sshTransfer(
 									cleanRemote: false,
@@ -88,6 +92,11 @@ pipeline {
 									remoteDirectory: "$APP_REMOTE_PATH",
 									sourceFiles: "package.json",
 								),
+								sshTransfer(
+									cleanRemote: false,
+									remoteDirectory: "$APP_REMOTE_PATH",
+									sourceFiles: ".yarnrc.yml",
+								),
 								sshTransfer(
 									cleanRemote: false,
 									execCommand: "sh $APP_REMOTE_PATH/rebuild.sh"

deployment/local/docker/Dockerfile.dev

@@ -14,6 +14,7 @@ COPY ./packages ./packages
 COPY tsconfig*.json ./
 COPY .env* ./
 COPY ./.yarnrc.yml ./
+COPY ./docs ./docs
 COPY ./deployment/local/docker/start.sh ./
 # Copiar el archivo de migrations? porque ahora no creo que se esté lanzando nada
 COPY ./deployment/database/migrations ./deployment/database/migrations

deployment/local/docker/docker-compose.yaml

@@ -40,6 +40,9 @@ services:
         - path: ./packages
           action: sync
           target: /usr/local/app/packages
+        - path: ./docs
+          action: sync
+          target: /usr/local/app/docs
         - path: ./package.json
           action: rebuild
     ports:
@@ -72,7 +75,6 @@ services:
       - "${POSTGRES_PORT}:${POSTGRES_PORT}"
     volumes:
       - ./sql-data/:/var/lib/postgres/data
-      - ./deployment/database/init.sql:/docker-entrypoint-initdb.d/init.sql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s

docs/sim-api/Activate.bru

@@ -11,7 +11,7 @@ post {
 }
 
 body:form-urlencoded {
-  iccid: 8933201125068886692
+  iccid: 8935103196306448300
   offer: SAVEFAMILY1
 }
 

docs/sim-api/Cancel.bru

@@ -11,7 +11,7 @@ post {
 }
 
 body:form-urlencoded {
-  iccid: 8933201125068886692
+  iccid: 8933201125068887054
 }
 
 settings {

docs/sim-api/Docs.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Docs
+  type: http
+  seq: 12
+}
+
+get {
+  url: {{baseurl}}/docs/sim-api-documentation.html
+  body: none
+  auth: inherit
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

docs/sim-api/France Suspended Lines.bru

@@ -0,0 +1,26 @@
+meta {
+  name: France Suspended Lines
+  type: http
+  seq: 17
+}
+
+get {
+  url: {{baseurl}}/france/lines?status=SUSPENDED&limit=100
+  body: none
+  auth: inherit
+}
+
+params:query {
+  status: SUSPENDED
+  limit: 100
+}
+
+vars:pre-request {
+  iccid: 8933201125065160331
+  ~baseurl: http://localhost:3002
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

docs/sim-api/France Suspended Time.bru

@@ -0,0 +1,21 @@
+meta {
+  name: France Suspended Time
+  type: http
+  seq: 15
+}
+
+get {
+  url: {{baseurl}}/france/lines/{{iccid}}/suspended-time
+  body: none
+  auth: inherit
+}
+
+vars:pre-request {
+  iccid: 8933201125065160331
+  ~baseurl: http://localhost:3002
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

docs/sim-api/Pause.bru

@@ -15,7 +15,7 @@ params:query {
 }
 
 body:form-urlencoded {
-  iccid: 8933201125065160414
+  iccid: 8933201125065160331
 }
 
 settings {

docs/sim-api/ReActivate.bru

@@ -0,0 +1,21 @@
+meta {
+  name: ReActivate
+  type: http
+  seq: 13
+}
+
+post {
+  url: {{baseurl}}/sim/reActivate
+  body: formUrlEncoded
+  auth: inherit
+}
+
+body:form-urlencoded {
+  iccid: 8935103196306448300
+  ~offer: SAVEFAMILY1
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

docs/sim-api/environments/local.bru

@@ -1,3 +1,4 @@
 vars {
   baseurl: http://localhost:3000
 }
+color: #2E8A54

docs/sim-api/environments/prod.bru

@@ -1,3 +1,4 @@
 vars {
   baseurl: https://sf-sims.savefamilygps.net
 }
+color: #CE4F3B

docs/sim-api/environments/simconnections.bru

@@ -0,0 +1,4 @@
+vars {
+  baseurl: http://sim-connections.savefamilygps.net
+}
+color: #C77A0F

docs/sim-api/test proxy.bru

@@ -0,0 +1,20 @@
+meta {
+  name: test proxy
+  type: http
+  seq: 14
+}
+
+get {
+  url: {{baseurl}}/simconnections/alai/select?iccid=1111111111111111111
+  body: none
+  auth: inherit
+}
+
+params:query {
+  iccid: 1111111111111111111
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

docs/sim-nos/Select Page.yml

@@ -0,0 +1,23 @@
+info:
+  name: Select Page
+  type: http
+  seq: 6
+
+http:
+  method: GET
+  url: "{{baseurl}}/selectPage"
+  params:
+    - name: iccid
+      value: "8935103196306448300"
+      type: query
+      disabled: true
+  body:
+    type: json
+    data: ""
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-nos/Select.yml

@@ -0,0 +1,25 @@
+info:
+  name: Select
+  type: http
+  seq: 5
+
+http:
+  method: GET
+  url: "{{baseurl}}/select?iccid=8935103196306448300"
+  params:
+    - name: iccid
+      value: "8935103196306448300"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "iccid": "8933201125068890066"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-nos/environments/local.yml

@@ -0,0 +1,7 @@
+name: local
+color: "#2E8A54"
+variables:
+  - name: baseurl
+    value: http://localhost:3001
+  - secret: true
+    name: token

docs/sim-nos/environments/prod.yml

@@ -0,0 +1,7 @@
+name: prod
+color: "#CE4F3B"
+variables:
+  - name: baseurl
+    value: https://nosconnectcenter-api.iot-x.com
+  - secret: true
+    name: token

docs/sim-nos/opencollection.yml

@@ -0,0 +1,10 @@
+opencollection: 1.0.0
+
+info:
+  name: sim-nos
+bundled: false
+extensions:
+  bruno:
+    ignore:
+      - node_modules
+      - .git

docs/sim-nos/subscriber actions.yml

@@ -0,0 +1,22 @@
+info:
+  name: subscriber actions
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: "{{baseurl}}/subscribers/{{iccid}}/actions"
+  auth:
+    type: bearer
+    token: "{{token}}"
+
+runtime:
+  variables:
+    - name: iccid
+      value: "8935103196306448300"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-nos/subscriber info.yml

@@ -0,0 +1,22 @@
+info:
+  name: subscriber info
+  type: http
+  seq: 2
+
+http:
+  method: GET
+  url: "{{baseurl}}/subscribers/{{iccid}}"
+  auth:
+    type: bearer
+    token: "{{token}}"
+
+runtime:
+  variables:
+    - name: iccid
+      value: "8935103196306448300"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-nos/subscriber products available.yml

@@ -0,0 +1,22 @@
+info:
+  name: subscriber products available
+  type: http
+  seq: 4
+
+http:
+  method: GET
+  url: "{{baseurl}}/subscribers/{{iccid}}/products/available"
+  auth:
+    type: bearer
+    token: "{{token}}"
+
+runtime:
+  variables:
+    - name: iccid
+      value: "8935103196306448300"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-nos/subscribers.yml

@@ -0,0 +1,22 @@
+info:
+  name: subscribers
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: "{{baseurl}}/subscribers"
+  auth:
+    type: bearer
+    token: "{{token}}"
+
+runtime:
+  variables:
+    - name: iccid
+      value: "8935103196306448300"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

docs/sim-objenious/Appel lines.bru

@@ -5,16 +5,16 @@ meta {
 }
 
 get {
-  url: https://api-getway.objenious.com/ws/lines?pageSize=10&identifier.identifierType=ICCID&identifier.identifiers=8933201125065160455
+  url: https://api-getway.objenious.com/ws/lines?pageSize=1000&simStatus=ACTIVATED
   body: formUrlEncoded
   auth: bearer
 }
 
 params:query {
-  pageSize: 10
-  identifier.identifierType: ICCID
-  identifier.identifiers: 8933201125065160455
-  ~simStatus: ACTIVATED
+  pageSize: 1000
+  simStatus: ACTIVATED
+  ~identifier.identifierType: ICCID
+  ~identifier.identifiers: 8933201125065160455
 }
 
 auth:bearer {

docs/sim-objenious/Get request by ID.bru

@@ -37,7 +37,7 @@ body:form-urlencoded {
 }
 
 vars:pre-request {
-  params.id: 14557
+  params.id: 15102
 }
 
 settings {

docs/sim-objenious/Mass action list.bru

@@ -5,13 +5,13 @@ meta {
 }
 
 get {
-  url: {{actionsUrl}}/massActions?massActionId=5192767
+  url: {{actionsUrl}}/massActions?massActionId=5363116
   body: formUrlEncoded
   auth: bearer
 }
 
 params:query {
-  massActionId: 5192767
+  massActionId: 5363116
   ~identifier.identifierType: ICCID
   ~identifier.identifiers: 8933201125065160463,8933201125065160422
 }

package.json

@@ -7,11 +7,11 @@
   ],
   "scripts": {
     "test": "vitest watch",
-    "build": "yarn workspaces foreach -A --exclude sim-consumidor-nos run build && cp .env dist/ && yarn setup:runtime",
+    "build": "rm -rf ./dist && yarn workspaces foreach -Api run build && cp .env dist/ && yarn setup:runtime",
     "setup:runtime": "mkdir -p dist/packages/node_modules && ln -sf ../sim-shared dist/packages/node_modules/sim-shared && ln -sf ../sf-consumidor-objenious dist/packages/node_modules/sim-consumidor-objenious",
-    "start": "yarn setup:runtime && yarn workspaces foreach -Apiv --exclude sim-consumidor-nos run start",
+    "start": "yarn setup:runtime && yarn workspaces foreach -Apiv run start",
     "typecheck": "npx tsc --noEmit",
-    "dev": "yarn workspaces foreach -Apiv --exclude sim-consumidor-nos run dev ",
+    "dev": "yarn workspaces foreach -Apiv run dev",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "format": "prettier --write .",
@@ -19,16 +19,16 @@
     "migrate": "yarn db-migrate -e .env -m deployment/database/migrations -t 99.0.0"
   },
   "dependencies": {
+    "@sf-alvar/db-migrate": "1.0.6",
     "@tsconfig/node22": "^22.0.5",
     "amqp-connection-manager": "^5.0.0",
     "amqplib": "^0.10.9",
     "axios": "^1.13.3",
     "cors": "^2.8.5",
-    "db-migrate": "https://git.savefamilygps.net/alvarsanmartin/herramienta-migracion.git",
     "dotenv": "^17.2.3",
     "express": "^5.2.1",
     "pg": "^8.18.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "uuidv7": "^1.1.0",
     "vite": "^7.3.1",
     "vite-tsconfig-paths": "^6.0.5"

packages/_template/config/env/index.ts

@@ -1,5 +1,4 @@
 export const env = {
-  ENVIRONMENT: process.env.ENVIORMENT,
   POSTGRES_USER: process.env.POSTGRES_USER,
   POSTGRES_PASSWORD: process.env.POSTGRES_PASSWORD,
   POSTGRES_PORT: process.env.POSTGRES_PORT,

packages/sim-consumidor-nos/.env

@@ -1,5 +0,0 @@
-PORT=3000
-RABBITMQ_USER=guest
-RABBITMQ_PASSWORD=guest
-
-ENVIORMENT=development

packages/sim-consumidor-nos/aplication/SimNOS.controller.ts

@@ -1,65 +1,178 @@
-import { EventBus } from "sim-shared/domain/EventBus.port.js";
 import { ConsumeMessage } from "amqplib";
+import { Request, Response } from "express"
+import { SimNosUsecases } from "./SimNOS.usecases.js";
+import { EventBus } from "sim-shared/domain/EventBus.port.js";
+import { Result } from "sim-shared/domain/Result.js";
+import { SimEvents } from "sim-shared/domain/SimEvents.js";
+import { iccidValidator } from "./httpValidators.js";
 
 export class SimNosController {
-  private eventBus: EventBus;
-  private activationUseCases: any;
-
-  private routes = new Map<string, () => void>([
-    ["activate", async () => { console.log("caso de uso activate") }],
-    ["pause", async () => { console.log("caso de uso pause") }],
-    ["cancel", async () => { console.log("caso de uso cancel") }],
-  ])
 
   constructor(
-    eventBus: EventBus
+    private uscases: SimNosUsecases,
+    private eventBus: EventBus,
   ) {
-    this.eventBus = eventBus
-
-    // No se si hay un sistema mejor
-    // convertor en const () => {} para conservar el contexto??
-    this.recibeMsg = this.recibeMsg.bind(this)
   }
 
-  public async recibeMsg(msg: ConsumeMessage | null) {
-    if (!this.validateActivationMsg(msg)) {
-      throw new Error("Error consumiendo el mensaje no es valido")
-    }
+  private validateMsg(msg: ConsumeMessage | null) {
+    if (msg == undefined) return false;
+    const msgData = this.decodeMsg(msg) as SimEvents.general
+    if (msgData == undefined || msgData.payload == undefined) throw new Error("Mensaje invalido")
+    return msgData;
+  }
 
-    msg = msg!
-
-    const msgParsed = JSON.parse(String(msg.content))
-    const msgKey = msg.fields.routingKey.split(".")
-    const accion = msgKey[2]
-
-    if (accion == undefined) {
-      console.error("La routingKey es incorrecta: " + accion)
-      this.eventBus.nack(msg)
-      return;
-    }
-
-    if (this.routes.get(accion) == undefined) {
-      console.error("No hay una ruta definida para la accion")
-      this.eventBus.nack(msg)
-      return;
+  private decodeMsg(msg: ConsumeMessage): object | undefined {
+    if (msg.content == undefined) {
+      console.warn('[Sim.controller] Mensaje vacío');
+      return undefined;
     }
 
     try {
-      this.routes.get(accion)!()
-    } catch (err) {
-      console.log("Error procesando el mensaje")
-      this.eventBus.nack(msg)
-    } finally {
-      this.eventBus.ack(msg)
+      // Convertir el Buffer a String (UTF-8)
+      const contentJson = JSON.parse(Buffer.from(msg.content).toString('utf8'))
+      return contentJson;
+
+    } catch (error) {
+      console.error('Error al decodificar JSON:', error);
+      console.error(Buffer.from(msg.content).toString(("utf8")))
+      // Aquí podrías decidir devolver el string crudo o null
+      return undefined;
     }
   }
 
   /**
-  * TODO:
-  * - Loguear motivos de la no validacion
+   * Metodo duplicado se puede generalizar la a una clase sharedController con las funciones basicas
+   */
+  private async tryUseCase<T extends any>
+    (msg: ConsumeMessage, usecase: () => Promise<Result<string, T>>): Promise<Result<string, T>> {
+    try {
+      const result = await usecase()
+      if (result.error == undefined) {
+        await this.eventBus.ack(msg)
+        return result
+      } else {
+        console.error("Error procesando el caso de uso (NOS)", result.error)
+        this.eventBus.nack(msg)
+        return result
+      }
+    } catch (e) {
+      console.error("Error general procesando el caso de uso (NOS)")
+      this.eventBus.nack(msg)
+      return {
+        error: String(e)
+      }
+    }
+  }
+
+  public activate() {
+    return async (msg: ConsumeMessage) => {
+      console.log("[i] Evento activate ", msg.fields)
+      const data = this.validateMsg(msg) as SimEvents.activation
+      const iccid = data.payload.iccid
+      const correlation_id = data.headers?.message_id
+      const res = await this.tryUseCase(msg, this.uscases.activate({
+        iccid: iccid,
+        correlation_id: correlation_id
+      }))
+
+      return res;
+    }
+  }
+
+  public suspend() {
+    return async (msg: ConsumeMessage) => {
+      console.log("Evento suspend ", msg.fields)
+      const data = this.validateMsg(msg) as SimEvents.suspend
+      const iccid = data.payload.iccid
+      const correlation_id = data.headers?.message_id
+      const res = await this.tryUseCase(msg, this.uscases.suspend({
+        iccid: iccid,
+        correlation_id: correlation_id
+      }))
+
+      return res;
+    }
+  }
+
+  public terminate() {
+    return async (msg: ConsumeMessage) => {
+      console.log("Evento termiante no soportado ", msg.fields)
+    }
+  }
+
+  public reActivate() {
+    return async (msg: ConsumeMessage) => {
+      console.log("Evento reActivate ", msg.fields)
+      const data = this.validateMsg(msg) as SimEvents.reActivation
+      const iccid = data.payload.iccid
+      const correlation_id = data.headers?.message_id
+      const res = await this.tryUseCase(msg, this.uscases.reactivate({
+        iccid: iccid,
+        correlation_id: correlation_id
+      }))
+
+      return res;
+    }
+  }
+
+  /**
+  * Select especificamente por REST para evitar pasar por las colas.
+  * La respuesta es instantanea no se tiene que registrar como operación.
   */
-  private validateActivationMsg(msg: ConsumeMessage | null) {
-    if (msg == undefined) return false;
-    return true;
+  public selectREST() {
+    return async (req: Request, res: Response) => {
+      const { query } = req
+      const body = { iccid: query.iccid as string }
+      console.log("Evento select", body)
+      const validateBody = iccidValidator.validate(body);
+
+      if (validateBody.error != undefined) {
+        res.status(402).json(validateBody)
+        return;
+      }
+
+      const iccid: string | string[] = body.iccid
+
+      if (Array.isArray(iccid)) {
+        // TODO: Automatizar la paginacion
+        //const usecaseRes = this.uscases.selectMany({ iccid })
+      } else {
+        const usecaseRes = await this.uscases.selectOne({ iccid })
+        if (usecaseRes.error != undefined) {
+          res.status(500).json(usecaseRes)
+          return;
+        } else {
+          res.send(usecaseRes.data)
+          return;
+        }
+      }
+
+      res.status(200).json(validateBody)
+    }
+  }
+
+
+  public selectPageREST() {
+    return async (req: Request, res: Response) => {
+      const { offset, limit, filter, orderBy } = req.query
+      const params = {
+        offset: (offset != undefined) ? Number(offset) : undefined,
+        limit: (limit != undefined) ? Number(limit) : undefined,
+        filter: (filter != undefined) ? String(filter) : undefined,
+        orderBy: (orderBy != undefined) ? String(orderBy) : undefined
+      }
+
+      const usecaseRes = await this.uscases.selectPage(params)
+
+      if (usecaseRes.error != undefined) {
+        res.status(500).json(usecaseRes)
+        return;
+      } else {
+        res.status(200).send(usecaseRes.data)
+        return;
+      }
+    }
   }
 }
+
+

packages/sim-consumidor-nos/aplication/SimNOS.router.ts

@@ -0,0 +1,79 @@
+/**
+ * Dirige cada mensaje dependiendo de el tipo de acción que contenga
+ * Podría hacerse con varias colas, pero así se controla mejor que
+ * las operaciones se hagan de 1 en 1.
+ */
+
+import { ConsumeMessage } from "amqplib";
+import { SimNosController } from "./SimNOS.controller.js";
+import { EventBus } from "sim-shared/domain/EventBus.port.js";
+import { Result } from "sim-shared/domain/Result.js";
+
+type FuncType = ((m: ConsumeMessage) => Promise<Result<string, any>>)
+
+export class SimNosRouter {
+  private readonly routes: Map<string, FuncType>;
+
+  constructor(
+    private readonly simController: SimNosController,
+    private readonly eventBus: EventBus
+  ) {
+    this.routes = new Map<string, FuncType>([
+      //["select", undefined],
+      ["activate", this.simController.activate()],
+      ["pause", this.simController.suspend()],
+      ["reactivate", this.simController.reActivate()],
+      //["cancel", this.simController.terminate()],
+      //["preActivate", this.simController.preActivate()]
+    ]);
+  }
+
+  /**
+   * Enruta el mensaje a la acción correspondiente basándose en la routing key
+   * TODO: No estoy seguro que deba meter el nack aqui
+   * - De moemento el ack-nack se gestiona en los controller, por si acaso hay casos
+   *   limite en 
+   */
+  public route = async (msg: ConsumeMessage | null): Promise<void> => {
+    if (!msg) {
+      console.error("[Router] Mensaje vacío");
+      return;
+    }
+
+    const action = this.extractAction(msg);
+
+    if (!action) {
+      console.error("[Router] La routing key no tiene una acción definida", msg.fields.routingKey);
+      this.eventBus.nack(msg)
+      return;
+    }
+
+    const handler = this.routes.get(action);
+
+    if (!handler) {
+      console.error(`[Router] La acción '${action}' no tiene un controlador asociado`);
+      this.eventBus.nack(msg)
+      return;
+    }
+
+    try {
+      console.log("[Router] Ejecutando operación:", action);
+
+      // El controlador devuelve una función (thunk) que debe ser ejecutada
+      const executeParams = handler(msg);
+
+      if (typeof executeParams === "function") {
+        const res = await executeParams;
+      }
+
+    } catch (error) {
+      console.error(`[Router] Error al ejecutar la operación '${action}':`, error);
+      this.eventBus.nack(msg)
+    }
+  };
+
+  private extractAction(msg: ConsumeMessage): string | undefined {
+    // Se asume que la acción está en la tercera posición: domain.compañia.accion
+    return msg.fields.routingKey.split(".")[2];
+  }
+}

packages/sim-consumidor-nos/aplication/SimNOS.usecases.ts

@@ -0,0 +1,156 @@
+/**
+ * Documentación de referencia:
+ * https://pelion-help.iot-x.com/nos/en-US/Content/API/APIReference/API%20Reference.htm?tocpath=_____7
+ *
+ * En nos el correlation_id ya va a ser obligatorio en todos los mensajes
+ *
+ * TODO:
+ * - Control de errores más preciso
+ *
+ */
+import { NosHttpClient } from "#infrastructure/NosHttpClient.js";
+import { NosRepository } from "#infrastructure/NosRepository.js";
+import { ErrorOrderDTO, FinishOrderDTO, UpdateOrderDTO } from "sim-shared/domain/Order.js";
+import { Result } from "sim-shared/domain/Result.js";
+import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
+
+export class SimNosUsecases {
+  constructor(
+    private httpClient: NosHttpClient,
+    private nosRepository: NosRepository,
+    private orderRepository: OrderRepository
+  ) {
+  }
+
+  private async setRunning(correlation_id: string) {
+    // En NOS el updateOrder se hace con el correlation_id que viene en la cabecera del
+    // mensaje consumido
+    const updateData: UpdateOrderDTO = {
+      new_status: "running",
+      correlation_id: correlation_id
+    }
+    const order = await this.orderRepository.updateOrder(updateData)
+    return order
+  }
+
+  private async setFinished(correlation_id: string) {
+    // En NOS el updateOrder se hace con el correlation_id que viene en la cabecera del
+    // mensaje consumido
+    const updateData: FinishOrderDTO = {
+      correlation_id: correlation_id
+    }
+    const order = await this.orderRepository.finishOrder(updateData)
+    return order
+  }
+
+  private async setFailed(correlation_id: string, reason: string, detail?: string) {
+    // En NOS el updateOrder se hace con el correlation_id que viene en la cabecera del
+    // mensaje consumido
+    const updateData: ErrorOrderDTO = {
+      status: "failed",
+      correlation_id: correlation_id,
+      reason: reason,
+      error: reason,
+      stackTrace: detail
+    }
+
+    console.log("SET FAILED DATA:", updateData)
+    const order = await this.orderRepository.errorOrder(updateData)
+    console.log("SET FAILED RES:", order)
+    return order
+  }
+
+  public usecaseTemplate<T, R>(
+    func: (_: T) => Promise<Result<string, R>>,
+    args: T,
+    correlation_id?: string | undefined
+  ) {
+    return async () => {
+      // Operacion pending -> running
+      if (correlation_id != undefined)
+        this.setRunning(correlation_id)
+          .then()
+          .catch(e => console.error("Error actualizando el order", e))
+
+      try {
+        const res = await func(args)
+
+        if (res.error != undefined) {
+          console.log("Error peticion: ", res, correlation_id)
+          if (correlation_id != undefined)
+            this.setFailed(correlation_id, res.error)
+              .then(e => console.log("failed", e))
+              .catch(e => console.error(e))
+          return res;
+        } else {
+          if (correlation_id != undefined)
+            this.setFinished(correlation_id).then()
+          return res;
+        }
+
+      } catch (e) {
+        if (correlation_id != undefined)
+          this.setFailed(correlation_id, "Error general de operacion de SIM (NOS) ", String(e)).then()
+        return {
+          error: "Error general de operacion de SIM (NOS) " + String(e)
+        }
+      }
+
+    }
+  }
+
+  public activate(args: {
+    iccid: string,
+    correlation_id?: string
+  }) {
+    return this.usecaseTemplate(
+      (args) => this.nosRepository.activateSim(args), args.iccid, args.correlation_id)
+  }
+
+  public suspend(args: {
+    iccid: string,
+    correlation_id?: string
+  }) {
+    return this.usecaseTemplate(
+      (args) => this.nosRepository.bar(args), args.iccid, args.correlation_id)
+  }
+
+  public reactivate(args: {
+    iccid: string,
+    correlation_id?: string
+  }) {
+    return this.usecaseTemplate(
+      (args) => this.nosRepository.unbar(args), args.iccid, args.correlation_id)
+  }
+
+  public terminate(args: { iccid: string }) {
+    throw new Error("No hay termination para NOS")
+  }
+
+  /* Importante: Las operaciones de lectua no dejan registro en orders */
+
+  public async selectOne(args: {
+    iccid: string
+  }) {
+    const res = await this.nosRepository.getLineInfo(args.iccid)
+    return res
+  }
+
+  public async selectPage(args: {
+    offset?: number,
+    limit?: number,
+    filter?: string,
+    orderBy?: string
+  }) {
+    const res = await this.nosRepository.getLinePage(args)
+    return res
+  }
+
+  /**
+  public selectMany(args: {
+    iccid: string[]
+  }) {
+    return {}
+  }
+*/
+}

packages/sim-consumidor-nos/aplication/httpValidators.ts

@@ -0,0 +1,39 @@
+import { BodyValidator, Validator } from "sim-shared/aplication/BodyValidator.js";
+
+const iccidNotNull = <Validator<{ iccid: unknown }>>{
+  field: "iccid",
+  errorMsg: "El iccid no está definido",
+  validationFunc: (a: { iccid: unknown }) => {
+    return (a.iccid != null && a.iccid != undefined)
+  }
+}
+
+const iccidValueOrArray = <Validator<{ iccid: unknown }>>{
+  field: "iccid",
+  errorMsg: "El iccid debe de ser un único valor o una lista",
+  validationFunc: (a: { iccid: unknown }) => {
+    return (typeof a.iccid == "string" || Array.isArray(a.iccid))
+  }
+}
+
+const iccidLongitudValidator = <Validator<{ iccid: string | string[] }>>{
+  field: "iccid",
+  errorMsg: "La longitud del iccid/s es incorrecta debera ser de 19 caracteres",
+  validationFunc: (a: { iccid: string | string[] }) => {
+    if (Array.isArray(a.iccid)) {
+      const res = (a.iccid as string[]).filter(e => e.length != 19)
+      if (res.length > 0) return false;
+    } else {
+      return (a.iccid as string).length == 19
+    }
+  },
+}
+
+export const iccidValidator = new BodyValidator<{ iccid: string | string[] }>(
+  [
+    iccidNotNull,
+    iccidValueOrArray,
+    iccidLongitudValidator,
+  ]
+)
+

packages/sim-consumidor-nos/config/env/env.ts

@@ -1,8 +1,18 @@
 import { loadEnvFile } from "node:process";
-loadEnvFile("../../.env")
+import path from "node:path";
+
+try {
+  loadEnvFile(path.join("./.env")) // base
+} catch (e) {
+  console.error("Error cargando el .env desde ./.env")
+}
+try {
+  loadEnvFile(path.join("../../.env")) // Global
+} catch (e) {
+  console.error("Error cargando el .env desde ../../.env")
+}
 
 export const env = {
-  ENVIRONMENT: process.env.ENVIORMENT,
   POSTGRES_USER: process.env.POSTGRES_USER,
   POSTGRES_PASSWORD: process.env.POSTGRES_PASSWORD,
   POSTGRES_PORT: process.env.POSTGRES_PORT,
@@ -18,5 +28,12 @@ export const env = {
   RABBITMQ_SECURE: process.env.RABBITMQ_SECURE,
   RABBITMQ_RETRY_INTERVAL: process.env.RABBITMQ_INTERVAL,
   RABBITMQ_VHOST: String(process.env.RABBITMQ_VHOST),
+
+  APP_PORT: Number(process.env.APP_PORT),
+  APP_HOST: String(process.env.APP_HOST),
+
+  // ESPECIFICO NOS
+  NOS_BASE_URL: String(process.env.NOS_BASE_URL),
+  NOS_ACCESS_TOKEN: String(process.env.NOS_ACCESS_TOKEN)
 };
 

packages/sim-consumidor-nos/config/eventBus.config.ts

@@ -0,0 +1,72 @@
+import { RabbitMQEventBus, RMQConnectionParams } from "sim-shared/infrastructure/RabbitMQEventBus.js"
+import { Channel } from "amqp-connection-manager"
+import { env } from "./env/env.js"
+
+const rmqUser = env.RABBITMQ_USER
+const rmqPass = env.RABBITMQ_PASSWORD
+const rmqHost = env.RABBITMQ_HOST
+const rmqPort = Number(env.RABBITMQ_PORT)
+const rmqSecure = false
+const rmqVhost = env.RABBITMQ_VHOST
+
+export const rmqConnOptions = <RMQConnectionParams>{
+  username: rmqUser,
+  password: rmqPass,
+  vhost: rmqVhost,
+  hostname: rmqHost,
+  port: rmqPort,
+  secure: rmqSecure,
+}
+
+
+const QUEUES = {
+  NOS: "sim.nos",
+  NOSDLX: "sim.nos.dlx",
+  NOSDEL: "sim.nos.delayed",
+}
+
+const EXCHANGES = {
+  MAIN: "sim.exchange",
+  DLX: "sim.ex.nos.dlx",
+  DEL: "sim.ex.nos.delayed"
+}
+
+export const rabbitmqEventBus = new RabbitMQEventBus({
+  connectionParams: rmqConnOptions,
+  buildStructure: buildQueues,
+  maxRetry: 2,
+  delayedExchange: EXCHANGES.DEL,
+  dlxExchange: EXCHANGES.DLX
+})
+
+async function buildQueues(channel: Channel) {
+
+  const DELAY = 10 * 1000
+  const BASE_NOS_KEY = "sim.nos.#"
+
+  await channel.assertExchange(EXCHANGES.DEL, "topic")
+  await channel.assertExchange(EXCHANGES.DLX, "topic")
+  await channel.assertExchange(EXCHANGES.MAIN, "topic")
+
+  await channel.assertQueue(QUEUES.NOS)
+  await channel.assertQueue(QUEUES.NOSDLX)
+  await channel.assertQueue(QUEUES.NOSDEL, {
+    durable: true,
+    arguments: {
+      'x-message-ttl': DELAY,
+      'x-dead-letter-exchange': EXCHANGES.MAIN,
+    }
+  })
+
+  // Cola dead-letter 
+  await channel.bindQueue(QUEUES.NOSDLX, EXCHANGES.DLX, "sim.nos.#")
+  // Cola delay
+  await channel.bindQueue(QUEUES.NOSDEL, EXCHANGES.DEL, BASE_NOS_KEY)
+  // Cola nos -> main exchange
+  await channel.bindQueue(QUEUES.NOS, EXCHANGES.MAIN, BASE_NOS_KEY)
+}
+
+export async function startRMQClient() {
+  await rabbitmqEventBus.connect()
+  return rabbitmqEventBus
+}

packages/sim-consumidor-nos/config/eventBusConfig.ts

@@ -1,39 +0,0 @@
-import { RabbitMQEventBus, RMQConnectionParams } from "sim-shared/infrastructure/RabbitMQEventBus.js"
-import { env } from "./env"
-
-const rmqUser = env.RABBITMQ_USER
-const rmqPass = env.RABBITMQ_PASSWORD
-const rmqHost = env.RABBITMQ_HOST
-const rmqPort = Number(env.RABBITMQ_PORT)
-const rmqSecure = false
-const rmqVhost = env.RABBITMQ_VHOST
-
-export const rmqConnOptions = <RMQConnectionParams>{
-  username: rmqUser,
-  password: rmqPass,
-  vhost: rmqVhost,
-  hostname: rmqHost,
-  port: rmqPort,
-  secure: rmqSecure,
-}
-
-export const rabbitmqEventBus = new RabbitMQEventBus({
-  connectionParams: rmqConnOptions
-})
-
-export async function startRMQClient() {
-  await rabbitmqEventBus.connect().catch(async e => {
-    console.error("Error en la conexion RMQ")
-    await rabbitmqEventBus.connect()
-  })
-
-  // Bindings especificos, deberia meterlos en la clase
-  try {
-    await rabbitmqEventBus.channel?.assertQueue("sim.nos")
-  } catch {
-    console.log("[i] Cola de sims de nos creada")
-    await rabbitmqEventBus.channel?.bindQueue("sim.nos", "sim.exchange", "sim.nos.*")
-  }
-
-  return rabbitmqEventBus
-}

packages/sim-consumidor-nos/config/postgreConfig.ts

@@ -0,0 +1,18 @@
+import { Pool, QueryResult } from 'pg';
+import { PgClient } from 'sim-shared/infrastructure/PgClient.js'
+import { env } from './env/env.js';
+
+// Configuracion de la conexion a la BDD, deberia ser la 
+// Misma para todos los servicios pero hasta que se unifique todo 
+// se hace una por servicio.
+export const pgPool = new Pool({
+  user: env.POSTGRES_USER,
+  host: env.POSTGRES_HOST,
+  database: env.POSTGRES_DATABASE,
+  password: env.POSTGRES_PASSWORD,
+  port: Number(env.POSTGRES_PORT) || 5433,
+});
+
+export const pgClient = new PgClient({
+  pool: pgPool
+}) 

packages/sim-consumidor-nos/domain/NosAPI.ts

@@ -0,0 +1,131 @@
+export namespace NosApi {
+
+  export type ActivationData = {
+    /**
+    The unique physical subscriber identifier:
+    Cellular - the ICCID
+    Non - IP - the EUI
+    Satellite - the IMEI
+    */
+    physicalId: string,
+
+    /**
+    example: 447000000001
+    The unique network subscriber identifier:
+ 
+    Cellular subscriber - the MSISDN
+    Non - IP subscriber - the Device EUI
+    Satellite subscriber - the Subscription ID
+    */
+    subscriberId: string,
+
+    /**
+    example: 9999
+    If the subscriber uses Circuit Switched Data(CSD), this field displays its data number.If the subscriber does not use CSD, this field is null.
+    */
+    dataNumber: string
+
+    /**
+    example: 172.0.0.1
+    The subscriber IP address.
+     */
+    ip: string
+
+    /**
+    example: 234150000000001
+    The subscriber IMSI.
+     */
+    imsi: string
+
+  }
+
+  type OkResponse<T> = {
+    error?: undefined | null,
+    content: T
+  }
+
+  type ErrorResponse<E = GeneralError> = {
+    content?: undefined | null,
+    error: E
+  }
+
+  type GeneralError = {
+    children?: string[],
+    code: string,
+    message: string
+  }
+
+  export type ActivateResponseOK = OkResponse<ActivationData>
+  export type ActivateResponseError = ErrorResponse
+  export type ActivateResponse = ActivateResponseOK | ActivateResponseError
+
+  export type LineDataResponseOK = OkResponse<LineData>
+  export type LineDataResponseError = ErrorResponse
+  export type LineDataResponse = LineDataResponseOK | LineDataResponseError
+
+  export type PageDataResponseOk = OkResponse<LineData[]>
+  export type PageDataResponseError = OkResponse<LineData[]>
+  export type PageResponse = PageDataResponseOk | PageDataResponseError
+
+  export type LineData = {
+    physicalId: string
+    subscriberId: string
+    imsi: string
+    nickname: string
+    operatorCode: string
+    tariffName: string
+    lineRental: number
+    contractLength: number
+    isBarred: boolean
+    isActive: boolean
+    terminateDate: any
+    groupId: number
+    subscriberType: any
+    connectionDate: string
+    expiryDate: string
+    networkState: NetworkState
+    billingState: BillingState
+    operatorName: string
+    imei: string
+    dataUsage?: number
+    eid?: string
+    smdpProvider?: string
+    related?: {
+      parent: RelatedItem,
+      profiles: RelatedItem[]
+    }
+  }
+
+  type RelatedItem = {
+    physicalId: string
+    isEnabledOnParent: boolean
+  }
+
+  export type NetworkState = {
+    currentStateId: number
+    currentState: string
+    isTransferring: boolean
+    lastTransferred: number
+    isOnline: boolean
+    lastSeenOnline: number
+  }
+
+  export type BillingState = {
+    currentStateId: number
+    currentState: string
+  }
+
+  export type BarData = {
+    product: string
+    description: string
+    enabled: boolean
+  }
+
+  export type BarResponseOk = OkResponse<BarData>
+  export type BarResponseError = ErrorResponse
+  export type BarResponse = BarResponseOk | BarResponseError
+
+
+}
+
+

packages/sim-consumidor-nos/index.ts

@@ -1,14 +1,74 @@
-
-import { startRMQClient } from "#config/eventBusConfig"
+import express from "express"
+import cors from 'cors';
+import { SimNosRouter } from "./aplication/SimNOS.router.js"
 import { SimNosController } from "./aplication/SimNOS.controller.js"
+import { SimNosUsecases } from "./aplication/SimNOS.usecases.js"
+import { NosHttpClient } from "./infrastructure/NosHttpClient.js"
+import { env } from "#config/env/env.js"
+import { NosRepository } from "./infrastructure/NosRepository.js"
+import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
+import { pgClient } from "#config/postgreConfig.js";
+import { startRMQClient } from "#config/eventBus.config.js";
+
+const RMQ_QUEUE = "sim.nos"
+const NOS_BASE_URL = env.NOS_BASE_URL
+const PORT = env.APP_PORT
+const HOSTNAME = env.APP_HOST
 
 async function startWorker() {
+  // Instancia de dependencias
+
   const rmqClient = await startRMQClient()
+  const nosHttpClient = new NosHttpClient(
+    NOS_BASE_URL
+  )
+
+  const nosRepository = new NosRepository(
+    nosHttpClient
+  )
+
+  const orderRepository = new OrderRepository(
+    pgClient
+  )
+
+  const simUsecases = new SimNosUsecases(
+    nosHttpClient,
+    nosRepository,
+    orderRepository
+  )
+
   const simController = new SimNosController(
+    simUsecases,
     rmqClient
   )
 
-  rmqClient.consume("sim.nos", simController.recibeMsg)
+  const simRouter = new SimNosRouter(
+    simController,
+    rmqClient
+  )
+
+  // RMQ
+  rmqClient.consume(RMQ_QUEUE, simRouter.route)
+    .then(() => console.log("Cliente rmq creado con exito"))
+    .catch(e => console.error("Error conectando con RABBITMQ", e))
+
+  // Express
+  const app = express()
+  app.use(cors());
+  app.use(express.json());
+  app.use(express.urlencoded({ extended: true }));
+
+  app.get("/select", simController.selectREST())
+  app.get("/selectPage", simController.selectPageREST())
+
+  app.listen(PORT, HOSTNAME, (e) => {
+    if (e == undefined) {
+      console.log("[o] Servidor iniciado en el puerto %d", PORT)
+    } else {
+      console.error("Error express ", e)
+    }
+  })
+
 }
 
 startWorker()

packages/sim-consumidor-nos/infrastructure/NosHttpClient.ts

@@ -0,0 +1,41 @@
+import axios, { AxiosInstance } from "axios";
+import { env } from "#config/env/env.js"
+
+export class NosHttpClient {
+  public client: AxiosInstance;
+
+  constructor(
+    private baseURL: string,
+    //private jwtManager: JWTProvider<any>
+  ) {
+    this.client = axios.create({
+      baseURL: baseURL
+    })
+
+    // Interceptor para los headers fijos
+    this.client.interceptors.request.use(
+      async (config) => {
+        // Configuracion especifica de NOS (El token simepre es el mismo?)
+        const token = env.NOS_ACCESS_TOKEN;
+        config.headers.Authorization = `Bearer ${token}`
+        config.headers.set("content-type", "application/json")
+        return config
+      },
+      (error) => Promise.reject(error)
+    )
+  }
+
+  get post() {
+    return this.client.post
+  }
+
+  get patch() {
+    return this.client.patch
+  }
+
+  get get() {
+    return this.client.get
+  }
+
+
+}

packages/sim-consumidor-nos/infrastructure/NosRepository.ts

@@ -0,0 +1,177 @@
+import { Result } from "sim-shared/domain/Result.js";
+import { NosHttpClient } from "./NosHttpClient.js";
+import { NosApi } from "#domain/NosAPI.js";
+import axios, { AxiosError, AxiosResponse } from "axios";
+
+export class NosRepository {
+  constructor(
+    private httpClient: NosHttpClient
+  ) {
+  }
+
+  /**
+   * E => Tipo de error
+   * T => Tipo de dato para cod 200
+   *
+   * TODO:
+   * - Mejor gestion de los errores
+   * - E no se aplica todavia por no hacer la transformacion del error
+   */
+  private async manageNosRequest<E, T>(promise: Promise<AxiosResponse<T>>): Promise<Result<string, T>> {
+    try {
+      const res = await promise
+      return {
+        data: res.data
+      }
+    } catch (e) {
+      if (axios.isAxiosError(e)) {
+        const error = e as AxiosError
+        return {
+          error: error.code + " : " + String(error.response?.statusText)
+        }
+      } else {
+        return {
+          error: String(e)
+        }
+      }
+    }
+  }
+
+  public async getLineInfo(iccid: string): Promise<Result<string, NosApi.LineData>> {
+    const PATH = "/subscribers/" + iccid
+    console.log("PAth", PATH)
+    const lineRequest = this.httpClient.get<NosApi.LineDataResponseOK>(PATH)
+    const lineResponse = await this.manageNosRequest<string, NosApi.LineDataResponseOK>(lineRequest)
+
+    if (lineResponse.error != undefined) {
+      return lineResponse
+    } else {
+      return {
+        data: lineResponse.data.content
+      }
+    }
+  }
+
+  /**
+   * El metodo de NOS de paginar las lineas
+   * maximo por pagina 100, default 25
+   * no devuelve el offset ni el numero de elementos restantes
+   * hay que llevar la cuenta
+   */
+  public async getLinePage(args: {
+    limit?: number,
+    offset?: number,
+    filter?: string,
+    orderBy?: string
+  }): Promise<Result<string, any>> {
+    const PATH = "/subscribers"
+
+    const LIMIT = 100
+    const options = {
+      limit: args.limit ?? LIMIT,
+      offset: args.offset ?? 0,
+      filter: args.filter,
+      orderBy: args.orderBy
+    }
+
+    const pageRequest = this.httpClient.get(PATH, {
+      params: options
+    })
+
+    const pageResponse = await this.manageNosRequest<string, any>(pageRequest)
+    if (pageResponse.error != undefined) {
+      return pageResponse
+    } else {
+      return {
+        data: pageResponse.data.content
+      }
+    }
+  }
+
+  public async getLinesInfo(iccid: string[]) /*Promise<Result<string, NosApi.LineData>>*/ {
+    throw new Error("NOS no permite buscar iccid en bulk, se puede hacer un apaño pero está en proceso")
+    const PATH = "/subscribers"
+    const LIMIT = 100
+
+    const steps = Math.ceil(iccid.length / LIMIT)
+    const options = {
+      limit: LIMIT,
+      offset: 0,
+    }
+
+    const req = this.httpClient.post<NosApi.LineDataResponseOK>(PATH)
+    const resp = await this.manageNosRequest<string, NosApi.LineDataResponseOK>(req)
+
+    if (resp.error != undefined) {
+      return resp
+    } else {
+      return {
+        //@ts-expect-error
+        data: resp.data.content
+      }
+    }
+  }
+
+  public async activateSim(iccid: string): Promise<Result<string, NosApi.ActivationData>> {
+    const PATH = '/provisioning'
+    const PRODUCT_ID = 1330 // No se que es, preguntar a Ivan
+    const data = {
+      productSetId: PRODUCT_ID
+    }
+
+    const req = this.httpClient.post<NosApi.ActivateResponseOK>(PATH, data)
+    const resp = await this.manageNosRequest<string, NosApi.ActivateResponseOK>(req)
+
+    if (resp.error != undefined) {
+      return resp
+    } else {
+      return {
+        data: resp.data.content
+      }
+    }
+  }
+
+  /**
+  * "A bar is a service provisioning action that results in a subscriber being blocked from accessing an operator's network. The bar remains in place until the operator is sent an unbar request."
+  * Se entiende que un "bar" es una suspension temporal
+  */
+  public async bar(iccid: string) {
+    const PATH = `/subscribers/${iccid}/products`
+    const data = {
+      product: "BAR DN TOTAL",
+      action: "enable"
+    }
+
+    const req = this.httpClient.patch<NosApi.BarResponseOk>(PATH, data)
+    const resp = await this.manageNosRequest<string, NosApi.BarResponseOk>(req)
+
+    if (resp.error != undefined) {
+      return resp
+    } else {
+      return {
+        data: resp.data.content
+      }
+    }
+  }
+
+  public async unbar(iccid: string) {
+    const PATH = `/subscribers/${iccid}/products`
+    const data = {
+      product: "BAR DN TOTAL",
+      action: "disable"
+    }
+
+    const req = this.httpClient.patch<NosApi.BarResponseOk>(PATH, data)
+    const resp = await this.manageNosRequest<string, NosApi.BarResponseOk>(req)
+
+    if (resp.error != undefined) {
+      return resp
+    } else {
+      return {
+        data: resp.data.content
+      }
+    }
+
+  }
+
+}

packages/sim-consumidor-nos/package.json

@@ -1,17 +1,8 @@
 {
   "name": "sim-consumidor-nos",
-  "version": "1.0.0",
+  "type": "module",
   "description": "consumidor generico de eventos de NOS",
   "main": "index.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "yarn tsc --project tsconfig.json && yarn tsc-alias && cp package.json ../../dist/packages/sim-consumidor-nos/",
-    "esbuild": "esbuild index.ts --platform=node",
-    "start": "node ../../dist/packages/sim-consumidor-nos/index.js"
-  },
-  "author": "",
-  "license": "ISC",
-  "packageManager": "yarn@4.12.0",
   "imports": {
     "#config/*.js": {
       "types": "./config/*.ts",
@@ -21,13 +12,13 @@
       "types": "./config/*.ts",
       "default": "./config/*.js"
     },
-    "#adapters/*.js": {
-      "types": "./adapters/*.ts",
-      "default": "./adapters/*.js"
+    "#infrastructure/*.js": {
+      "types": "./infrastructure/*.ts",
+      "default": "./infrastructure/*.js"
     },
-    "#adapters/*": {
-      "types": "./adapters/*.ts",
-      "default": "./adapters/*.js"
+    "#infrastructure/*": {
+      "types": "./infrastructure/*.ts",
+      "default": "./infrastructure/*.js"
     },
     "#domain/*.js": {
       "types": "./domain/*.ts",
@@ -37,29 +28,32 @@
       "types": "./domain/*.ts",
       "default": "./domain/*.js"
     },
-    "#ports/*.js": {
-      "types": "./ports/*.ts",
-      "default": "./ports/*.js"
+    "#aplication/*.js": {
+      "types": "./aplication/*.ts",
+      "default": "./aplication/*.js"
     },
-    "#ports/*": {
-      "types": "./ports/*.ts",
-      "default": "./ports/*.js"
-    },
-    "#tests/*.js": {
-      "types": "./__tests__/*.ts",
-      "default": "./__tests__/*.js"
-    },
-    "#tests/*": {
-      "types": "./__tests__/*.ts",
-      "default": "./__tests__/*.js"
+    "#aplication/*": {
+      "types": "./aplication/*.ts",
+      "default": "./aplication/*.js"
     }
   },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "yarn tsc --project tsconfig.json && yarn tsc-alias && cp package.json ../../dist/packages/sim-consumidor-nos/",
+    "esbuild": "esbuild index.ts --platform=node",
+    "start": "node ../../dist/packages/sim-consumidor-nos/index.js",
+    "dev": "tsx watch index.ts"
+  },
+  "author": "",
+  "license": "ISC",
+  "packageManager": "yarn@4.12.0",
   "dependencies": {
     "@tsconfig/node22": "*",
     "amqplib": "^0.10.9",
     "cors": "*",
     "dotenv": "*",
     "express": "*",
+    "sim-shared": "sim-shared:*",
     "typescript": "*"
   },
   "devDependencies": {
@@ -70,6 +64,7 @@
     "@types/supertest": "*",
     "prettier": "*",
     "supertest": "*",
+    "tsc-alias": "^1.8.16",
     "tsx": "*",
     "vitest": "*"
   }

packages/sim-consumidor-nos/readme.md

@@ -0,0 +1,11 @@
+# NOS
+
+## Particularidades de las operaciones de NOS
+
+- Documentación de la API: [DOC](https://pelion-help.iot-x.com/nos/en/Content/API/APIReference/API%20Reference.htm?tocpath=_____7)
+- No se necesita la pre-activación de las SIM.
+- La suspensión y reactivación se llama "bar" y "unbar".
+- El token de Authentication dura exactamente 1 año, solo se puede refrescar
+  desde la web.
+- En la documentación la URL de la API es <https://nos-api.iot-x.com> pero la
+  de producción es <https://nosconnectcenter-api.iot-x.com>.

packages/sim-consumidor-nos/test.env

@@ -0,0 +1,5 @@
+## ENV PARA DATOS DE TEST - shared nunca se lanza en produccion
+
+NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"
+# NOTIFICATION_URL="localhost"
+SIM_ACTIVATION_API_KEY=9e48c4ac-1ab0-4397-b3f3-6c239200dfe6

packages/sim-consumidor-nos/tsconfig.json

@@ -2,16 +2,40 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist",
-    "baseUrl": ".",
+    "rootDir": "../../",
+    "paths": {
+      "#config/*": [
+        "./config/*"
+      ],
+      "#infrastructure/*": [
+        "./infrastructure/*"
+      ],
+      "#domain/*": [
+        "./domain/*"
+      ],
+      "#aplication/*": [
+        "./aplication/*"
+      ],
+      "config/*": [
+        "./config/*"
+      ],
+      "infrastructure/*": [
+        "./infrastructure/*"
+      ],
+      "domain/*": [
+        "./domain/*"
+      ]
+    }
   },
   "exclude": [
     "node_modules"
   ],
   "include": [
     "**/*.ts",
-    "src/**/*.d.ts"
+    "**/*.d.ts",
+    "../../packages/sim-shared/**/*.ts"
   ],
   "files": [
     "index.ts"
   ]
-}
+}

packages/sim-consumidor-objenious/.env

@@ -1,4 +1,6 @@
 # claves de Objenious
+HOST=0.0.0.0
+
 OBJ_PEM_PATH=./obj.pem
 OBJ_AUTHORIZATION=XOc7FtwXD8hUX2SFVX94XSty8wkOmChkwDNF09O_aIxPubMDdFUdCDCB4zpzSIxi8nOcTg7r_LM_nmd5qm7uLbksf_XArjI8iAyhjKz_2BAXPhmvKs4Fc9f3vv5LDfCVrPB9lP8P7rJ66_qnWs4jvhLQxSfn29m96hgXeCf8oySdIDUjN2q9Js3KAS5LL52Ri6ryvUeO1PvMhaPQMWRqoHIqTV1wPfPtiqQwcjUPmu5GeW164Kq1JLgV3KaGzfCZ9Qv9lbv30EJrukXxWuLCAhBS0kzrBXZoWvf2pb9uh3Am_93_dDxiIGQfIap9ZU_m8ZD1HPgvZOMCY6ZkxQconQ
 OBJ_CLI_ASSERTION=XOc7FtwXD8hUX2SFVX94XSty8wkOmChkwDNF09O_aIxPubMDdFUdCDCB4zpzSIxi8nOcTg7r_LM_nmd5qm7uLbksf_XArjI8iAyhjKz_2BAXPhmvKs4Fc9f3vv5LDfCVrPB9lP8P7rJ66_qnWs4jvhLQxSfn29m96hgXeCf8oySdIDUjN2q9Js3KAS5LL52Ri6ryvUeO1PvMhaPQMWRqoHIqTV1wPfPtiqQwcjUPmu5GeW164Kq1JLgV3KaGzfCZ9Qv9lbv30EJrukXxWuLCAhBS0kzrBXZoWvf2pb9uh3Am_93_dDxiIGQfIap9ZU_m8ZD1HPgvZOMCY6ZkxQconQ

packages/sim-consumidor-objenious/aplication/Sim.controller.test.ts

@@ -0,0 +1,121 @@
+import { describe, it, beforeEach, mock, after } from "node:test";
+import assert from "node:assert";
+import { SimController } from "./Sim.controller.js";
+import { EventBus } from "sim-shared/domain/EventBus.port.js";
+import { SimUseCases } from "./Sim.usecases.js";
+import { ConsumeMessage } from "amqplib";
+import { postgrClient, pgPool } from "#config/postgreConfig.js";
+import { httpInstance } from "#config/httpClient.config.js";
+import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
+import { PauseCancelTaskRepository } from "#adapters/PauseCancelTaskRepository.js";
+import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js";
+import { ActionData } from "#domain/DTOs/objeniousapi.js";
+import { ObjeniousLinesRepository } from "sim-shared/infrastructure/ObjeniousLinesRepository.js";
+
+describe("SimController Integration Tests (Real UseCases)", () => {
+  let eventBusMock: any;
+  let controller: SimController;
+  let useCases: SimUseCases;
+
+  beforeEach(() => {
+    // Mock ONLY the event bus as requested
+    eventBusMock = {
+      publish: mock.fn(),
+      addSubscribers: mock.fn(),
+      consume: mock.fn(),
+      ack: mock.fn(async () => { }),
+      nack: mock.fn(async () => { }),
+    };
+
+    const operationRepository = new ObjeniousOperationsRepository(
+      httpInstance,
+      postgrClient,
+    );
+    const orderRepository = new OrderRepository(postgrClient);
+    const pauseRepository = new PauseCancelTaskRepository(postgrClient);
+    const linesRepository = new ObjeniousLinesRepository(postgrClient) // tiene que apuntar a "intranet"
+    useCases = new SimUseCases({
+      httpClient: httpInstance,
+      operationRepository: operationRepository,
+      orderRepository: orderRepository,
+      pauseRepository: pauseRepository,
+      objeniousLinesRepository: linesRepository
+    });
+    // @ts-expect-error
+    useCases.findActivationDate = async (data: ActionData) => new Date()
+
+    controller = new SimController(eventBusMock as unknown as EventBus, useCases);
+  });
+
+  const createMockMsg = (payload: any): ConsumeMessage => {
+    return {
+      content: Buffer.from(JSON.stringify(payload)),
+      fields: {},
+      properties: {
+        headers: {
+          message_id: "test-correlation-id"
+        }
+      },
+    } as unknown as ConsumeMessage;
+  };
+
+  after(async () => {
+    await pgPool.end();
+  });
+
+  describe("suspend", () => {
+    it("should call stage_suspend and interact with DB and EventBus", async () => {
+      const iccid = "test-iccid-suspend-" + Date.now();
+      const msg = createMockMsg({
+        key: "sim.test.pause",
+        payload: {
+          iccid: iccid
+        },
+        headers: {
+          message_id: "correlation-suspend-" + iccid
+        }
+      });
+
+      const handler = controller.suspend();
+      await handler(msg);
+
+      // Verify that it reached the stage_suspend logic (which adds to pauseRepository)
+      // We can query the DB or check if ACK was called
+      assert.strictEqual(eventBusMock.ack.mock.callCount(), 1, "Message should be ACKed on success");
+      assert.strictEqual(eventBusMock.nack.mock.callCount(), 0, "Message should not be NACKed");
+    });
+  });
+
+  describe("terminate", () => {
+    it("should call stage_terminate and interact with DB and EventBus", async () => {
+      const iccid = "test-iccid-terminate-" + Date.now();
+      const msg = createMockMsg({
+        key: "sim.test.pause",
+        payload: {
+          iccid: iccid
+        },
+        headers: {
+          message_id: "correlation-terminate-" + iccid
+        }
+      });
+
+      const handler = controller.terminate();
+      await handler(msg);
+
+      assert.strictEqual(eventBusMock.ack.mock.callCount(), 1, "Message should be ACKed on success");
+      assert.strictEqual(eventBusMock.nack.mock.callCount(), 0, "Message should not be NACKed");
+    });
+  });
+
+  describe("Error Handling", () => {
+    it("should nack if message is invalid", async () => {
+      const msg = {
+        content: Buffer.from("invalid json"),
+        fields: {},
+        properties: {},
+      } as unknown as ConsumeMessage;
+      const handler = controller.suspend();
+      await assert.rejects(handler(msg), "Error de suspension consumiendo el mensaje no es valido");
+    });
+  });
+});

packages/sim-consumidor-objenious/aplication/Sim.controller.ts

@@ -3,7 +3,10 @@ import { ConsumeMessage } from "amqplib";
 import { SimUseCases } from "./Sim.usecases.js";
 import { SimEvents } from "sim-shared/domain/SimEvents.js";
 import { Result } from "sim-shared/domain/Result.js";
-import { env } from "#config/env/index.js";
+import { ActionData } from "#domain/DTOs/objeniousapi.js";
+import { Request, Response } from "express"
+import { PaginationArgs, QueryPaginationArgs } from "sim-shared/domain/PaginationArgs.js";
+import { paginationValidator } from "./httpValidators.js";
 
 /**
  * La clase usa generadores de funciones para mantener el contexto
@@ -21,7 +24,6 @@ export class SimController {
   ) {
     this.eventBus = eventBus
     this.useCases = useCases
-
   }
 
   private decodeMsg(msg: ConsumeMessage): object | undefined {
@@ -37,6 +39,7 @@ export class SimController {
 
     } catch (error) {
       console.error('Error al decodificar JSON:', error);
+      console.error(Buffer.from(msg.content).toString(("utf8")))
       // Aquí podrías decidir devolver el string crudo o null
       return undefined;
     }
@@ -86,7 +89,7 @@ export class SimController {
       const resp = await this.tryUseCase(msg, this.useCases.activate({
         correlation_id: msgData.headers?.message_id,
         dueDate: this.genDueDate(DUE_DATE_SECONDS).toISOString(),
-        customerAccountCode: env.OBJ_CUSTOMER_CODE,
+        customerAccountCode: "9.49411.10",
         identifier: {
           identifierType: "ICCID",
           identifiers: [iccid]
@@ -108,7 +111,7 @@ export class SimController {
     return async (msg: ConsumeMessage) => {
       let msgData;
       try {
-        msgData = this.validateMsg(msg) as SimEvents.pause
+        msgData = this.validateMsg(msg) as SimEvents.suspend
       } catch (e) {
         throw new Error("Error de preactivacion consumiendo el mensaje no es valido" + String(e))
       }
@@ -135,7 +138,7 @@ export class SimController {
     return async (msg: ConsumeMessage) => {
       let msgData;
       try {
-        msgData = this.validateMsg(msg) as SimEvents.pause
+        msgData = this.validateMsg(msg) as SimEvents.suspend
       } catch (e) {
         throw new Error("Error de reactivacion consumiendo el mensaje no es valido" + String(e))
       }
@@ -157,11 +160,14 @@ export class SimController {
     }
   }
 
+  /**
+   * Lo mismo que pause
+   */
   public suspend() {
     return async (msg: ConsumeMessage) => {
       let msgData;
       try {
-        msgData = this.validateMsg(msg) as SimEvents.pause
+        msgData = this.validateMsg(msg) as SimEvents.suspend
       } catch (e) {
         throw new Error("Error de suspension consumiendo el mensaje no es valido" + String(e))
       }
@@ -171,14 +177,18 @@ export class SimController {
       }
 
       const iccid = msgData.payload.iccid
-      const res = await this.tryUseCase(msg, this.useCases.suspend({
+      const suspendData: ActionData = {
         correlation_id: msgData.headers?.message_id,
         dueDate: this.genDueDate(2 * 60).toISOString(),
         identifier: {
           identifierType: "ICCID",
-          identifiers: [iccid]
+          identifiers: [iccid] // Por algún motivo solo he puesto un iccd por identifier
         }
-      }))
+      }
+      const useCaseRes = await this.tryUseCase(msg, this.useCases.stage_suspend(suspendData))
+      /*
+      const res = await this.tryUseCase(msg, this.useCases.suspend(actionData))
+      */
 
     }
   }
@@ -187,7 +197,7 @@ export class SimController {
     return async (msg: ConsumeMessage) => {
       let msgData;
       try {
-        msgData = this.validateMsg(msg) as SimEvents.pause
+        msgData = this.validateMsg(msg) as SimEvents.suspend
       } catch (e) {
         throw new Error("Error consumiendo el mensaje no es valido" + String(e))
       }
@@ -195,16 +205,50 @@ export class SimController {
       if (msgData == undefined) {
         return Promise.reject("Mensaje invalido")
       }
+
       const iccid = msgData.payload.iccid
-      console.log("Mensaje procesado", msgData)
-      const res = await this.tryUseCase(msg, this.useCases.terminate({
+      const terminateActionData: ActionData = {
         correlation_id: msgData.headers?.message_id,
         dueDate: this.genDueDate(2 * 60).toISOString(),
         identifier: {
           identifierType: "ICCID",
           identifiers: [iccid]
         }
-      }))
+      }
+
+      //const res = await this.tryUseCase(msg, this.useCases.terminate(terminateActionData))
+      const res = await this.tryUseCase(msg, this.useCases.stage_terminate(terminateActionData))
+
+    }
+  }
+
+  public queryLines() {
+    const DEFAULT_LIMIT = 1000
+    const DEFAULT_OFFSET = 0
+
+    return async (req: Request, res: Response) => {
+      const queryParams = req.query
+
+      const paginationArgs: QueryPaginationArgs = {
+        limit: queryParams.limit as string | undefined,
+        offset: queryParams.offset as string | undefined
+      }
+
+      const validationRes = paginationValidator.validate(paginationArgs)
+      if (validationRes.error != undefined) {
+        res.status(402).json(validationRes)
+        return;
+      }
+
+      const paginationValues = {
+        limit: (queryParams.limit != undefined) ? Number(queryParams.limit) : DEFAULT_LIMIT,
+        offset: (queryParams.offset != undefined) ? Number(queryParams.offset) : DEFAULT_OFFSET
+      }
+
+      const status = req.query.status
+
+      const queryRes = await this.useCases.getLinesByQuery({ status: status as string | undefined }, paginationValues)
+      res.json(queryRes)
     }
   }
 

packages/sim-consumidor-objenious/aplication/Sim.router.ts

@@ -19,7 +19,7 @@ export class SimRouter {
       ["activate", this.simController.activate()],
       ["pause", this.simController.suspend()],
       ["cancel", this.simController.terminate()],
-      ["reActivate", this.simController.reActivate()],
+      ["reactivate", this.simController.reActivate()],
       ["preActivate", this.simController.preActivate()]
     ]);
   }

packages/sim-consumidor-objenious/aplication/Sim.usecases.ts

@@ -5,6 +5,11 @@ import { Result } from "sim-shared/domain/Result.js"
 import { ObjeniousOperation, IOperationsRepository as OperationsRepositoryPort } from "sim-shared/domain/operationsRepository.port.js"
 import assert from "node:assert"
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js"
+import { CreatePauseCancelTaskDTO, PauseCancelTaskRepository } from "#adapters/PauseCancelTaskRepository.js"
+import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js"
+import { ObjeniousLinesRepository } from "sim-shared/infrastructure/ObjeniousLinesRepository.js"
+import { error } from "node:console"
+import { ObjeniousLine, ObjeniousLineDb } from "sim-shared/domain/objeniousLine.js"
 
 // TODO: 
 // - Pasar a un archivo de DTOs
@@ -12,21 +17,26 @@ import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js"
 
 export class SimUseCases {
   private readonly httpClient: HttpClient
-  private readonly operationRepository: OperationsRepositoryPort
+  private readonly objeniousRepository: ObjeniousOperationsRepository
   private readonly orderRepository: OrderRepository
-
+  private readonly pauseRepository: PauseCancelTaskRepository
+  private readonly objeniousLinesRepository: ObjeniousLinesRepository
   constructor(args: {
     httpClient: HttpClient,
-    operationRepository: OperationsRepositoryPort,
-    orderRepository: OrderRepository
+    operationRepository: ObjeniousOperationsRepository,
+    orderRepository: OrderRepository,
+    pauseRepository: PauseCancelTaskRepository,
+    objeniousLinesRepository: ObjeniousLinesRepository
   }) {
     this.httpClient = args.httpClient
-    this.operationRepository = args.operationRepository
+    this.objeniousRepository = args.operationRepository
     this.orderRepository = args.orderRepository
+    this.pauseRepository = args.pauseRepository
+    this.objeniousLinesRepository = args.objeniousLinesRepository
   }
 
   private async logOperation(data: ObjeniousOperation) {
-    await this.operationRepository.createOperation({
+    await this.objeniousRepository.createOperation({
       ...data
     })
   }
@@ -70,11 +80,14 @@ export class SimUseCases {
             operation: args.operation,
             iccids: String(args.iccid),
             status: "noMassID",
-            request_id: response.data.requestId
+            request_id: response.data.requestId,
+            correlation_id: args.correlation_id
           }
 
+          // TODO: Esto tiene poco sentido si la operacion ya se
+          // tenia que haber creado en el generador
           this.logOperation(operation)
-            .then().catch(e => console.error(e))
+            .then().catch(e => console.error("Error login operation", e))
 
           if (args.correlation_id != undefined) {
             this.orderRepository.updateOrder({
@@ -89,7 +102,6 @@ export class SimUseCases {
             error: undefined,
             data: true
           }
-
         } else {
           return {
             error: String(response.status),
@@ -109,8 +121,19 @@ export class SimUseCases {
   public activate(activationData: ActivationData): () => Promise<Result<string, boolean>> {
     const OPERATION_URL = "/actions/activateLine"
     return async () => {
+      const iccid = activationData.identifier.identifiers
+      // Comporbación excepcional para saber si la linea está suspendida
+      const statusLinea = await this.objeniousRepository.getLinesAPI("ICCID", [String(iccid)])
+      if (statusLinea.data != undefined && statusLinea.data[0].status.networkStatus == "SUSPENDED") {
+        const res = await this.reActivate(activationData)()
+        return res;
+      }
+
       const req = this.httpClient.client.post(OPERATION_URL, {
-        ...activationData
+        dueDate: activationData.dueDate,
+        identifier: activationData.identifier,
+        customerAccountCode: activationData.customerAccountCode,
+        offer: activationData.offer
       })
 
       try {
@@ -189,16 +212,29 @@ export class SimUseCases {
     }
   }
 
-  public reActivate(pauseData: ActionData): () => Promise<Result<string, boolean>> {
+  public reActivate(reactivateData: ActionData): () => Promise<Result<string, boolean>> {
     const OPERATION_URL = "/actions/reactivateLine"
     return async () => {
       const req = this.httpClient.client.post(OPERATION_URL, {
-        ...pauseData
+        ...reactivateData
       })
 
       try {
         const response = await req
 
+        // Creacion de la operacion inicial, antes de tener los datos
+        const operation: ObjeniousOperation = {
+          operation: "reactivate",
+          iccids: reactivateData.identifier.identifiers[0],
+          status: "noMassID",
+          request_id: response.data.requestId,
+          correlation_id: reactivateData.correlation_id
+        }
+
+        // TODO: Esto tiene poco sentido si la operacion ya se
+        // tenia que haber creado en el generador
+        this.logOperation(operation)
+          .then().catch(e => console.error("Error login operation", e))
         if (response.status == 200) {
           console.log("[o] Sim solicitud de reactivacion ", response.data)
           return <Result<string, boolean>>{
@@ -214,7 +250,7 @@ export class SimUseCases {
       } catch (error) {
         console.error("[x] Error reactivacion", (error as AxiosError).response?.status)
         return <Result<string, boolean>>{
-          error: "Error reactivando la sim" + pauseData.identifier,
+          error: "Error reactivando la sim" + reactivateData.identifier,
           data: undefined
         }
       }
@@ -225,23 +261,231 @@ export class SimUseCases {
     const OPERATION_URL = "/actions/suspendLine"
     return this.generateUseCase({
       correlation_id: suspendData.correlation_id,
-      operationPayload: suspendData,
+      operationPayload: {
+        dueDate: suspendData.dueDate,
+        identifier: suspendData.identifier
+      },
       url: OPERATION_URL,
       iccid: suspendData.identifier.identifiers[0], // 
       operation: "suspend"
     })
   }
 
+  /**
+   * Metodo muy especifico para obtener la fecha e activacion o en su defecto
+   * la actual para saber cuando se va a completar el periodo de test de una linea
+   */
+  private async findActivationDate(actionData: ActionData) {
+    const iccid = actionData.identifier.identifiers
+    const lineData = await this.objeniousRepository.getLinesAPI("ICCID", iccid)
+    let activationDate = new Date()
+    // Si no se pueden sacar datos de la linea guardo momentaneamente el error
+    // pero no se cancela la operacion, el error puede ser de objenious y no nos 
+    // puede afectar
+    //console.log("LineData", lineData.data)
+    if (lineData.error != undefined) {
+      console.error(lineData.error)
+    } else {
+      const activationDateStr = lineData.data[0].status.activationDate
+      if (activationDateStr != undefined && activationDateStr != "") {
+        activationDate = new Date(activationDateStr)
+      }
+    }
+    return activationDate
+  }
+
+
+  /**
+  * Paso previo a la suspension para evitar errores cuando el billing es test
+  */
+  public stage_suspend(suspendData: ActionData): () => Promise<Result<string, boolean>> {
+    return async (): Promise<Result<string, boolean>> => {
+      const correlation_id = suspendData.correlation_id
+      const iccid = suspendData.identifier.identifiers
+
+
+      const operation: ObjeniousOperation = {
+        operation: "suspend",
+        iccids: iccid[0],
+        status: "running",
+        correlation_id: correlation_id
+      }
+      // No se registra hasta que no pase por la tabla de pausas
+      //      this.logOperation(operation)
+      //        .then().catch(e => console.error("Error login operation", e))
+
+      const fail = (error: string) => {
+        console.error("[Sim.usecases]", error)
+        if (correlation_id != undefined) {
+          this.orderRepository.updateOrder({
+            correlation_id: correlation_id,
+            new_status: "failed"
+          })
+        }
+      }
+
+      // TODO REGISTRAR EL ORDER
+      /*
+      if (correlation_id != undefined) {
+        await this.orderRepository.createOrder({
+          correlation_id: correlation_id,
+          order_type: "pause"
+        })
+      }
+*/
+      let activationDate;
+      try {
+        activationDate = await this.findActivationDate(suspendData)
+      } catch (e) {
+        return {
+          error: String(e)
+        }
+      }
+      const newTask: CreatePauseCancelTaskDTO = {
+        iccid: iccid[0],
+        activation_date: activationDate,
+        next_check: undefined, // Que se haga instantaneamente al ser la primera
+        operation_type: "suspend",
+        action_data: suspendData
+      }
+
+      const taskCreated = await this.pauseRepository.addTask(newTask)
+
+      // Caso que la task no se pueda crear en la BDD
+      if (taskCreated.error != undefined) {
+        fail(taskCreated.error)
+        return {
+          error: taskCreated.error
+        }
+      }
+
+      // Caso que se haya creado en la BDD
+      if (correlation_id != undefined) {
+        this.orderRepository.updateOrder({
+          correlation_id: correlation_id,
+          new_status: "running"
+        })
+      }
+
+      return {
+        data: true
+      }
+    }
+  }
+
+  /**
+  * Paso previo a la suspension para evitar errores cuando el billing es test
+  */
+  public stage_terminate(terminateData: ActionData): () => Promise<Result<string, boolean>> {
+    return async (): Promise<Result<string, boolean>> => {
+      const correlation_id = terminateData.correlation_id
+      const iccid = terminateData.identifier.identifiers[0]
+
+      const activationDate = await this.findActivationDate(terminateData)
+      const newTask: CreatePauseCancelTaskDTO = {
+        iccid: iccid,
+        activation_date: activationDate,
+        next_check: undefined, // Que se haga instantaneamente al ser la primera
+        operation_type: "terminate",
+        action_data: terminateData
+      }
+
+      const taskCreated = await this.pauseRepository.addTask(newTask)
+
+      const operation: ObjeniousOperation = {
+        operation: "terminate",
+        iccids: iccid,
+        status: "running",
+        correlation_id: correlation_id
+      }
+
+      /**
+      this.logOperation(operation)
+        .then().catch(e => console.error("Error login operation", e))
+      */
+      // Caso que la task no se pueda crear en la BDD
+      if (taskCreated.error != undefined) {
+        console.error("[Sim.usecases]", taskCreated.error)
+        if (correlation_id != undefined) {
+          this.orderRepository.updateOrder({
+            correlation_id: correlation_id,
+            new_status: "failed"
+          })
+        }
+        return {
+          error: taskCreated.error
+        }
+      }
+
+      // Caso que se haya creado en la BDD
+      if (correlation_id != undefined) {
+        this.orderRepository.updateOrder({
+          correlation_id: correlation_id,
+          new_status: "running"
+        })
+      }
+
+      return {
+        data: true
+      }
+    }
+  }
   public terminate(terminationData: ActionData): () => Promise<Result<string, boolean>> {
     const OPERATION_URL = "/actions/terminateLine"
     return this.generateUseCase({
       correlation_id: terminationData.correlation_id,
-      operationPayload: terminationData,
+      operationPayload: {
+        dueDate: terminationData.dueDate,
+        identifier: terminationData.identifier
+      },
       url: OPERATION_URL,
-      iccid: terminationData.identifier.identifiers[0], // 
+      iccid: terminationData.identifier.identifiers[0],
       operation: "terminate"
     })
   }
 
+  /**
+  * Calcula el tiempo que una linea ha estado en suspensión 
+  */
+  public async getSuspendedTime(iccid: string):
+    Promise<Result<string, { total_milliseconds: number, total_days: number }>> {
+    try {
+      const result = await this.objeniousRepository.getSuspendedTime(iccid);
+      if (result.error !== undefined) {
+        return { error: result.error as string, data: undefined };
+      }
+      return {
+        data: {
+          total_milliseconds: result.data!.total_milliseconds,
+          total_days: result.data!.total_days
+        }
+      };
+    } catch (error) {
+      console.error("[Sim.usecases] Error getting suspended time", error);
+      return { error: "Error getting suspended time", data: undefined };
+    }
+  }
+
+  /**
+  * Busqueda de líneas **en nuestro volcado** según una query y con paginacion
+  */
+  public async getLinesByQuery(query: { status?: string | undefined }, pagination: { limit: number, offset: number })
+    : Promise<Result<string, {
+      data: ObjeniousLineDb[],
+      offset: number,
+      rowCount: number
+    }>> {
+    try {
+
+      const linesQuery = await this.objeniousLinesRepository.getLinesByStatus(query, pagination)
+      return {
+        data: linesQuery,
+      }
+    } catch (e) {
+      return {
+        error: String(e)
+      }
+    }
+  }
 
 }

packages/sim-consumidor-objenious/aplication/httpValidators.ts

@@ -0,0 +1,18 @@
+import { BodyValidator, Validator } from "sim-shared/aplication/BodyValidator.js";
+import { QueryPaginationArgs } from "sim-shared/domain/PaginationArgs.js";
+
+const limitPositiveOrUndefined = <Validator<QueryPaginationArgs>>{
+  field: "limit",
+  validationFunc: (args) => (args.limit == undefined || !isNaN(+args.limit) && parseInt(args.limit) >= 0),
+  errorMsg: "El campo limit debe ser un numero o undefined (default 0)"
+}
+const offsetPositiveOrUndefined = <Validator<QueryPaginationArgs>>{
+  field: "offset",
+  validationFunc: (args) => (args.offset == undefined || isNaN(+args.offset) && parseInt(args.offset) >= 1),
+  errorMsg: "El campo offset debe ser un numero o undefined (default 0)"
+}
+
+export const paginationValidator = new BodyValidator<QueryPaginationArgs & {}>([
+  limitPositiveOrUndefined,
+  offsetPositiveOrUndefined
+])

packages/sim-consumidor-objenious/config/env/index.ts

@@ -4,7 +4,10 @@ import path from "node:path";
 loadEnvFile(path.join("../../.env")) // Global
 loadEnvFile(path.join("./.env")) // base
 
+
 export const env = {
+  PORT: parseInt(process.env.OBJENIOUS_CONSUMER_PORT || "3002"),
+
   ENVIRONMENT: process.env.ENVIORMENT,
   POSTGRES_USER: process.env.POSTGRES_USER,
   POSTGRES_PASSWORD: process.env.POSTGRES_PASSWORD,

packages/sim-consumidor-objenious/config/eventBus.config.ts

@@ -18,24 +18,26 @@ export const rmqConnOptions = <RMQConnectionParams>{
   secure: rmqSecure,
 }
 
+export const QUEUES = {
+  OBJ: "sim.objenious",
+  OBJDLX: "sim.objenious.dlx",
+  OBJDEL: "sim.objenious.delayed",
+}
+
+export const EXCHANGES = {
+  MAIN: "sim.exchange",
+  DLX: "sim.ex.objenious.dlx",
+  DEL: "sim.ex.objenious.delayed"
+}
 export const rabbitmqEventBus = new RabbitMQEventBus({
   connectionParams: rmqConnOptions,
   buildStructure: buildQueues,
-  maxRetry: 5
+  maxRetry: 5,
+  delayedExchange: EXCHANGES.DEL,
+  dlxExchange: EXCHANGES.DLX
 })
 
 async function buildQueues(channel: Channel) {
-  const QUEUES = {
-    OBJ: "sim.objenious",
-    DLX: "sim.objenious.dlx",
-    DEL: "sim.objenious.delayed"
-  }
-
-  const EXCHANGES = {
-    MAIN: "sim.exchange",
-    DLX: "sim.ex.objenious.dlx",
-    DEL: "sim.ex.objenious.delayed"
-  }
 
   const DELAY = 10 * 1000
   const BASE_OBENIOUS_KEY = "sim.objenious.#"
@@ -45,8 +47,8 @@ async function buildQueues(channel: Channel) {
   await channel.assertExchange(EXCHANGES.MAIN, "topic")
 
   await channel.assertQueue(QUEUES.OBJ)
-  await channel.assertQueue(QUEUES.DLX)
-  await channel.assertQueue(QUEUES.DEL, {
+  await channel.assertQueue(QUEUES.OBJDLX)
+  await channel.assertQueue(QUEUES.OBJDEL, {
     durable: true,
     arguments: {
       'x-message-ttl': DELAY,
@@ -55,9 +57,9 @@ async function buildQueues(channel: Channel) {
   })
 
   // Cola dead-letter 
-  await channel.bindQueue(QUEUES.DLX, EXCHANGES.DLX, "sim.objenious.#")
+  await channel.bindQueue(QUEUES.OBJDLX, EXCHANGES.DLX, "sim.objenious.#")
   // Cola delay
-  await channel.bindQueue(QUEUES.DEL, EXCHANGES.DEL, BASE_OBENIOUS_KEY)
+  await channel.bindQueue(QUEUES.OBJDEL, EXCHANGES.DEL, BASE_OBENIOUS_KEY)
   // Cola objenious -> main exchange
   await channel.bindQueue(QUEUES.OBJ, EXCHANGES.MAIN, BASE_OBENIOUS_KEY)
 

packages/sim-consumidor-objenious/config/httpClient.config.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js"
-import { JWTService } from "../aplication/JWT.service.js"
 import { env } from "./env/index.js"
+import { jwtService } from "./jwtService.config.js"
 
 const OBJ_BASE_URL = env.OBJ_BASE_URL
 
@@ -9,5 +9,5 @@ export const httpInstance = new HttpClient({
   headers: {
     "content-type": "	application/json; charset=utf-8"
   },
-  jwtManager: new JWTService()
+  jwtManager: jwtService
 })

packages/sim-consumidor-objenious/config/intranetPostgresConfig.ts

@@ -0,0 +1,20 @@
+/**
+ * Cliente de postgres para la intranet. Se usa solo porque hace falta para el 
+ * volcado de datos, si se usa en mas partes algo estás haciendo mal.
+ */
+
+import { Pool } from 'pg';
+import { PgClient } from 'sim-shared/infrastructure/PgClient.js'
+import { env } from './env/index.js';
+
+export const pgPoolIntranet = new Pool({
+  user: env.POSTGRES_USER,
+  host: env.POSTGRES_HOST,
+  database: "intranet",
+  password: env.POSTGRES_PASSWORD,
+  port: Number(env.POSTGRES_PORT) || 5432,
+});
+
+export const postgresClientIntranet = new PgClient({
+  pool: pgPoolIntranet
+}) 

packages/sim-consumidor-objenious/config/jwtService.config.ts

@@ -0,0 +1,59 @@
+import { GrantAccessRequestBody, JWTService } from "sim-shared/aplication/JWT.service.js"
+import { env } from "./env/index.js"
+import { JWTHeader } from "sim-shared/domain/JWT.js"
+
+
+const PRIVATE_KEY_PATH = env.OBJ_PEM_PATH
+
+const GET_TOKEN_URL = "https://idp.docapost.io/auth/realms/GETWAY/protocol/openid-connect/token"
+const REFRESH_TOKEN_URL = GET_TOKEN_URL
+
+const DEFAULT_BODY: GrantAccessRequestBody = {
+  grant_type: "client_credentials",
+  client_id: env.OBJ_CLIENT_ID,
+  client_assertion_type: "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
+  client_assertion: env.OBJ_CLI_ASSERTION
+}
+
+
+const DEFAULT_HEADERS = {
+  "content-type": "application/x-www-form-urlencoded"
+}
+
+const DEFAULT_HEADERS_JWT = {
+  alg: "RS256",
+  typ: "JWT",
+  kid: env.OBJ_KID,
+}
+
+const DEFAULT_DATA_JWT = {
+  sub: env.OBJ_CLIENT_ID,
+  iss: env.OBJ_CLIENT_ID,
+  aud: "https://idp.docapost.io/auth/realms/GETWAY",
+  jti: Date.now().toString(),
+
+}
+
+function addIATHeaders(authHeaders: Object) {
+  const headers = <JWTHeader>{
+    ...authHeaders,
+    sub: env.OBJ_CLIENT_ID,
+    iss: env.OBJ_CLIENT_ID,
+    aud: GET_TOKEN_URL,
+    jti: Date.now().toString(),
+    iat: Math.floor(Date.now() / 1000),
+    exp: Math.floor(Date.now() / 1000) + 5 * 60,
+  }
+  return headers
+}
+
+export const jwtService = new JWTService({
+  transformJWTHeaders: addIATHeaders,
+  defaultHeaders: DEFAULT_HEADERS,
+  defaultBody: DEFAULT_BODY,
+  defaultJWTHeaders: DEFAULT_HEADERS_JWT,
+  defaultJWTPayload: DEFAULT_DATA_JWT,
+  privateKeyPath: PRIVATE_KEY_PATH,
+  tokenUrl: GET_TOKEN_URL,
+  refreshTokenUrl: REFRESH_TOKEN_URL
+})

packages/sim-consumidor-objenious/index.ts

@@ -8,6 +8,14 @@ import { SimUseCases } from "./aplication/Sim.usecases.js"
 import { SimController } from "./aplication/Sim.controller.js"
 import { SimRouter } from "./aplication/Sim.router.js"
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js"
+import { PauseCancelTaskRepository } from "#adapters/PauseCancelTaskRepository.js"
+
+import express from "express"
+import cors from "cors"
+import assert from "node:assert";
+import { env } from "#config/env/index.js"
+import { ObjeniousLinesRepository } from "sim-shared/infrastructure/ObjeniousLinesRepository.js"
+import { postgresClientIntranet } from "#config/intranetPostgresConfig.js"
 
 async function startWorker() {
   const rmqClient = await startRMQClient()
@@ -18,21 +26,83 @@ async function startWorker() {
 
   await pgClient.checkDatabaseConnection()
 
-  const operationRepository = new ObjeniousOperationsRepository(pgClient)
+  const operationRepository = new ObjeniousOperationsRepository(
+    httpClient,
+    pgClient,
+  )
   const orderRepository = new OrderRepository(pgClient)
 
-  const simActivationController = new SimController(
-    rmqClient,
-    new SimUseCases({
-      httpClient: httpClient,
-      operationRepository: operationRepository,
-      orderRepository: orderRepository
-    })
+  const pauseRepository = new PauseCancelTaskRepository(pgClient)
+  const linesRepository = new ObjeniousLinesRepository(
+    postgresClientIntranet
   )
-  const simRouter = new SimRouter(simActivationController, rmqClient)
+
+  const simUseCases = new SimUseCases({
+    httpClient: httpClient,
+    operationRepository: operationRepository,
+    orderRepository: orderRepository,
+    pauseRepository: pauseRepository,
+    objeniousLinesRepository: linesRepository
+  })
+
+  const simController = new SimController(
+    rmqClient,
+    simUseCases
+  )
+  const simRouter = new SimRouter(simController, rmqClient)
 
   // de momento solo una cola por simplificar
   rmqClient.consume("sim.objenious", simRouter.route)
+
+  // Servidor express 
+  const port = env.PORT
+  const app = express()
+  app.use(cors())
+  app.use(express.json())
+
+  app.get("/health", async (req, res) => {
+    res.json({ ok: "true" })
+  })
+
+  // TODO: meter el template de controller con los validadores
+  app.get("/lines/:iccid/suspended-time", async (req, res) => {
+    const iccid = req.params.iccid
+    if (!iccid) {
+      res.status(400).json({ error: "iccid is required" })
+      return
+    }
+
+    const result = await simUseCases.getSuspendedTime(iccid)
+    if (result.error !== undefined) {
+      res.status(500).json({ error: result.error })
+      return
+    }
+
+    res.json(result) // {data:{...}} || {error:{...}}
+  })
+
+  /**
+    * Opciones query:
+    *  - state
+    *
+    *  Respuestas:
+    *  - OK: data: {
+    *     lines: ObjeniousLineDb[],
+    *     offset: number,
+    *     rowCount: number
+    *  }
+    *
+    *  - ERR: error: {
+    *     message: string
+    *  }
+    */
+  app.get("/lines", simController.queryLines())
+
+
+  assert.ok(port, "Puerto del servicio no definido")
+  app.listen(port, () => {
+    console.log(`[o] HTTP server listening on port ${port}`)
+  })
 }
 
 startWorker()

packages/sim-consumidor-objenious/infrastructure/PauseCancelTaskRepository.test.ts

@@ -0,0 +1,72 @@
+import { after, before, describe, it } from "node:test";
+import { CreatePauseCancelTaskDTO, PauseCancelTaskRepository } from "./PauseCancelTaskRepository.js";
+import { postgrClient } from "#config/postgreConfig.js";
+import assert from "node:assert";
+
+const testTask: CreatePauseCancelTaskDTO = {
+  iccid: "1234",
+  operation_type: "suspend",
+  activation_date: new Date(),
+  next_check: new Date(),
+  action_data: {
+    dueDate: new Date().toString(),
+    correlation_id: "12223",
+    identifier: {
+      identifiers: ["1234"],
+      identifierType: "ICCID"
+    }
+  }
+}
+
+describe("Test PauseCancelTaskRepository - DB", () => {
+
+  const createdIds: number[] = [];
+  const pauseRepo = new PauseCancelTaskRepository(postgrClient)
+
+  before(() => {
+  })
+
+  after(() => {
+  })
+
+  it("Should create a task", async () => {
+    const created = await pauseRepo.addTask(testTask)
+    assert.ok(created != undefined, "A value must be returned always")
+    assert.ok(created.error == undefined, "Should not return a error")
+    assert.ok(created.data != undefined, "Data must be returned")
+    createdIds.push(created.data.id)
+  })
+
+  it("Should update a existing task", async () => {
+    const updated = await pauseRepo.updateTask({
+      id: createdIds[0],
+      next_check: new Date()
+    })
+
+    assert.ok(updated != undefined, "A value must be returned always")
+    assert.ok(updated.error == undefined, "Should not return a error")
+    assert.ok(updated.data != undefined, "Data must be returned")
+  })
+
+  it("Should finish a existing task", async () => {
+    const finish = await pauseRepo.finishTask({
+      id: createdIds[0],
+      error: "ok"
+    })
+
+    assert.ok(finish != undefined, "A value must be returned always")
+    assert.ok(finish.error == undefined, "Should not return a error")
+    assert.ok(finish.data != undefined, "Data must be returned")
+  })
+
+  it("Should get at least 1 pending task", async () => {
+    const created = await pauseRepo.addTask(testTask)
+    const pending = await pauseRepo.getPending()
+
+    assert.ok(pending != undefined, "A value must be returned always")
+    assert.ok(pending.error == undefined, "Should not return a error")
+    assert.ok(pending.data != undefined, "Data must be returned")
+
+    console.log("--> ", pending.data[0])
+  })
+})

packages/sim-consumidor-objenious/infrastructure/PauseCancelTaskRepository.ts

@@ -0,0 +1,128 @@
+import { Result } from "sim-shared/domain/Result.js";
+import { QueryResult } from "pg";
+import { PgClient } from "sim-shared/infrastructure/PgClient.js";
+import { AxiosError } from "axios";
+import { ActionData } from "#domain/DTOs/objeniousapi.js";
+
+export type PauseCancelTask = {
+  id: number;
+  iccid: string;
+  operation_type: "suspend" | "terminate",
+  last_checked?: Date | null;
+  activation_date?: Date | null;
+  next_check?: Date | null;
+  completed_date?: Date | null;
+  error?: string | null;
+  action_data: ActionData
+}
+
+export type CreatePauseCancelTaskDTO = Pick<PauseCancelTask, "iccid" | "activation_date" | "next_check" | "operation_type" | "action_data">
+export type UpdatePauseCancelTaskDTO = Pick<PauseCancelTask, "id" | "next_check">
+export type FinishPauseCancelTaskDTO = Pick<PauseCancelTask, "id" | "error">
+
+/**
+ * Repositorio para compensar los problemas de cacelcaiones/pausas de objenious a 
+ * la hora aplicarlo sobre una linea con el billing a test.
+ */
+export class PauseCancelTaskRepository {
+  constructor(
+    private readonly pgClient: PgClient
+  ) {
+  }
+
+  /**
+  * Obtiene las siguientes que se pueden lanzar, puede haber más pero 
+  * estan pendientes
+  */
+  public async getPending(): Promise<Result<string, PauseCancelTask[]>> {
+    const sql = `
+      SELECT * FROM pause_cancel_tasks 
+      WHERE completed_date IS NULL 
+      AND (next_check <= NOW() OR next_check IS NULL)
+      ORDER BY id ASC;
+    `;
+
+    try {
+      const res: QueryResult<PauseCancelTask> = await this.pgClient.query(sql);
+      return {
+        data: res.rows
+      }
+    } catch (e) {
+      return {
+        error: (e as AxiosError).message
+      }
+    }
+  }
+
+  public async addTask(task: CreatePauseCancelTaskDTO): Promise<Result<string, PauseCancelTask>> {
+
+    const sql = `
+      INSERT INTO pause_cancel_tasks (iccid, activation_date, next_check, last_checked, operation_type, action_data)
+      VALUES ($1, $2, $3, now(), $4, $5)
+      RETURNING *;
+    `;
+    try {
+      const values = [task.iccid, task.activation_date, task.next_check, task.operation_type, JSON.stringify(task.action_data)];
+      const res: QueryResult<PauseCancelTask> = await this.pgClient.query(sql, values);
+      return {
+        data: res.rows[0]
+      }
+    } catch (e) {
+      return {
+        error: (e as AxiosError).message
+      }
+    }
+  }
+
+  /**
+  * Se ha vuelto a comprobar la tarea pero sigue en test
+  */
+  public async updateTask(updateData: UpdatePauseCancelTaskDTO): Promise<Result<string, PauseCancelTask>> {
+
+    const sql = `
+      UPDATE pause_cancel_tasks 
+      SET last_checked = now(), next_check = $1 
+      WHERE id = $2
+      RETURNING *;
+    `;
+    try {
+      const res = await this.pgClient.query<PauseCancelTask>(sql, [updateData.next_check, updateData.id]);
+      return {
+        data: res.rows[0]
+      }
+    } catch (e) {
+      return {
+        error: (e as AxiosError).message
+      }
+
+    }
+  }
+
+
+  /**
+  * La tarea ha termiando bien o mal
+  */
+  public async finishTask(finishData: FinishPauseCancelTaskDTO) {
+    const sql = `
+      UPDATE pause_cancel_tasks 
+      SET completed_date = NOW(), error = $1 
+      WHERE id = $2
+      RETURNING *;
+    `;
+
+    try {
+      const res = await this.pgClient.query(sql, [finishData.error, finishData.id]);
+      return {
+        data: res.rows[0]
+      }
+    } catch (e) {
+      return {
+        error: (e as AxiosError).message
+      }
+
+    }
+  }
+
+}
+
+export default PauseCancelTask 

packages/sim-consumidor-objenious/package.json

@@ -13,10 +13,10 @@
       "types": "./config/*.ts",
       "default": "./config/*.js"
     },
-    "#shared/*.js": {
+    "sim-shared/*.js": {
       "default": "../sim-shared/*.js"
     },
-    "#shared/*": {
+    "sim-shared/*": {
       "default": "../sim-shared/*.js"
     },
     "#adapters/*.js": {
@@ -53,7 +53,7 @@
     }
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "node --import tsx --test ./**/*.test.ts",
     "dev": "tsx watch index.ts",
     "build": "tsc --build && yarn tsc-alias -p tsconfig.json && cp .env package.json ../../dist/packages/sim-consumidor-objenious/",
     "start": "node ../../dist/packages/sim-consumidor-objenious/index.js",

packages/sim-consumidor-objenious/tsconfig.json

@@ -9,6 +9,10 @@
   ],
   "include": [
     "**/*.ts",
+    "**/*.d.ts",
     "../../packages/sim-shared/**/*.ts"
+  ],
+  "files": [
+    "index.ts"
   ]
 }

packages/sim-entrada-eventos/aplication/Order.controller.ts

@@ -1,8 +1,8 @@
 import { BodyValidator } from "sim-shared/aplication/BodyValidator.js"
 import { OrderUsecases } from "./Order.usecases.js"
 import { Request, Response } from "express"
-import { PaginationArgs } from "#domain/common.js"
 import { idValidator, uuidValidator } from "./httpValidators.js"
+import { PaginationArgs } from "sim-shared/domain/PaginationArgs.js"
 
 export class OrderController {
   private orderUseCases: OrderUsecases

packages/sim-entrada-eventos/aplication/Order.usecases.ts

@@ -1,4 +1,4 @@
-import { PaginationArgs } from "#domain/common.js";
+import { PaginationArgs } from "sim-shared/domain/PaginationArgs.js";
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
 
 

packages/sim-entrada-eventos/aplication/Sim.controller.ts

@@ -3,7 +3,7 @@ import { SimUsecases } from "./Sim.usecases.js"
 import { activationValidator, iccidValidator } from "./httpValidators.js"
 import { companyFromIccid } from "#domain/companies.js"
 import { BodyValidator } from "sim-shared/aplication/BodyValidator.js"
-import { tryCatch } from "packages/sim-shared/domain/Result.js"
+import { tryCatch } from "sim-shared/domain/Result.js"
 
 
 export class SimController {
@@ -36,7 +36,6 @@ export class SimController {
   }) {
     return async (req: Request, res: Response) => {
       const body = req.body
-
       // 1. Validacion del body
       if (args.validator != undefined) {
         const validationResult = args.validator.validate(body)
@@ -79,7 +78,7 @@ export class SimController {
             ...usecaseResult.error
           }
         }).send()
-        args.onError(body, usecaseResult.error.msg.message)
+        args.onError(body, usecaseResult.error ?? "Error indefinido")
         return 1;
       }
 
@@ -132,6 +131,21 @@ export class SimController {
     })
   }
 
+
+  public reActivation() {
+    return this.controllerGenerator<{ iccid: string, offer: string }, { iccid: string, offer: string, compañia: string }>({
+      validator: iccidValidator,
+      mapBody: (b) => {
+        const { iccid, offer } = b
+        const compañia = companyFromIccid(iccid)
+        return { iccid, compañia, offer }
+      },
+      useCase: (args) => this.simUseCases.reActivation(args),
+      onError: (d, e) => console.error("[x] Error reactivacion: ", d, e),
+      onSuccess: console.log
+    })
+  }
+
   public cancelation() {
     return this.controllerGenerator<{ iccid: string }, { iccid: string, compañia: string }>({
       validator: iccidValidator,

packages/sim-entrada-eventos/aplication/Sim.usecases.ts

@@ -1,10 +1,10 @@
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
 import { Result } from "sim-shared/domain/Result.js";
 import assert from "node:assert";
-import { EventBus } from "sim-shared/domain/EventBus.port";
-import { SimEvents } from "sim-shared/domain/SimEvents";
+import { SimEvents } from "sim-shared/domain/SimEvents.js";
 import { uuidv7 } from "uuidv7";
 import { CreateOrderDTO, OrderTracking, OrderType, OrderTypeOptions } from "sim-shared/domain/Order.js";
+import { EventBus } from "sim-shared/domain/EventBus.port.js";
 
 /**
  * Casos de uso de tarjetas sim. Garantiza que todos los metodos usan el mismo bus de mensajes
@@ -130,6 +130,36 @@ export class SimUsecases {
     }
   }
 
+  async reActivation(args: { iccid: string, compañia: string, offer: string }):
+    Promise<Result<string, { iccid: string, message_id: string, operation: "reactivate" }>> {
+    const activationEvent = <SimEvents.activation>{
+      key: `sim.${args.compañia}.reactivate`,
+      payload: {
+        iccid: args.iccid,
+        offer: args.offer
+      }
+    }
+    const activationWithId = this.addMessage_id(activationEvent)
+    console.log("[d] Reactivation ", activationWithId)
+    await this.eventBus.publish([activationWithId])
+    const createdOrder = await this.saveOrder<SimEvents.reActivation>(activationWithId)
+
+    if (createdOrder.error != undefined) {
+      console.error(createdOrder.error)
+      return {
+        error: createdOrder.error
+      }
+    }
+
+    return {
+      data: {
+        iccid: args.iccid,
+        operation: "reactivate",
+        message_id: createdOrder.data?.correlation_id
+      }
+    }
+  }
+
   async preActivation(args: { iccid: string, compañia: string }):
     Promise<Result<string, { iccid: string, message_id: string, operation: "preactivation" }>> {
 
@@ -174,8 +204,10 @@ export class SimUsecases {
 
     const cancelationWithId = this.addMessage_id(cancelationEvent)
     console.log("[d] Cancelation ", cancelationWithId)
+
     await this.eventBus.publish([cancelationWithId])
     const savedOrder = await this.saveOrder(cancelationWithId)
+
     if (savedOrder.error != undefined) {
       console.error(savedOrder.error)
       return {
@@ -198,18 +230,19 @@ export class SimUsecases {
    * alias de bloquear / suspender en objenious
    */
   async pause(args: { iccid: string, compañia: string }):
-    Promise<Result<string, { iccid: string, message_id: string, operation: "cancelation" }>> {
+    Promise<Result<string, { iccid: string, message_id: string, operation: "pause" }>> {
     const pauseEvent = <SimEvents.pause>{
       key: `sim.${args.compañia}.pause`,
       payload: {
         iccid: args.iccid
       }
     }
+
     const pauseWithId = this.addMessage_id(pauseEvent)
     console.log("[d] Pause", pauseWithId)
     await this.eventBus.publish([pauseWithId])
-    await this.saveOrder(pauseWithId)
-    const savedOrder = await this.saveOrder(pauseWithId)
+    //await this.saveOrder(pauseWithId)
+    const savedOrder = await this.saveOrder<SimEvents.pause>(pauseWithId)
 
     if (savedOrder.error != undefined) {
       console.error(savedOrder.error)
@@ -222,7 +255,7 @@ export class SimUsecases {
       data: {
         iccid: args.iccid,
         message_id: savedOrder.data.correlation_id,
-        operation: "cancelation"
+        operation: "pause"
       }
     }
   }

packages/sim-entrada-eventos/config/env/index.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 
 
 loadEnvFile(path.join("../../.env")) // Global
+//loadEnvFile(path.join("./.env")) // Global
 
 export const env = {
   ENVIRONMENT: process.env.ENVIORMENT,
@@ -22,4 +23,7 @@ export const env = {
   RABBITMQ_SECURE: process.env.RABBITMQ_SECURE,
   RABBITMQ_RETRY_INTERVAL: process.env.RABBITMQ_INTERVAL,
   RABBITMQ_VHOST: String(process.env.RABBITMQ_VHOST),
+  CONNECTIONS_URL: String(process.env.CONNECTIONS_URL),
+  OBJENIOUS_CONSUMER_URL: process.env.OBJENIOUS_CONSUMER_URL,
+  NOS_CONSUMER_URL: process.env.NOS_CONSUMER_URL,
 };

packages/sim-entrada-eventos/config/eventBusConfig.ts

@@ -18,7 +18,10 @@ export const rmqConnOptions = <RMQConnectionParams>{
 }
 
 export const rabbitmqEventBus = new RabbitMQEventBus({
-  connectionParams: rmqConnOptions
+  connectionParams: rmqConnOptions,
+  // La entrada de eventos no tiene que definir exchanges de dlx o delay pero es obligatorio
+  delayedExchange: "-",
+  dlxExchange: "-"
 })
 
 export async function startRMQClient() {

packages/sim-entrada-eventos/domain/common.ts

@@ -1,6 +0,0 @@
-
-export type PaginationArgs = {
-  limit?: number,
-  offset?: number,
-  start?: number
-}

packages/sim-entrada-eventos/index.ts

@@ -1,9 +1,12 @@
 import express from "express"
 import cors from 'cors';
+import path from 'path';
 import { simRoutes } from "./infrastructure/simRoutes.http.js"
 import { rabbitmqEventBus } from '#config/eventBusConfig.js';
 import { env } from "#config/env/index.js"
 import { orderRoutes } from "#adapters/orderRoutes.http.js";
+import { connectionsRoutes } from "#adapters/simconnectionsRoutes.js";
+import { franceRoutes } from "#adapters/franceRoutes.http.js";
 
 const PORT = env.API_PORT
 const HOSTNAME = "0.0.0.0"
@@ -17,7 +20,6 @@ rabbitmqEventBus.connect()
     console.error("[!] El cliente RMQ no se ha podido iniciar", e)
   })
 
-
 // Middleware
 app.use(cors());
 
@@ -25,8 +27,14 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
 app.use("/sim", simRoutes)
+app.use("/simconnections", connectionsRoutes)
 app.use("/orders", orderRoutes)
 
+app.use("/docs", express.static(path.join(process.cwd(), '../../docs')))
+
+// Rutas especificas para casos especiales como el tiempo de suspension de francia
+app.use("/france", franceRoutes)
+
 app.get("/health", (req, res) => {
   res.status(200).json({ status: "ok" })
 })
@@ -34,4 +42,5 @@ app.get("/health", (req, res) => {
 app.listen(PORT, HOSTNAME, () => {
   console.log("[o] Servidor iniciado en el puerto %d", PORT)
 })
+
 export default {}

packages/sim-entrada-eventos/infrastructure/franceRoutes.http.ts

@@ -0,0 +1,33 @@
+import { Router, Request } from "express"
+import { ClientRequest, } from "http"
+import { createProxyMiddleware } from "http-proxy-middleware"
+import { env } from "#config/env/index.js"
+import assert from "node:assert"
+
+const franceRoutes = Router()
+
+const FRANCE_URL = env.OBJENIOUS_CONSUMER_URL
+assert.ok(FRANCE_URL, "No se ha definido una URL para el servicio consumidor de Francia")
+
+franceRoutes.use("", createProxyMiddleware({
+  target: FRANCE_URL,
+  changeOrigin: true,
+  pathRewrite: {
+    '^/france/*': '/'
+  },
+
+  on: {
+    proxyReq: (proxyReq: ClientRequest, req: Request) => {
+      /* Debug de las peticiones */
+      const protocol = req.protocol;
+      const host = req.get('host');
+      const originalFullUrl = `${protocol}://${host}${req.originalUrl}`;
+      const destinationFullUrl = `${FRANCE_URL}${proxyReq.path}`;
+      //console.log(`[Proxy Req]: ${req.method} ${req.url} -> ${proxyReq.path}`);
+    }
+  }
+}
+))
+
+//orderRoutes.get("/:iccid/suspended-time",)
+export { franceRoutes }

packages/sim-entrada-eventos/infrastructure/simRoutes.http.ts

@@ -1,4 +1,4 @@
-import { rabbitmqEventBus } from '#config/eventBusConfig.js';
+import { rabbitmqEventBus } from '../config/eventBusConfig.js';
 import { SimUsecases } from '../aplication/Sim.usecases.js';
 import { SimController } from '../aplication/Sim.controller.js';
 import { Router } from 'express';
@@ -23,6 +23,7 @@ simRoutes.get("/status", () => { })
 simRoutes.post("/save", simController.save())
 
 simRoutes.post("/activate", simController.activation())
+simRoutes.post("/reActivate", simController.reActivation())
 
 simRoutes.post("/preActivate", simController.preactivation())
 
@@ -35,4 +36,5 @@ simRoutes.post("/test", simController.test())
 // Proceso especifico de ALAI para liberar sims canceladas
 simRoutes.post("/free", simController.free())
 
+
 export { simRoutes }

packages/sim-entrada-eventos/infrastructure/simconnectionsRoutes.ts

@@ -0,0 +1,87 @@
+import { env } from "#config/env/index.js"
+import { Router } from "express"
+import { ClientRequest, IncomingMessage } from "http"
+import { createProxyMiddleware } from "http-proxy-middleware"
+import { Request } from "express"
+
+export const connectionsRoutes = Router()
+
+const CONNECTIONS_URL = env.CONNECTIONS_URL// TODO: Meter al ENV 
+//const CONNECTIONS_URL = "http://sf-nfc-server.savefamilygps.net"
+
+console.log("CONNURL: ", CONNECTIONS_URL)
+
+connectionsRoutes.use("", createProxyMiddleware({
+  target: CONNECTIONS_URL,
+  changeOrigin: true,
+  pathRewrite: {
+    '^/': "/simconnections/"
+  },
+  on: {
+    proxyReq: (proxyReq: ClientRequest, req: Request) => {
+      const protocol = req.protocol;
+      const host = req.get('host');
+      const originalFullUrl = `${protocol}://${host}${req.originalUrl}`;
+      const destinationFullUrl = `${CONNECTIONS_URL}${proxyReq.path}`;
+      /*
+      constnsole.log('──────────────────────────────────────────────────');
+      console.log(`[PROXY_DEBUG]`);
+      console.log(`  ENTRADA: ${originalFullUrl}`);
+      console.log(`  MÉTODO : ${req.method}`);
+      console.log(`  DESTINO: ${destinationFullUrl}`);
+      console.log('──────────────────────────────────────────────────');
+      */
+      console.log(`[Proxy Req]: ${req.method} ${req.url} -> ${proxyReq.path}`);
+    },
+    proxyRes: (proxyRes, req, res) => {
+      console.log(`[Proxy Res] Status: ${proxyRes.statusCode} desde ${req.url}`);
+    },
+    error: (err, req, res) => {
+      console.error('[Proxy Error]:', err);
+
+      // Validamos que 'res' tenga el método 'status' (típico de Express Response)
+      if ('status' in res) {
+        //@ts-ignore
+        res.status(500).json({ message: 'Error interno en el Gateway' });
+      }
+    },
+  }
+}))
+
+
+
+// Rutas
+/**
+connectionsRoutes.post('/simconnections/alai/preactivate',);
+connectionsRoutes.get('/simconnections/alai/pause',);
+connectionsRoutes.post('/simconnections/alai/terminate',);
+connectionsRoutes.get('/simconnections/alai/pauseByPhone',);
+connectionsRoutes.get('/simconnections/alai/active',);
+connectionsRoutes.get('/simconnections/alai/change_orderid',);
+connectionsRoutes.get('/simconnections/alai/select',);
+connectionsRoutes.get('/simconnections/alai/select-iccid',);
+connectionsRoutes.get('/simconnections/alai/selectFromDb',);
+connectionsRoutes.get('/simconnections/alai/selectPage',);
+connectionsRoutes.post('/simconnections/alai/schedulePause',);
+connectionsRoutes.get('/simconnections/shopify/getbyWP',);
+connectionsRoutes.get('/simconnections/shopify/getbyWPS',);
+
+///
+
+connectionsRoutes.get('/simconnections/sim/associate',);
+connectionsRoutes.post('/simconnections/sim/search',);
+connectionsRoutes.post('/simconnections/sim/historic',);
+connectionsRoutes.post('/simconnections/sim/update',);
+
+///
+
+connectionsRoutes.post('/simconnections/nos/activate',);
+connectionsRoutes.get('/simconnections/nos/select',);
+connectionsRoutes.get('/simconnections/nos/selectPage',);
+
+//Unificación
+connectionsRoutes.post('/simconnections/sim/active',); // True false
+connectionsRoutes.patch('/simconnections/sim/pause',);
+connectionsRoutes.get('/simconnections/sim/select',);
+connectionsRoutes.get('/simconnections/sim/select-phone',);
+**/

packages/sim-entrada-eventos/package.json

@@ -53,6 +53,7 @@
     "cors": "*",
     "dotenv": "*",
     "express": "*",
+    "http-proxy-middleware": "^3.0.5",
     "sim-shared": "sim-shared:*",
     "typescript": "*"
   },

packages/sim-entrada-eventos/tsconfig.json

@@ -9,6 +9,7 @@
   ],
   "include": [
     "**/*.ts",
+    "**/*.d.ts",
     "../../packages/sim-shared/**/*.ts"
   ],
   "files": [

packages/sim-objenious-cron/.env

@@ -7,6 +7,6 @@ OBJ_KID=xNfbMiyL1ORXGP8lElhcv8nVaG3EJKye4Lc1YoN3I1E
 OBJ_BASE_URL=https://api-getway.objenious.com/ws
 # OBJ_BASE_URL=https://api-getway.objenious.com/ws/test
 
-# NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"
-NOTIFICATION_URL="localhost"
+NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"
+# NOTIFICATION_URL="localhost"
 SIM_ACTIVATION_API_KEY=9e48c4ac-1ab0-4397-b3f3-6c239200dfe6

packages/sim-objenious-cron/config/env/index.ts

@@ -31,15 +31,15 @@ export const env = {
   OBJ_KID: String(process.env.OBJ_KID),
   OBJ_BASE_URL: String(process.env.OBJ_BASE_URL),
 
-  NOTIFICATION_URL: String(process.env.NOTIFICATION_URL),
-  SIM_ACTIVATION_API_KEY: String(process.env.SIM_ACTIVATION_API_KEY)
+  NOTIFICATION_URL: String(process.env.NOTIFICATION_URL ?? ""),
+  SIM_ACTIVATION_API_KEY: String(process.env.SIM_ACTIVATION_API_KEY ?? "")
 };
 
 // assert las partes criticas
 assert(env.RABBITMQ_PASSWORD != undefined)
 assert(env.RABBITMQ_USER != undefined)
-assert(env.SIM_ACTIVATION_API_KEY != undefined)
-assert(env.NOTIFICATION_URL != undefined)
+assert(env.SIM_ACTIVATION_API_KEY != "")
+assert(env.NOTIFICATION_URL != "")
 
 if (env.ENVIRONMENT == "production") {
   assert(env.RABBITMQ_PASSWORD != "guest")

packages/sim-objenious-cron/config/httpClient.config.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js"
 import { env } from "./env/index.js"
-import { JWTService } from "packages/sim-consumidor-objenious/aplication/JWT.service.js"
+import { jwtService } from "./jwtService.config.js"
+
 
 const OBJ_BASE_URL = env.OBJ_BASE_URL
 
@@ -9,5 +10,5 @@ export const httpInstance = new HttpClient({
   headers: {
     "content-type": "	application/json; charset=utf-8"
   },
-  jwtManager: new JWTService()
+  jwtManager: jwtService
 })

packages/sim-objenious-cron/config/intranetPostgresConfig.ts

@@ -0,0 +1,20 @@
+/**
+ * Cliente de postgres para la intranet. Se usa solo porque hace falta para el 
+ * volcado de datos, si se usa en mas partes algo estás haciendo mal.
+ */
+
+import { Pool } from 'pg';
+import { PgClient } from 'sim-shared/infrastructure/PgClient.js'
+import { env } from './env/index.js';
+
+export const pgPoolIntranet = new Pool({
+  user: env.POSTGRES_USER,
+  host: env.POSTGRES_HOST,
+  database: "intranet",
+  password: env.POSTGRES_PASSWORD,
+  port: Number(env.POSTGRES_PORT) || 5432,
+});
+
+export const postgresClientIntranet = new PgClient({
+  pool: pgPoolIntranet
+}) 

packages/sim-objenious-cron/config/jwtService.config.ts

@@ -0,0 +1,59 @@
+import { GrantAccessRequestBody, JWTService } from "sim-shared/aplication/JWT.service.js"
+import { env } from "./env/index.js"
+import { JWTHeader } from "sim-shared/domain/JWT.js"
+
+
+const PRIVATE_KEY_PATH = env.OBJ_PEM_PATH
+
+const GET_TOKEN_URL = "https://idp.docapost.io/auth/realms/GETWAY/protocol/openid-connect/token"
+const REFRESH_TOKEN_URL = GET_TOKEN_URL
+
+const DEFAULT_BODY: GrantAccessRequestBody = {
+  grant_type: "client_credentials",
+  client_id: env.OBJ_CLIENT_ID,
+  client_assertion_type: "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
+  client_assertion: env.OBJ_CLI_ASSERTION
+}
+
+
+const DEFAULT_HEADERS = {
+  "content-type": "application/x-www-form-urlencoded"
+}
+
+const DEFAULT_HEADERS_JWT = {
+  alg: "RS256",
+  typ: "JWT",
+  kid: env.OBJ_KID,
+}
+
+const DEFAULT_DATA_JWT = {
+  sub: env.OBJ_CLIENT_ID,
+  iss: env.OBJ_CLIENT_ID,
+  aud: "https://idp.docapost.io/auth/realms/GETWAY",
+  jti: Date.now().toString(),
+
+}
+
+function addIATHeaders(authHeaders: Object) {
+  const headers = <JWTHeader>{
+    ...authHeaders,
+    sub: env.OBJ_CLIENT_ID,
+    iss: env.OBJ_CLIENT_ID,
+    aud: GET_TOKEN_URL,
+    jti: Date.now().toString(),
+    iat: Math.floor(Date.now() / 1000),
+    exp: Math.floor(Date.now() / 1000) + 5 * 60,
+  }
+  return headers
+}
+
+export const jwtService = new JWTService({
+  transformJWTHeaders: addIATHeaders,
+  defaultHeaders: DEFAULT_HEADERS,
+  defaultBody: DEFAULT_BODY,
+  defaultJWTHeaders: DEFAULT_HEADERS_JWT,
+  defaultJWTPayload: DEFAULT_DATA_JWT,
+  privateKeyPath: PRIVATE_KEY_PATH,
+  tokenUrl: GET_TOKEN_URL,
+  refreshTokenUrl: REFRESH_TOKEN_URL
+})

packages/sim-objenious-cron/index.ts

@@ -5,6 +5,12 @@ import { httpInstance } from "./config/httpClient.config.js"
 import { CheckObjeniousRequests } from "./tasks/check_objenious_request.js"
 import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js"
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js"
+import { TaskVolcadoLineas } from "./tasks/volcado_lineas.js"
+import { ObjeniousLinesRepository } from "sim-shared/infrastructure/ObjeniousLinesRepository.js"
+import { postgresClientIntranet } from "./config/intranetPostgresConfig.js"
+import { PauseCancelTaskRepository } from "sim-consumidor-objenious/infrastructure/PauseCancelTaskRepository.js"
+import { PauseTerminateTask } from "./tasks/check_pause_terminate.js"
+import { SimUseCases } from "sim-consumidor-objenious/aplication/Sim.usecases.js"
 
 async function startCron() {
   const commonSettings = {
@@ -14,10 +20,16 @@ async function startCron() {
 
   const httpClient = httpInstance
   const pgClient = new PgClient({ pool: pgPool })
+
+  console.log("[i] Comprobando conexion con la BDD ")
   await pgClient.checkDatabaseConnection()
-  await pgClient.checkDatabaseConnection()
-  const operationRepository = new ObjeniousOperationsRepository(pgClient)
+
+  const operationRepository = new ObjeniousOperationsRepository(
+    httpClient,
+    pgClient,
+  )
   const orderRepository = new OrderRepository(pgClient)
+  const objeniousLineRepository = new ObjeniousLinesRepository(postgresClientIntranet)
 
   const objTask = new CheckObjeniousRequests(
     operationRepository,
@@ -25,23 +37,58 @@ async function startCron() {
     httpClient,
   )
 
-  await objTask.getPendingOperations()
+  const objeniosRepo = new ObjeniousOperationsRepository(
+    httpClient,
+    pgClient
+  )
 
-  const interval = setInterval(async () => {
-    console.log("Updating...")
-    await objTask.getPendingOperations()
-    console.log("Update finished")
-  }, 10 * 60 * 1000)
-  /*
-  const task = cron.createTask("* * * * *", async () => {
-  }
-    , {
-      ...commonSettings,
-      name: "Test"
-    })
-*/
+  const volcadoLineasTask = new TaskVolcadoLineas(
+    objeniousLineRepository,
+    objeniosRepo
+  )
+
+  const pauseRepo = new PauseCancelTaskRepository(pgClient)
+  const simUsecases = new SimUseCases({
+    httpClient: httpClient,
+    operationRepository: operationRepository,
+    orderRepository: orderRepository,
+    pauseRepository: pauseRepo,
+    objeniousLinesRepository: objeniousLineRepository
+  })
+
+  const pauseTask = new PauseTerminateTask(
+    objeniosRepo,
+    pauseRepo,
+    simUsecases,
+    orderRepository
+  )
 
   //await objTask.getPendingOperations()
+  const PERIODO_PETICIONES = 10 * 60 * 1000
+  const interval = setInterval(async () => {
+    try {
+      await objTask.getPendingOperations()
+    } catch (e) {
+      console.error("[x] Error de actualizacion de las lineas ")
+    }
+  }, PERIODO_PETICIONES)
+
+  const PERIODO_VOLCADO = 60 * 60 * 1000
+  //await volcadoLineasTask.loadLines()
+  const volcadoInterval = setInterval(async () => {
+    try {
+      await volcadoLineasTask.loadLines()
+    } catch (e) {
+      console.error("[x] Volcado de lineas de Objenious Fallido", e)
+    }
+  }, PERIODO_VOLCADO)
+
+  // await pauseTask.run()
+  const PERIODO_CANCELACIONES = 60 * 60 * 1000;
+  const clacelacionesInterval = setInterval(async () => {
+    await pauseTask.run()
+  }, PERIODO_CANCELACIONES)
+
 
 }
 

packages/sim-objenious-cron/package.json

@@ -5,20 +5,6 @@
   "description": "",
   "main": "index.ts",
   "imports": {
-    "#config/*.js": {
-      "types": "./config/*.ts",
-      "default": "./config/*.js"
-    },
-    "#config/*": {
-      "types": "./config/*.ts",
-      "default": "./config/*.js"
-    },
-    "#shared/*.js": {
-      "default": "../sim-shared/*.js"
-    },
-    "#shared/*": {
-      "default": "../sim-shared/*.js"
-    },
     "#adapters/*.js": {
       "types": "./infrastructure/*.ts",
       "default": "./infrastructure/*.js"
@@ -45,8 +31,8 @@
     }
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc --build && tsc-alias -p tsconfig.json && cp package.json ../../dist/packages/sim-objenious-cron/",
+    "test": "node --import tsx --test ./**/*.test.ts",
+    "build": "tsc --build && tsc-alias -p tsconfig.json && cp .env package.json ../../dist/packages/sim-objenious-cron/",
     "dev": "tsx watch index.ts",
     "start": "node ../../dist/packages/sim-objenious-cron/index.js"
   },

packages/sim-objenious-cron/tasks/check_objenious_request.ts

@@ -1,12 +1,13 @@
-import { env } from "#config/env/index.js";
+import { env } from "../config/env/index.js";
 import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
 import axios from "axios";
 import { IOperationsRepository, Objenious, ObjeniousOperation, ObjeniousOperationChange, StatusEnum } from "sim-shared/domain/operationsRepository.port.js";
 import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js";
+import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js";
 
 export class CheckObjeniousRequests {
   constructor(
-    private readonly operationsRepository: IOperationsRepository,
+    private readonly operationsRepository: ObjeniousOperationsRepository,
     private readonly orderRepository: OrderRepository,
     private readonly httpClient: HttpClient
   ) {
@@ -16,6 +17,7 @@ export class CheckObjeniousRequests {
    * TODO: meter a una funcion a parte task con los 3 pasos
    */
   public async getPendingOperations() {
+    console.log("[i] Inicio revision de peticiones")
     // 1. Se obtienen todas las operaciones pendientes de la BDD 
     const pendingOperations = await this.operationsRepository.getPendingOperations()
 
@@ -35,6 +37,11 @@ export class CheckObjeniousRequests {
     // Todas las validas
     const operacionesValidas = pendingOperations.data
       .filter((e) => e.request_id != undefined)
+      .filter((e) => e.operation != "terminate" && e.operation != "suspend")
+
+    // Filtrar suspension / terminacion
+
+
     // Validas sin MassId
     const solicitarMassId = operacionesValidas
       .filter((e) => e.mass_action_id == undefined)
@@ -49,11 +56,14 @@ export class CheckObjeniousRequests {
 
     console.log("[cron] Solicitando status para", merged.map(e => e.id))
     const result = await this.getMassActionsStatus(merged)
+
+    console.log("[o] Revisión de eventos completa")
   }
 
   /**
    * Para una lista de operaciones **con mass_action_id** se comprueba si han tenido alguna actualizacion
    * Devuelve el numero de operaciones comprobadas.
+   * TODO: Esto va en un repositorio
    */
   private async getMassActionsStatus(requestList: ObjeniousOperation[]) {
     if (requestList.length == 0) return 0;
@@ -119,9 +129,6 @@ export class CheckObjeniousRequests {
 
         if (uorStatus == "finished") {
           console.log(" ****> Status", uorStatus)
-          if (uorStatus != "finished") {
-            console.error("!!! Notificando estado no finished")
-          }
           const targetIccids = originalAction.iccids
           const lineData = await this.getLineData(targetIccids)
           console.log("[i] lineData", lineData.content[0])
@@ -136,7 +143,7 @@ export class CheckObjeniousRequests {
               })
           }
 
-          if (originalAction.operation == "activation") {
+          if (originalAction.operation == "activate") {
             this.notifyFinalization({
               ...originalAction,
               msisdn
@@ -215,7 +222,7 @@ export class CheckObjeniousRequests {
     const PATH = "/actions/requests/"
     const operationsList = structuredClone(requestList)
 
-
+    // TODO: El for es gigantesco hay que simplificar partes
     for (const request of operationsList) {
       if (request.id == undefined) continue;
 
@@ -228,13 +235,50 @@ export class CheckObjeniousRequests {
       try {
         res = await req
       } catch (e) {
-        console.error("Error comprobando el estado de ", request, e)
-        //todo actualizar el estado para incluir el error
+        console.error("[x] Error comprobando el estado de ", request, e)
+        continue;
+      }
+
+      // 2. Casos de error o id no generada 
+      if (res.data.massActionIds.length == 0) {
+        // Si no hay es que *puede* que haya un problema o no se ha generado todavia
+        const reports = res.data.actionRequestReports
+        // Se entiende que no hay report ni id = está a la espera
+        if (reports.length == 0) continue;
+
+        // ! Hay minimo un report -> se considera error y se para
+        const updateData: ObjeniousOperationChange = {
+          operation_id: request.id,
+          new_status: "error",
+          error: JSON.stringify(reports[0].actionRequestReportDataDTOs)
+        }
+
+        const updateRes = await this.operationsRepository.updateOperation(updateData)
+        if (updateRes.error != undefined) {
+          console.error("[x] Error actualizando el estado de la operacion", updateData.error)
+        }
+
+        if (request.correlation_id != undefined) {
+          this.orderRepository.errorOrder({
+            correlation_id: request.correlation_id,
+            status: "failed",
+            error: "MassId no obtenida",
+            reason: "MassId no obtenida",
+            stackTrace: JSON.stringify(reports[0].actionRequestReportDataDTOs)
+          }).then(e => {
+            if (e.error != undefined) {
+              console.error("[x] Error actualizando el estado del Order con correlation_id: ", request.correlation_id)
+              console.error(e.error)
+            }
+          }).catch(e => {
+            console.error("[x] Error actualizando el estado del Order con correlation_id: ", request.correlation_id)
+          })
+        }
         continue;
       }
 
-      // 2. Modificacion del massId si ha habido un cambio
       const massActionId = res.data.massActionIds[0]
+      // 3. Modificacion del massId si ha habido un cambio
       try {
         if (res.status == 200 && res.data != undefined && massActionId != undefined) {
           const updateData: ObjeniousOperationChange = {
@@ -248,7 +292,7 @@ export class CheckObjeniousRequests {
           request.mass_action_id = String(massActionId)
         }
       } catch (e) {
-        console.log("Error actualizando el estado de ", request)
+        console.log("[x] Error actualizando el estado de ", request)
         continue;
       }
     }
@@ -262,6 +306,8 @@ export class CheckObjeniousRequests {
   * al servicio que manda los mails
   */
   private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) {
+    console.log("[i] Enviando activacion a", env.NOTIFICATION_URL)
+    console.log("[i] Operation", operation)
     const req = axios.post(env.NOTIFICATION_URL, {
       ...operation,
       iccids: [operation.iccids]
@@ -270,7 +316,17 @@ export class CheckObjeniousRequests {
         "x-apikey-sim-activation": env.SIM_ACTIVATION_API_KEY
       }
     })
-    await req
+    try {
+      const res = await req
+      if (res.status != 200) {
+        console.error("[x] Error enviando el mail de confirmacion para ", operation, " status ", res.status, res.statusText)
+      }
+    } catch (e) {
+      console.error("[x] Error enviando el mail de confirmacion para ", operation)
+      console.error(e)
+    }
+
+
   }
 }
 

packages/sim-objenious-cron/tasks/check_pause_terminate.ts

@@ -0,0 +1,192 @@
+import { ObjeniousLine } from "sim-shared/domain/objeniousLine.js";
+import { PauseCancelTaskRepository } from "sim-consumidor-objenious/infrastructure/PauseCancelTaskRepository.js";
+import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js";
+import { SimUseCases } from "sim-consumidor-objenious/aplication/Sim.usecases.js";
+import { OrderRepository } from "sim-shared/infrastructure/OrderRepository.js";
+
+const logger =
+{
+  log: (...data: any[]) => console.log("[i] [TaskPauseTerminate]", ...data),
+  error: (...data: any[]) => console.error("[x] [TaskPauseTerminate] ", ...data),
+}
+
+
+export class PauseTerminateTask {
+  constructor(
+    private readonly objeniousRepo: ObjeniousOperationsRepository,
+    private readonly pauseRepo: PauseCancelTaskRepository,
+    private readonly simUsecases: SimUseCases,
+    private readonly orderRepo: OrderRepository
+  ) {
+  }
+
+  public async run() {
+    const finError = (err: any) => {
+      logger.error("Finalizado con errores proceso de comprobacion de lineas en pausa o canceladas")
+      logger.error(err)
+    }
+
+    const finExito = () => {
+      logger.log("Finalizado con exito proceso de comprobacion de lineas en pausa o canceladas")
+    }
+    try {
+      logger.log("Iniciando proceso de comprobacion de lineas en pausa o canceladas")
+
+      // 1. Se comprueba cuantas peticiones hay qye revisar
+      const peticionesRevisar = await this.pauseRepo.getPending()
+
+      if (peticionesRevisar.error != undefined) {
+        finError(peticionesRevisar.error)
+        return 1;
+      }
+
+      logger.log(`Se van a revisar ${peticionesRevisar.data?.length} peticiones`)
+      if (peticionesRevisar.data == undefined || peticionesRevisar.data.length == 0) {
+        finExito()
+        return 0;
+      }
+
+
+      // 2. Se comprueba que alguna de las lineas haya dejado de estar en estado de test
+      const iccids = peticionesRevisar.data.map(e => e.iccid)
+      const lineasActualizadas: ObjeniousLine[] = []
+
+      const lineGenerator = this.objeniousRepo.getLinesByStatusAPI({
+        iccids: iccids
+      })
+
+      let lines = await lineGenerator.next()
+
+      if (lines.value.error != undefined || lines.value.data == undefined) {
+        logger.error("Error cargando las lineas", lines.value.error)
+        finError(lines.value.error)
+        return 1;
+      } else {
+        lineasActualizadas.push(...lines.value.data)
+      }
+
+      while (!lines.done) {
+        lines = await lineGenerator.next()
+        if (lines.value.error != undefined || lines.value.data == undefined) {
+          logger.error("Error cargando las lineas", lines.value.error)
+          finError(lines.value.error)
+          return 1;
+        } else {
+          lineasActualizadas.push(...lines.value.data)
+        }
+
+      }
+
+      console.log("Cargado: ", lineasActualizadas)
+
+      // 3. Se separan las lineas que se tienen que actualizar al no ser test
+      // y las que se tienen que reencolar al ser test
+      const lineasNoTest = lineasActualizadas.filter(e => e.status.billingStatus != "TEST")
+      const lineasTest = lineasActualizadas.filter(e => e.status.billingStatus == "TEST")
+
+      // 4. Las lineas de test se reencolan
+      // El proximo reintento es en 1 dia
+      const proximoReintento = new Date()
+      proximoReintento.setDate(new Date().getDate() + 1)
+
+      // 5. Reintentos en 1 dia
+      for (const linea of lineasTest) {
+        const lineaId = peticionesRevisar.data
+          .find(e => e.iccid == linea.identifier.iccid)?.id
+
+        if (lineaId == undefined) continue; // Esto puede ser un problema si se generaliza
+
+        this.pauseRepo.updateTask({
+          id: lineaId,
+          next_check: proximoReintento
+        })
+      }
+
+      // 6. Operaciones de pausa/cancelacion definitiva
+      for (const linea of lineasNoTest) {
+        const operacion = peticionesRevisar.data
+          .find(e => e.iccid == linea.identifier.iccid)
+
+        if (operacion == undefined) continue;
+        const dueDate = new Date()
+        dueDate.setMinutes(new Date().getMinutes() + 15)
+
+        const operacionTipo = operacion.operation_type
+        const actionData = operacion.action_data
+        const correlation_id = operacion.action_data.correlation_id
+        actionData.dueDate = dueDate.toISOString()
+
+        switch (linea.status.billingStatus) {
+          case "ACTIVATED":
+            let result = null;
+
+            // Se termina el proceso aqui pero pasa a ser una operación de
+            // objenious por lo que puede fallar y quedaria registrado en 
+            // la tabla objenious_operation
+            switch (operacionTipo) {
+              case "suspend":
+                result = await this.simUsecases.suspend(actionData)()
+                console.log("SUSPENDED", result)
+                break;
+              case "terminate":
+                result = await this.simUsecases.terminate(actionData)()
+                break;
+              default:
+                break;
+            }
+
+            if (result == undefined) {
+              logger.error("Operacion desconocida", operacion)
+            } else if (result?.error != undefined) {
+              // error usecase
+              logger.error(result.error)
+              await this.pauseRepo.finishTask({
+                id: operacion.id,
+                error: result.error
+              })
+              if (correlation_id != undefined)
+                await this.orderRepo.errorOrder({
+                  correlation_id: correlation_id,
+                  status: "dlx",
+                  reason: result.error
+                })
+            } else {
+              // ok
+              await this.pauseRepo.finishTask({ id: operacion.id })
+              if (correlation_id != undefined)
+                await this.orderRepo.finishOrder({ correlation_id })
+            }
+
+            break;
+          case "CANCELED":
+            await this.pauseRepo.finishTask({
+              id: operacion.id,
+              error: "billingStatus is CANCELED"
+            })
+            if (correlation_id != undefined)
+              await this.orderRepo.finishOrder({ correlation_id })
+            break;
+          case "SUSPENDED":
+            await this.pauseRepo.finishTask({
+              id: operacion.id,
+              error: "billingStatus is SUSPENDED"
+            })
+            if (correlation_id != undefined)
+              await this.orderRepo.finishOrder({ correlation_id })
+            break;
+          case "TEST":
+          // No puede ser
+          default:
+            logger.error("billingStatus desconocido", linea.status.billingStatus)
+
+        }
+      }
+
+      finExito()
+    } catch (e) {
+      finError(e)
+    }
+
+    return 0
+  }
+}

packages/sim-objenious-cron/tasks/volcado_lineas.ts

@@ -0,0 +1,54 @@
+import { lineToCreateLineDto, ObjeniousLine } from "sim-shared/domain/objeniousLine.js";
+import { ObjeniousLinesRepository } from "sim-shared/infrastructure/ObjeniousLinesRepository.js";
+import { ObjeniousOperationsRepository } from "sim-shared/infrastructure/ObjeniousOperationRepository.js";
+
+export class TaskVolcadoLineas {
+  constructor(
+    private readonly linesRepository: ObjeniousLinesRepository,
+    private readonly objeniousRepository: ObjeniousOperationsRepository
+  ) {
+  }
+
+
+  private async saveLines(lines: ObjeniousLine[]) {
+    const linesToCreate = lines.map(lineToCreateLineDto)
+    let created: number[] = []
+
+
+    for (const line of linesToCreate) {
+      // Si es lento pasar a Promise.all
+      const res = await this.linesRepository.insertOrUpdate(line)
+      if (res?.id != undefined)
+        created.push(res.id)
+    }
+  }
+
+  public async loadLines() {
+    console.log("[i] Iniciando task de volcado de lineas de Objenious")
+    // Carga todas las lineas en memoria, hay que comprobar que no se gaste demasiada
+
+    const linesIterator = this.objeniousRepository.getLinesByStatusAPI({
+      pageSize: 100
+    })
+    let lines = await linesIterator.next()
+
+    if (lines.value.error != undefined || lines.value.data == undefined) {
+      console.error("[x] Error cargando las lineas a volcar", lines.value.error)
+      return;
+    }
+
+    await this.saveLines(lines.value.data)
+
+    while (!lines.done) {
+      lines = await linesIterator.next()
+      if (lines.value.error != undefined || lines.value.data == undefined) {
+        console.error("[x] Error cargando las lineas a volcar", lines.value.error)
+        return;
+      }
+      await this.saveLines(lines.value.data)
+    }
+
+    console.log("[i] Terminado task de volcado de lineas de Objenious")
+  }
+
+}

packages/sim-objenious-cron/tsconfig.json

@@ -9,6 +9,7 @@
   ],
   "include": [
     "**/*.ts",
+    "**/*.d.ts",
     "../../packages/sim-shared/**/*.ts",
     "../../packages/sim-consumidor-objenious/**/*.ts"
   ]

packages/sim-shared/aplication/JWT.service.test.ts

@@ -1,16 +1,16 @@
 import { test, describe } from "vitest"
-import { JWTService } from "./JWT.service.js"
+import { jwtService } from "../config/jwtService.config.js"
 
 describe("Tokens Objenious", () => {
-  const jwtService = new JWTService()
+  const jwt = jwtService
 
   test("Solicicitud normal de auth", async () => {
-    const token = await jwtService.getAccessToken()
+    const token = await jwt.getAccessToken()
     console.log("acceso objenious", token)
   }),
 
     test("Solicicitud de refresh de auth", async () => {
-      const token = await jwtService.tryRefreshToken()
+      const token = await jwt.tryRefreshToken()
       console.log("acceso refresh objenious", token)
     })
 })

packages/sim-shared/aplication/JWT.service.ts

@@ -4,24 +4,24 @@
  * el cliente HTTP
  */
 
-import { env } from "#config/env/index.js";
 import fs from "fs"
 
 import {
   JWTToken,
   JWTHeader,
-  IJWTService
+  IJWTService,
+  JWTPayload
 } from "sim-shared/domain/JWT.js"
 import axios, { AxiosError } from "axios";
 
-type GrantAccessRequestBody = {
+export type GrantAccessRequestBody = {
   grant_type: string,
   client_id: string,
   client_assertion_type: string,
   client_assertion: string
 }
 
-type TokensRequestResponse = {
+export type TokensRequestResponse = {
   "access_token": string,
   "expires_in": number,
   "refresh_token": string
@@ -32,41 +32,6 @@ type TokensRequestResponse = {
   "scope": string
 }
 
-
-const PRIVATE_KEY_PATH = env.OBJ_PEM_PATH
-
-const GET_TOKEN_URL = "https://idp.docapost.io/auth/realms/GETWAY/protocol/openid-connect/token"
-const REFRESH_TOKEN_URL = GET_TOKEN_URL
-
-const DEFAULT_BODY: GrantAccessRequestBody = {
-  grant_type: "client_credentials",
-  client_id: env.OBJ_CLIENT_ID,
-  client_assertion_type: "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
-  client_assertion: env.OBJ_CLI_ASSERTION
-}
-
-const REFRESH_BODY = {
-  ...DEFAULT_BODY,
-  grant_type: "refresh_token",
-}
-
-const DEFAULT_HEADERS = {
-  "content-type": "application/x-www-form-urlencoded"
-}
-
-function addIATHeaders(authHeaders: Object) {
-  const headers = <JWTHeader>{
-    ...authHeaders,
-    sub: env.OBJ_CLIENT_ID,
-    iss: env.OBJ_CLIENT_ID,
-    aud: GET_TOKEN_URL,
-    jti: Date.now().toString(),
-    iat: Math.floor(Date.now() / 1000),
-    exp: Math.floor(Date.now() / 1000) + 5 * 60,
-  }
-  return headers
-}
-
 export type ObjeniousTokenBody = any
 
 /**
@@ -82,27 +47,54 @@ export class JWTService implements IJWTService<ObjeniousTokenBody> {
   public authToken: JWTToken<ObjeniousTokenBody> | undefined;
   private refreshToken?: JWTToken<ObjeniousTokenBody> | undefined;
 
-  constructor(args?: {
+  // http
+  private transformHeaders?: (_: Object) => JWTHeader;
+  private defaultHttpHeaders: Record<string, string>;
+  private defaultBody: Record<string, string>;
+
+  // jwt
+  private defaultJWTHeaders: JWTHeader;
+  private defaultJWTPayload: JWTPayload<any>;
+  private privateKeyPath: string;
+  private tokenUrl: string;
+  private refreshTokenUrl: string;
+
+
+  constructor(args: {
     token?: string // si se partiese de un token existente,
-    refreshToken?: string
+    refreshToken?: string,
+    transformJWTHeaders?: (_: Object) => JWTHeader,
+    defaultHeaders: Record<string, string>,
+    defaultBody: Record<string, string>,
+    defaultJWTHeaders: JWTHeader,
+    defaultJWTPayload: JWTPayload<any>,
+    privateKeyPath: string,
+    tokenUrl: string,
+    refreshTokenUrl: string
   }) {
     if (args?.token != undefined) this.authToken = new JWTToken(args.token)
     if (args?.refreshToken != undefined) this.refreshToken = new JWTToken(args.refreshToken)
+    if (args?.transformJWTHeaders != undefined) this.transformHeaders = args.transformJWTHeaders
+
+    this.defaultHttpHeaders = args.defaultHeaders;
+    this.defaultBody = args.defaultBody;
+
+    this.defaultJWTHeaders = args.defaultJWTHeaders;
+    this.defaultJWTPayload = args.defaultJWTPayload;
+    this.privateKeyPath = args.privateKeyPath;
+
+    this.tokenUrl = args.tokenUrl;
+    this.refreshTokenUrl = args.refreshTokenUrl;
   }
 
   private buildJwtBody() {
-    const jwtHeaders = {
-      alg: "RS256",
-      typ: "JWT",
-      kid: env.OBJ_KID
-    }
-    const jwtData = addIATHeaders({
-      sub: env.OBJ_CLIENT_ID,
-      iss: env.OBJ_CLIENT_ID,
-      aud: "https://idp.docapost.io/auth/realms/GETWAY",
-      jti: Date.now().toString(),
-    })
-    const key = fs.readFileSync(PRIVATE_KEY_PATH, "utf8")
+    const jwtHeaders = this.defaultJWTHeaders
+
+    const jwtData = (this.transformHeaders) ?
+      this.transformHeaders(this.defaultJWTPayload) :
+      this.defaultJWTPayload;
+
+    const key = fs.readFileSync(this.privateKeyPath, "utf8")
     const token = JWTToken.fromParts({
       header: jwtHeaders,
       payload: jwtData,
@@ -116,14 +108,16 @@ export class JWTService implements IJWTService<ObjeniousTokenBody> {
 
   public async getNewAuthToken() {
     const bodyWithtoken = {
-      ...DEFAULT_BODY,
+      ...this.defaultBody,
       client_assertion: this.buildJwtBody()
     }
 
-    const req = axios.post(GET_TOKEN_URL,
+    const headers = (this.transformHeaders) ? this.transformHeaders(this.defaultHttpHeaders) : this.defaultHttpHeaders;
+
+    const req = axios.post(this.tokenUrl,
       bodyWithtoken,
       {
-        headers: addIATHeaders(DEFAULT_HEADERS)
+        headers: headers
       }
     )
 
@@ -166,16 +160,21 @@ export class JWTService implements IJWTService<ObjeniousTokenBody> {
     if (this.refreshToken == undefined) throw new Error("El refreshToken no está definido")
     if (this.refreshToken.isExpired()) throw new Error("El refreshToken ha expirado")
 
+    const refreshBody = {
+      ...this.defaultBody,
+      grant_type: "refresh_token",
+    }
+
     const body = {
-      ...REFRESH_BODY,
+      ...refreshBody,
       client_assertion: this.buildJwtBody(),
       refresh_token: this.refreshToken.rawToken
     }
 
-    const req = axios.post(REFRESH_TOKEN_URL,
+    const req = axios.post(this.refreshTokenUrl,
       body,
       {
-        headers: DEFAULT_HEADERS
+        headers: this.defaultHttpHeaders
       }
     )
 

packages/sim-shared/config/config.test.ts

@@ -7,9 +7,12 @@
 import { env, loadEnvFile } from "node:process";
 import { Pool } from "pg";
 import { PgClient } from "../infrastructure/PgClient.js";
+import { HttpClient } from "../infrastructure/HTTPClient.js";
+import { jwtService } from "./jwtService.config.js";
 
 console.warn("[i!] Se está corriendo codigo de test")
 loadEnvFile("../../.env") // Global
+loadEnvFile("./test.env") // Local 
 
 // se hace una por servicio.
 export const pgPool = new Pool({
@@ -24,4 +27,14 @@ export const postgresClient = new PgClient({
   pool: pgPool
 })
 
+const OBJ_BASE_URL = "https://api-getway.objenious.com/ws"
+export const httpObjClient = new HttpClient({
+  baseURL: OBJ_BASE_URL,
+  headers: {
+    "content-type": "	application/json; charset=utf-8"
+  },
+  jwtManager: jwtService
+})
+
+
 console.warn(`[T] TEST DB : ${env.POSTGRES_DATABASE}@${env.POSTGRES_HOST}`)