Merge branch 'main' of git.savefamilygps.net:SaveFamily/sf-sim

deployment/develop/docker/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
+cd /home
 
-(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
+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,6 +22,7 @@ pipeline {
 		}
 		stage("🧱 Building") {
 			steps {
+        sh 'rm -rf dist/'
 				sh 'yarn run build'
 			}
 		}

docs/sim-objenious/Unit action by id copy.bru

@@ -0,0 +1,33 @@
+meta {
+  name: Unit action by id copy
+  type: http
+  seq: 19
+}
+
+get {
+  url: https://api-getway.objenious.com/ws/actions/massActions/{{id}}
+  body: formUrlEncoded
+  auth: bearer
+}
+
+auth:bearer {
+  token: {{ws-access-token-partenaire}}
+}
+
+body:json {
+    {
+    "identifier": {  
+      "identifiers": ["8933201124059175967"],
+      "identifierType": "ICCID"
+    }
+    }
+}
+
+vars:pre-request {
+  id: 5192767
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

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

@@ -8,7 +8,6 @@ import { ObjeniousOperation, IOperationsRepository as OperationsRepositoryPort }
 // - Pasar a un archivo de DTOs
 // - Mucha repeticion por funcion, deberia hacer una plantilla
 
-
 export class SimUseCases {
   private readonly httpClient: HttpClient
   private readonly operationRepository: OperationsRepositoryPort
@@ -41,7 +40,7 @@ export class SimUseCases {
 
           const operation: ObjeniousOperation = {
             operation: "activate",
-            iccids: activationData.identifier.identifiers,
+            iccids: String(activationData.identifier.identifiers),
             status: "noMassID",
             request_id: response.data.requestId
           }
@@ -84,7 +83,7 @@ export class SimUseCases {
           console.log("Sim preactivada con exito", resp.data)
           const operation: ObjeniousOperation = {
             operation: "preActivate",
-            iccids: preActivateData.identifier.identifiers,
+            iccids: String(preActivateData.identifier.identifiers),
             status: "noMassID",
             request_id: resp.data.requestId
           }

packages/sim-objenious-cron/.env

@@ -6,3 +6,5 @@ OBJ_CLIENT_ID=savefamily_rest_ws
 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

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

@@ -28,7 +28,8 @@ export const env = {
   OBJ_CLI_ASSERTION: String(process.env.OBJ_CLI_ASSERTION),
   OBJ_CLIENT_ID: String(process.env.OBJ_CLIENT_ID),
   OBJ_KID: String(process.env.OBJ_KID),
-  OBJ_BASE_URL: String(process.env.OBJ_BASE_URL)
+  OBJ_BASE_URL: String(process.env.OBJ_BASE_URL),
 
+  NOTIFICATION_URL: String(process.env.NOTIFICATION_URL)
 };
 

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

@@ -1,3 +1,4 @@
+import { env } from "#config/env/index.js";
 import { IOperationsRepository, Objenious, ObjeniousOperation, ObjeniousOperationChange, StatusEnum } from "sim-shared/domain/operationsRepository.port.js";
 import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js";
 
@@ -36,14 +37,13 @@ export class CheckObjeniousRequests {
     const consultarEstado = pendingOperations.data
       .filter(e => e.mass_action_id != undefined)
 
-    console.log("validas", operacionesValidas)
-    console.log("Solicitando mass id para", solicitarMassId)
+    console.log("[cron] Solicitando mass id para", solicitarMassId.map(e => e.id))
 
     const newMassActions = await this.getMassIdFromRequest(solicitarMassId)
 
     const merged = [...newMassActions || [], ...consultarEstado]
 
-    console.log("Solicitando status para", merged)
+    console.log("[cron] Solicitando status para", merged.map(e => e.id))
 
     const result = await this.getMassActionsStatus(merged)
   }
@@ -55,16 +55,9 @@ export class CheckObjeniousRequests {
     const PATH = "/actions/massActions/"
     const updated = []
 
-    const iccids = operationsList
-      .map(e => e.iccids)
-      .flat()
-
     const mass_actions = operationsList
       .filter(e => e.mass_action_id != undefined)
 
-    const iccidSet = new Set<string>(iccids)
-    console.log("iccidSet", iccidSet)
-
     // 1. Una peticion por cada accion a comprobar
     //    Las peticiones por iccid u otro filtro tardan ~50s
     for (const originalAction of mass_actions) {
@@ -79,18 +72,18 @@ export class CheckObjeniousRequests {
       try {
         res = await req
       } catch (e) {
-        console.error("Error comprobando el estado de ", originalAction)
-        console.error("Error: ", e)
+        console.error("[cron] Error comprobando el estado de ", originalAction)
+        console.error("[cron] Error: ", e)
         return;
       }
 
       const { data } = res
 
-      console.log("Estado de : ", originalAction.mass_action_id, originalAction.iccids)
+      console.log("[cron] Estado de : ", originalAction.mass_action_id, originalAction.iccids)
       console.log(res.status, data)
 
       if (res.status != 200 || data == undefined) {
-        console.error("Error buscando los massActions")
+        console.error("[cron] Error buscando los massActions")
         continue;
       }
 
@@ -98,8 +91,7 @@ export class CheckObjeniousRequests {
       const { id, status, info } = data
 
       if (status != originalAction.objenious_status) {
-        console.log(status, "!=", originalAction.objenious_status)
-        console.log("Actualizando", originalAction, status)
+        console.log("[cron] Actualizando", originalAction.id, originalAction.iccids, status)
         const uorStatus = this.mapStatus(status)
         const updateData: ObjeniousOperationChange = {
           operation_id: originalAction.id!,
@@ -112,6 +104,26 @@ export class CheckObjeniousRequests {
         originalAction.status = uorStatus;
         originalAction.objenious_status = status;
         originalAction.last_change_date = new Date().toISOString()
+        console.log(" ----> Status", uorStatus)
+        if (uorStatus /*== "finished"*/) {
+          console.log(" ****> Status", uorStatus)
+          const targetIccids = JSON.parse(originalAction.iccids || "[]") as string[]
+          const lineData = await this.getLineData(targetIccids)
+          console.log("lineData", lineData.content[0])
+          const msisdn = lineData.content[0].identifier.msisdn
+
+          this.notifyFinalization({
+            ...originalAction,
+            msisdn
+          })
+            .then(e => {
+              console.log("Notificada la activacion de ", originalAction.iccids)
+            })
+            .catch(e => {
+              console.error("Error enviando la activacion de ", originalAction)
+              console.error(e)
+            })
+        }
 
         if (info != undefined) {
           updateData.info = info
@@ -144,6 +156,26 @@ export class CheckObjeniousRequests {
     return res
   }
 
+  private async getLineData(iccids: string[]) {
+    const PATH = "/lines"
+
+    const req = this.httpClient.client.get(PATH, {
+      params: {
+        pageSize: 100, // no hace fata
+        "identifier.identifierType": "ICCID",
+        "identifier.identifiers": iccids
+      }
+    })
+
+    try {
+      const res = await req
+      return res.data
+    } catch (e) {
+      console.error("Error obteniendo datos de la sim")
+      throw new Error(String(e))
+    }
+  }
+
   /**
   * Refrescar los requests hasta que conseguir una Id de mass action
   * Como no se puede consultar por 
@@ -191,10 +223,23 @@ export class CheckObjeniousRequests {
         console.log("Error actualizando el estado de ", request)
         continue;
       }
-
     }
 
     // 3. Se devuelve la lista de los requests con las actualizaciones
     return operationsList
   }
+
+  /**
+  * Se devuelve la respuesta de una operacion completa de objenious
+  * al servicio que manda los mails
+  */
+  private async notifyFinalization(operation: ObjeniousOperation & { msisdn: string }) {
+    console.log("Notificada, ", operation)
+    const req = this.httpClient.client.post<any>(env.NOTIFICATION_URL,
+      { operation: operation }
+    )
+    await req
+  }
 }
+
+

packages/sim-shared/domain/operationsRepository.port.ts

@@ -13,11 +13,11 @@ export type ObjeniousOperation = {
   operation: string;
   retry_count?: number;
   max_retry?: number;
-  max_date_retry?: Date | null;
-  iccids: string[];
+  max_date_retry?: string | null;
+  iccids: string; // Deberia ser string[] pero no parseo la lista de iccids
   request_id?: string;
   mass_action_id?: string;
-  end_date?: Date | null;
+  end_date?: string | null;
   error?: string | null;
   status: StatusEnum;
   objenious_status?: string;