iccid en lista

deployment/develop/docker/Dockerfile

@@ -2,19 +2,18 @@
 FROM node:22-alpine AS release
 WORKDIR /home/node/app
 
+RUN corepack enable
+
 COPY ./dist/packages ./packages
 
 COPY ./package.json ./
-RUN node -e "\
-  const p = require('./package.json'); \
-  delete p.workspaces; \
-  delete p.scripts; \
-  delete p.devDependencies; \
-  require('fs').writeFileSync('./package.json', JSON.stringify(p, null, 2));"
-RUN npm install --omit=dev
 
-RUN mkdir -p packages/node_modules && \
-    ln -sf ../sim-shared packages/node_modules/sim-shared
+# 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
 
 COPY ./entrypoint.sh ./
 RUN chmod +x entrypoint.sh

deployment/develop/docker/docker-compose.yaml

@@ -23,16 +23,32 @@ services:
       timeout: 5s
       retries: 5
     environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+      RABBITMQ_USER: ${RABBITMQ_USER}
+      RABBITMQ_PASSWORD: ${RABBITMQ_PASSWORD}
+    entrypoint: ["bash", "/usr/local/bin/docker-entrypoint-wrapper.sh"]
+    command: ["rabbitmq-server"]
     volumes:
+      - ./rabbit/docker-entrypoint-wrapper.sh:/usr/local/bin/docker-entrypoint-wrapper.sh:ro
       - ./rabbitmq_plugins/enabled_plugins:/etc/rabbitmq/enabled_plugins:ro
       - ./rabbit/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro
-      - ./rabbit/definitions.json:/etc/rabbitmq/definitions.json:ro
+      - ./rabbit/definitions.json:/etc/rabbitmq/definitions.template.json:ro
     networks:
       - internal
+      - proxy
     labels:
       - "io.portainer.accesscontrol.teams=develop"
+      - "traefik.enable=true"
+      - "traefik.http.routers.sf-sims-rabbitmq.entrypoints=web"
+      - "traefik.http.routers.sf-sims-rabbitmq.rule=Host(`sf-sims-rabbitmq.savefamilygps.net`)"
+      - "traefik.http.middlewares.sf-sims-rabbitmq-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.sf-sims-rabbitmq.middlewares=sf-sims-rabbitmq-https-redirect"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.entrypoints=websecure"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.rule=Host(`sf-sims-rabbitmq.savefamilygps.net`)"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.tls=true"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.service=sf-sims-rabbitmq"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.tls.certresolver=myresolver"
+      - "traefik.http.services.sf-sims-rabbitmq.loadbalancer.server.port=15672"
+      - "traefik.docker.network=proxy"
 
   sf-sims-api:
     container_name: sf-sims-api
@@ -48,8 +64,6 @@ services:
     depends_on:
       rabbitmq-sim-broker:
         condition: service_healthy
-      postgresql-sim:
-        condition: service_healthy
     networks:
       - savefamily
       - proxy
@@ -60,6 +74,8 @@ services:
       - ./.env:/home/node/app/.env:ro
       - ./sim-consumidor-objenious.env:/home/node/app/packages/sim-consumidor-objenious/.env:ro
       - ./sim-objenious-cron.env:/home/node/app/packages/sim-objenious-cron/.env:ro
