Refactor de jwt y base de la bdd de pausas-cancelaciones

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/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

@@ -21,7 +21,10 @@ async function startCron() {
   console.log("[i] Comprobando conexion con la BDD ")
   await pgClient.checkDatabaseConnection()
 
-  const operationRepository = new ObjeniousOperationsRepository(pgClient)
+  const operationRepository = new ObjeniousOperationsRepository(
+    httpClient,
+    pgClient,
+  )
   const orderRepository = new OrderRepository(pgClient)
   const objeniousLineRepository = new ObjeniousLinesRepository(postgresClientIntranet)
 
@@ -31,7 +34,15 @@ async function startCron() {
     httpClient,
   )
 
-  const volcadoLineasTask = new TaskVolcadoLineas(httpClient, objeniousLineRepository)
+  const objeniosRepo = new ObjeniousOperationsRepository(
+    httpClient,
+    pgClient
+  )
+
+  const volcadoLineasTask = new TaskVolcadoLineas(
+    objeniousLineRepository,
+    objeniosRepo
+  )
 
   const PERIODO_PETICIONES = 10 * 60 * 1000
   const interval = setInterval(async () => {

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

@@ -1,94 +1,14 @@
-import assert from "node:assert";
-import { lineToCreateLineDto, ObjeniousLine, ObjeniousLineResponse } from "sim-shared/domain/objeniousLine.js";
-import { tryCatch, Result } from "sim-shared/domain/Result.js";
-import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js";
+import { lineToCreateLineDto, ObjeniousLine } from "sim-shared/domain/objeniousLine.js";
 import { ObjeniousLinesRepository } from "../infranstructure/ObjeniousLinesRepository.js";
-import { AxiosResponse } from "axios";
-import { constants } from "node:buffer";
-
-const MAX_PAGE_SIZE = 100
+import { ObjeniousOperationsRepository } from "packages/sim-shared/infrastructure/ObjeniousOperationRepository.js";
 
 export class TaskVolcadoLineas {
   constructor(
-    private readonly httpClient: HttpClient,
     private readonly linesRepository: ObjeniousLinesRepository,
+    private readonly objeniousRepository: ObjeniousOperationsRepository
   ) {
   }
 
-  /**
-  * Mover al repo
-  */
-  private async * getLinesByStatus(args?: {
-    pageSize?: number,
-    pageNumber?: number,
-    status?: string
-  }): AsyncGenerator<Result<string, ObjeniousLine[]>, Result<string, ObjeniousLine[]>, any> {
-
-    const path = "/lines"
-    const pageSize = args?.pageSize ?? MAX_PAGE_SIZE;
-
-    let currentPage = args?.pageNumber ?? 0;
-    let totalPages: number | undefined = undefined; // Como limite de paginas, igual es pasarse pero hasta que se lea
-
-    const params: Record<string, string | number> = {}
-
-    const loadNextLine = async (page: number): Promise<Result<string, ObjeniousLine[]>> => {
-      if (args?.status != undefined) params["simStatus"] = args.status
-      params["pageSize"] = pageSize
-      params["pageNumber"] = page
-      console.log("Params", params)
-      console.log(`[i] Cargando pagina ${currentPage} de ${totalPages ?? "(desc)"}`)
-      const nextPage = await tryCatch<AxiosResponse<ObjeniousLineResponse>>(this.httpClient.client.get(path, {
-        params: params
-      }))
-
-      if (nextPage.error != undefined) {
-        console.error(nextPage.error.msg)
-        return {
-          error: nextPage.error.msg.message
-        }
-      }
-
-      // Se aumenta para la siguiente ejecucion
-      console.log(`[i] Página ${currentPage} completa, total: ${nextPage.data.data.totalPages}`)
-      totalPages = nextPage.data.data.totalPages
-
-      return {
-        data: nextPage.data.data.content
-      }
-
-    }
-
-    // El inicio se ejecuta siempre
-    const lines = await loadNextLine(currentPage)
-
-    if (lines.error != undefined) {
-      console.error("[x] Error obteniendo las lineas, cancelando operación");
-      return {
-        error: "Error cargando lineas"
-      }
-    }
-
-    currentPage++;
-
-    yield {
-      data: lines.data
-    }
-
-    // Copia para evitar bucles infinitos por error de la api
-    const maxPages = totalPages
-    assert.ok(maxPages != undefined, "No se ha defindo el numero de paginas") // Nunca deberia pasar pero así se evitan bucles infnitos
-    console.log("maxPages", maxPages)
-    for (let i = currentPage; i < maxPages!; i++) {
-      console.log("Bucle i:", i, "page: ", currentPage)
-      yield await loadNextLine(currentPage);
-      currentPage++;
-    }
-
-    return {
-      data: []
-    }
-  }
 
   private async saveLines(lines: ObjeniousLine[]) {
     const linesToCreate = lines.map(lineToCreateLineDto)
@@ -107,7 +27,9 @@ export class TaskVolcadoLineas {
     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.getLinesByStatus()
+    const linesIterator = this.objeniousRepository.getLinesByStatusAPI({
+      pageSize: 100
+    })
     let lines = await linesIterator.next()
 
     if (lines.value.error != undefined || lines.value.data == undefined) {