+      - ./obj.pem:/home/node/app/packages/sim-consumidor-objenious/obj.pem:ro
+      - ./obj.pem:/home/node/app/packages/sim-objenious-cron/obj.pem:ro
     healthcheck:
       test:
         [
@@ -84,23 +100,3 @@ services:
       - "traefik.http.routers.sf-sims-secure.tls.certresolver=myresolver"
       - "traefik.http.services.sf-sims.loadbalancer.server.port=${PORT}"
       - "traefik.docker.network=proxy"
-
-  postgresql-sim:
-    image: postgres:16.1
-    env_file:
-      - ./.env
-    ports:
-      - 5432
-    volumes:
-      - ./postgres:/var/lib/postgres/data
-      - ./database/init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 5s
-      retries: 5
-      start_period: 5s
-      timeout: 5s
-    networks:
-      - internal
-    labels:
-      - "io.portainer.accesscontrol.teams=develop"

deployment/develop/docker/entrypoint.sh

@@ -2,6 +2,3 @@
 cd /home
 
 cd /home/node/app && yarn start
-# (cd /home/node/app/packages/sim-objenious-cron && node index.js) &
-# (cd /home/node/app/packages/sim-consumidor-objenious && node index.js) &
-# cd /home/node/app/packages/sim-entrada-eventos && exec node index.js

deployment/develop/jenkinsfile.groovy

@@ -22,7 +22,7 @@ pipeline {
 		}
 		stage("🧱 Building") {
 			steps {
-        sh 'rm -rf dist/'
+        		sh 'rm -rf dist/'
 				sh 'yarn run build'
 			}
 		}
@@ -50,6 +50,10 @@ pipeline {
 									cleanRemote: false,
 									execCommand: "ln -sf $BASE_REMOTE_PATH/vault/savefamily/sf-sims/sim-objenious-cron.env $APP_REMOTE_PATH/sim-objenious-cron.env"
 								),
+								sshTransfer(
+									cleanRemote: false,
+									execCommand: "ln -sf $BASE_REMOTE_PATH/vault/savefamily/sf-sims/obj.pem $APP_REMOTE_PATH/obj.pem"
+								),
 								sshTransfer(
 									cleanRemote: false,
 									remoteDirectory: "$APP_REMOTE_PATH",
@@ -65,8 +69,8 @@ pipeline {
 								sshTransfer(
 									cleanRemote: false,
 									remoteDirectory: "$APP_REMOTE_PATH",
-									sourceFiles: "deployment/rabbit/**/*",
-									removePrefix: "deployment",
+									sourceFiles: "deployment/develop/rabbit/**/*",
+									removePrefix: "deployment/develop",
 								),
 								sshTransfer(
 									cleanRemote: false,

deployment/develop/rabbit/definitions.json

@@ -0,0 +1,90 @@
+{
+	"rabbit_version": "4.2.2",
+	"rabbitmq_version": "4.2.2",
+	"product_name": "RabbitMQ",
+	"product_version": "4.2.2",
+	"users": [
+		{
+			"name": "RABBITMQ_USER_PLACEHOLDER",
+			"password": "RABBITMQ_PASSWORD_PLACEHOLDER",
+			"tags": ["administrator"]
+		}
+	],
+	"vhosts": [
+		{
+			"name": "sim-vhost"
+		}
+	],
+	"permissions": [
+		{
+			"user": "RABBITMQ_USER_PLACEHOLDER",
+			"vhost": "sim-vhost",
+			"configure": ".*",
+			"write": ".*",
+			"read": ".*"
+		}
+	],
+	"topic_permissions": [],
+	"parameters": [],
+	"global_parameters": [
+		{
+			"name": "cluster_name",
+			"value": "rabbit@a8d5c6e08439"
+		},
+		{
+			"name": "internal_cluster_id",
+			"value": "rabbitmq-cluster-id-gXeBLbsUC2W2tU0Bx_QY_w"
+		}
+	],
+	"policies": [
+		{
+			"vhost": "sim-vhost",
+			"name": "pol.sim.dlx",
+			"pattern": "sim.*",
+			"apply-to": "queues",
+			"definition": {
+				"dead-letter-exchange": "sim.dlx"
+			},
+			"priority": 7
+		}
+	],
+	"exchanges": [
+		{
+			"name": "sim.exchange",
+			"vhost": "sim-vhost",
+			"type": "topic",
+			"durable": true,
+			"auto_delete": false,
+			"internal": false,
+			"argurments": {}
+		},
+		{
+			"name": "sim.dlx",
+			"vhost": "sim-vhost",
+			"type": "topic",
+			"durable": true,
+			"auto_delete": false,
+			"internal": false,
+			"argurments": {}
+		}
+	],
+	"queues": [
+		{
+			"name": "sim.logs",
+			"vhost": "sim-vhost",
+			"durable": true,
+			"auto_delete": false,
+			"arguments": {}
+		}
+	],
+	"bindings": [
+		{
+			"source": "sim.exchange",
+			"vhost": "sim-vhost",
+			"destination": "sim.logs",
+			"destination_type": "queue",
+			"routing_key": "sim.#",
+			"arguments": {}
+		}
+	]
+}

deployment/develop/rabbit/docker-entrypoint-wrapper.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eu
+
+# Substitute env vars into definitions template before RabbitMQ starts.
+# RabbitMQ 4.x skips default user creation when definitions.json is loaded,
+# so the user must be defined in the JSON itself.
+sed \
+  -e "s|RABBITMQ_USER_PLACEHOLDER|${RABBITMQ_USER}|g" \
+  -e "s|RABBITMQ_PASSWORD_PLACEHOLDER|${RABBITMQ_PASSWORD}|g" \
+  /etc/rabbitmq/definitions.template.json > /etc/rabbitmq/definitions.json
+
+exec docker-entrypoint.sh "$@"

deployment/develop/rabbit/rabbitmq.conf

@@ -0,0 +1,4 @@
+management.load_definitions = /etc/rabbitmq/definitions.json
+
+default_vhost = sim-vhost
+default_queue_type = quorum

docs/sim-api/environments/prod.bru

@@ -0,0 +1,3 @@
+vars {
+  baseurl: https://sf-sims.savefamilygps.net
+}

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

@@ -9,8 +9,8 @@ export const env = {
   POSTGRES_HOST: process.env.POSTGRES_HOST,
   POSTGRES_DATABASE: process.env.POSTGRES_DATABASE,
   RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"),
-  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "guest"),
-  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "guest"),
+  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "test"),
+  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "test"),
   RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE ?? "/"),
   RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"),
   RABBITMQ_MODULENAME: process.env.MODULENAME,

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

@@ -12,8 +12,8 @@ export const env = {
   POSTGRES_HOST: process.env.POSTGRES_HOST,
   POSTGRES_DATABASE: process.env.POSTGRES_DATABASE,
   RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"),
-  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "guest"),
-  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "guest"),
+  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "test"),
+  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "test"),
   RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE ?? "/"),
   RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"),
   RABBITMQ_MODULENAME: process.env.MODULENAME,

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

@@ -1,7 +1,8 @@
 import { loadEnvFile } from "node:process";
 import path from "node:path";
 
-loadEnvFile(path.join(import.meta.dirname, "../../../../.env"))
+
+loadEnvFile(path.join("../../.env")) // Global
 
 export const env = {
   ENVIRONMENT: process.env.ENVIORMENT,
@@ -12,8 +13,8 @@ export const env = {
   POSTGRES_HOST: process.env.POSTGRES_HOST,
   POSTGRES_DATABASE: process.env.POSTGRES_DATABASE,
   RABBITMQ_HOST: String(process.env.RABBITMQ_HOST ?? "localhost"),
-  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "guest"),
-  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "guest"),
+  RABBITMQ_USER: String(process.env.RABBITMQ_USER ?? "test"),
+  RABBITMQ_PASSWORD: String(process.env.RABBITMQ_PASSWORD ?? "test"),
   RABBITMQ_EXCHANGE: String(process.env.RABBITMQ_EXCHANGE ?? "/"),
   RABBITMQ_PORT: parseInt(process.env.RABBITMQ_PORT ?? "5672"),
   RABBITMQ_MODULENAME: process.env.MODULENAME,

packages/sim-objenious-cron/.env

@@ -7,4 +7,4 @@ 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://api-paloma.com
+NOTIFICATION_URL="https://sf-sim-activation.savefamilygps.net/send-activation-mail"

packages/sim-objenious-cron/index.ts

@@ -22,6 +22,7 @@ async function startCron() {
     httpClient
   )
 
+  await objTask.getPendingOperations()
   const interval = setInterval(async () => {
     console.log("Updating...")
     await objTask.getPendingOperations()

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

@@ -1,4 +1,5 @@
 import { env } from "#config/env/index.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";
 
@@ -104,10 +105,11 @@ export class CheckObjeniousRequests {
         originalAction.status = uorStatus;
         originalAction.objenious_status = status;
         originalAction.last_change_date = new Date().toISOString()
+        originalAction.end_date = originalAction.last_change_date
         console.log(" ----> Status", uorStatus)
         if (uorStatus /*== "finished"*/) {
           console.log(" ****> Status", uorStatus)
-          const targetIccids = JSON.parse(originalAction.iccids || "[]") as string[]
+          const targetIccids = originalAction.iccids
           const lineData = await this.getLineData(targetIccids)
           console.log("lineData", lineData.content[0])
           const msisdn = lineData.content[0].identifier.msisdn
@@ -156,7 +158,7 @@ export class CheckObjeniousRequests {
     return res
   }
 
-  private async getLineData(iccids: string[]) {
+  private async getLineData(iccids: string) {
     const PATH = "/lines"
 
     const req = this.httpClient.client.get(PATH, {
@@ -235,9 +237,26 @@ export class CheckObjeniousRequests {
   */
   private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) {
     console.log("Notificada, ", operation)
-    const req = this.httpClient.client.post<any>(env.NOTIFICATION_URL,
-      { operation: operation }
-    )
+
+    const req = axios.post(env.NOTIFICATION_URL, {
+      ...operation,
+      iccids: [operation.iccids]
+    }, {
+      headers: {
+        "x-apikey-sim-activation": "9e48c4ac-1ab0-4397-b3f3-6c239200dfe6"
+      }
+    })
+    /*
+        const req = this.httpClient.client.post<any>("",
+          { operation: operation },
+          {
+            headers: {
+              "x-apikey-sim-activation": "9e48c4ac-1ab0-4397-b3f3-6c239200dfe6"
+            },
+            baseURL: env.NOTIFICATION_URL
+          }
+    
+        )*/
     await req
   }
 }

packages/sim-shared/infrastructure/OperationRepository.ts

@@ -14,8 +14,7 @@ export class OperationsRepository implements IOperationsRepository {
       INSERT INTO objenious_operation (operation, iccids, status, max_retry, request_id)
       VALUES ($1, $2, $3, $4, $5)
       RETURNING *`;
-    const iccids = JSON.stringify(data.iccids)
-    const values = [data.operation, iccids, data.status, data.max_retry, data.request_id];
+    const values = [data.operation, data.iccids, data.status, data.max_retry, data.request_id];
     const { rows } = await this.pgClient.query(query, values);
     return <Result<string, ObjeniousOperation>>{
       data: rows[0]