diff --git a/packages/_template/package.json b/packages/_template/package.json index 261b983..0d3d7d1 100644 --- a/packages/_template/package.json +++ b/packages/_template/package.json @@ -10,6 +10,40 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#adapters/*.js": { + "types": "./src/adapters/*.ts", + "default": "./src/adapters/*.js" + }, + "#adapters/*": { + "types": "./src/adapters/*.ts", + "default": "./src/adapters/*.js" + }, + "#domain/*.js": { + "types": "./src/domain/*.ts", + "default": "./src/domain/*.js" + }, + "#domain/*": { + "types": "./src/domain/*.ts", + "default": "./src/domain/*.js" + }, + "#ports/*.js": { + "types": "./src/ports/*.ts", + "default": "./src/ports/*.js" + }, + "#ports/*": { + "types": "./src/ports/*.ts", + "default": "./src/ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "amqplib": "^0.10.9", @@ -29,4 +63,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/_template/tsconfig.json b/packages/_template/tsconfig.json index 7298f86..66ad49b 100644 --- a/packages/_template/tsconfig.json +++ b/packages/_template/tsconfig.json @@ -2,24 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist/sim-gestor-eventos", - "baseUrl": ".", - "paths": { - "#adapters/*": [ - "src/adapters/*" - ], - "#domain/*": [ - "src/domain/*" - ], - "#ports/*": [ - "src/ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "../shared/*" - ], - } + "baseUrl": "." }, "exclude": [ "node_modules" @@ -31,4 +14,4 @@ "files": [ "index.ts" ] -} +} \ No newline at end of file diff --git a/packages/shared/domain/EventBus.port.ts b/packages/shared/domain/EventBus.port.ts index 1f06d7e..a80cc7c 100644 --- a/packages/shared/domain/EventBus.port.ts +++ b/packages/shared/domain/EventBus.port.ts @@ -1,5 +1,5 @@ import { ConsumeMessage } from "amqplib"; -import { DomainEvent, DomainEventSubscriber } from "./DomainEvent"; +import { DomainEvent, DomainEventSubscriber } from "./DomainEvent.js"; export interface EventBus { publish(events: Array): Promise; diff --git a/packages/shared/domain/SimCard.ts b/packages/shared/domain/SimCard.ts index 7d1e041..08f86f6 100644 --- a/packages/shared/domain/SimCard.ts +++ b/packages/shared/domain/SimCard.ts @@ -1,4 +1,4 @@ -import { User } from "./User" +import { User } from "./User.js" export type SimCard = { iccid: string, diff --git a/packages/shared/domain/SimEvents.ts b/packages/shared/domain/SimEvents.ts index 9dc1b92..ff1ec29 100644 --- a/packages/shared/domain/SimEvents.ts +++ b/packages/shared/domain/SimEvents.ts @@ -30,7 +30,7 @@ export namespace SimEvents { }, } - export type cancelation = DomainEvent & { + export type cancel = DomainEvent & { key: `sim.${string}.cancel`, payload: { iccid: string diff --git a/packages/shared/infrastructure/RabbitMQEventBus.ts b/packages/shared/infrastructure/RabbitMQEventBus.ts index 8714cba..e18f4f3 100644 --- a/packages/shared/infrastructure/RabbitMQEventBus.ts +++ b/packages/shared/infrastructure/RabbitMQEventBus.ts @@ -1,8 +1,8 @@ import { type ChannelModel, type ConfirmChannel, ConsumeMessage, connect as amqConnect } from "amqplib"; import { connect, AmqpConnectionManager, ChannelWrapper, Channel } from "amqp-connection-manager" -import { DomainEvent, DomainEventSubscriber } from "../domain/DomainEvent"; -import { EventBus } from "../domain/EventBus.port"; +import { DomainEvent, DomainEventSubscriber } from "../domain/DomainEvent.js"; +import { EventBus } from "../domain/EventBus.port.js"; export type RMQConnectionParams = { username: string, diff --git a/packages/shared/package.json b/packages/shared/package.json index ea07ca9..e1631ad 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -11,6 +11,56 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#config/*.js": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#config/*": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#adapters/*.js": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#adapters/*": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#domain/*.js": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#domain/*": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#ports/*.js": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#ports/*": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#shared/*.js": { + "types": "./*.ts", + "default": "./*.js" + }, + "#shared/*": { + "types": "./*.ts", + "default": "./*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "amqplib": "^0.10.9", @@ -31,4 +81,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 0acccaf..6f27109 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -2,27 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist", - "baseUrl": ".", - "paths": { - "#config/*": [ - "config/*" - ], - "#adapters/*": [ - "adapters/*" - ], - "#domain/*": [ - "domain/*" - ], - "#ports/*": [ - "ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "./*" - ], - } + "baseUrl": "." }, "exclude": [ "node_modules" diff --git a/packages/sim-consumidor-nos/aplication/SimNOS.controller.ts b/packages/sim-consumidor-nos/aplication/SimNOS.controller.ts index d118ab2..bfa4a0f 100644 --- a/packages/sim-consumidor-nos/aplication/SimNOS.controller.ts +++ b/packages/sim-consumidor-nos/aplication/SimNOS.controller.ts @@ -1,4 +1,4 @@ -import { EventBus } from "#shared/domain/EventBus.port"; +import { EventBus } from "sim-shared/domain/EventBus.port.js"; import { ConsumeMessage } from "amqplib"; export class SimNosController { diff --git a/packages/sim-consumidor-nos/config/eventBusConfig.ts b/packages/sim-consumidor-nos/config/eventBusConfig.ts index e62c82a..9a0e1f3 100644 --- a/packages/sim-consumidor-nos/config/eventBusConfig.ts +++ b/packages/sim-consumidor-nos/config/eventBusConfig.ts @@ -1,4 +1,4 @@ -import { RabbitMQEventBus, RMQConnectionParams } from "#shared/infrastructure/RabbitMQEventBus" +import { RabbitMQEventBus, RMQConnectionParams } from "sim-shared/infrastructure/RabbitMQEventBus.js" import { env } from "./env" const rmqUser = env.RABBITMQ_USER diff --git a/packages/sim-consumidor-nos/package.json b/packages/sim-consumidor-nos/package.json index e20e4d8..79abc3e 100644 --- a/packages/sim-consumidor-nos/package.json +++ b/packages/sim-consumidor-nos/package.json @@ -11,6 +11,48 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#config/*.js": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#config/*": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#adapters/*.js": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#adapters/*": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#domain/*.js": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#domain/*": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#ports/*.js": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#ports/*": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "amqplib": "^0.10.9", @@ -30,4 +72,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/sim-consumidor-nos/tsconfig.json b/packages/sim-consumidor-nos/tsconfig.json index 2148eac..d46487c 100644 --- a/packages/sim-consumidor-nos/tsconfig.json +++ b/packages/sim-consumidor-nos/tsconfig.json @@ -2,27 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist", - "baseUrl": ".", - "paths": { - "#config/*": [ - "config/*" - ], - "#adapters/*": [ - "adapters/*" - ], - "#domain/*": [ - "domain/*" - ], - "#ports/*": [ - "ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "../shared/*" - ], - } + "baseUrl": "." }, "exclude": [ "node_modules" diff --git a/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts b/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts index 8cd3932..d7f2f43 100644 --- a/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts +++ b/packages/sim-consumidor-objenious/aplication/JWT.service.test.ts @@ -1,5 +1,5 @@ import { test, describe } from "vitest" -import { JWTService } from "./JWT.service" +import { JWTService } from "./JWT.service.js" describe("Tokens Objenious", () => { const jwtService = new JWTService() diff --git a/packages/sim-consumidor-objenious/aplication/JWT.service.ts b/packages/sim-consumidor-objenious/aplication/JWT.service.ts index 49767f4..fcc9bd0 100644 --- a/packages/sim-consumidor-objenious/aplication/JWT.service.ts +++ b/packages/sim-consumidor-objenious/aplication/JWT.service.ts @@ -11,7 +11,7 @@ import fs from "fs" import { JWTToken -} from "#shared/domain/JWT.js" +} from "sim-shared/domain/JWT.js" import axios, { AxiosError } from "axios"; type GrantAccessRequestBody = { diff --git a/packages/sim-consumidor-objenious/aplication/Sim.controller.ts b/packages/sim-consumidor-objenious/aplication/Sim.controller.ts index e6a1d73..82041ce 100644 --- a/packages/sim-consumidor-objenious/aplication/Sim.controller.ts +++ b/packages/sim-consumidor-objenious/aplication/Sim.controller.ts @@ -1,10 +1,8 @@ -import { EventBus } from "#shared/domain/EventBus.port"; +import { EventBus } from "sim-shared/domain/EventBus.port.js"; import { ConsumeMessage } from "amqplib"; import { SimUseCases } from "./Sim.usecases.js"; -import { SimEvents } from "#shared/domain/SimEvents.js"; -import { constants } from "node:buffer"; -import { constrainedMemory } from "node:process"; -import { Result } from "#shared/domain/Result.js"; +import { SimEvents } from "sim-shared/domain/SimEvents.js"; +import { Result } from "sim-shared/domain/Result.js"; /** * La clase usa generadores de funciones para mantener el contexto diff --git a/packages/sim-consumidor-objenious/aplication/Sim.router.ts b/packages/sim-consumidor-objenious/aplication/Sim.router.ts index c766017..26b4085 100644 --- a/packages/sim-consumidor-objenious/aplication/Sim.router.ts +++ b/packages/sim-consumidor-objenious/aplication/Sim.router.ts @@ -6,7 +6,7 @@ import { ConsumeMessage } from "amqplib"; import { SimController } from "./Sim.controller.js"; -import { EventBus } from "#shared/domain/EventBus.port.js"; +import { EventBus } from "sim-shared/domain/EventBus.port.js"; export class SimRouter { private readonly routes: Map Promise>; diff --git a/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts b/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts index ebd4b86..7822420 100644 --- a/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts +++ b/packages/sim-consumidor-objenious/aplication/Sim.usecases.ts @@ -1,5 +1,5 @@ import { ActionData, ActivationData } from "#domain/DTOs/objeniousapi.js" -import { HttpClient } from "#shared/infrastructure/HTTPClient.js" +import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js" import { AxiosError } from "axios" import { Result } from "sim-shared/domain/Result.js" import { ObjeniousOperation, IOperationsRepository as OperationsRepositoryPort } from "#domain/operationsRepository.port.js" @@ -83,7 +83,7 @@ export class SimUseCases { if (resp.status == 200) { console.log("Sim preactivada con exito", resp.data) const operation: ObjeniousOperation = { - operation: "activate", + operation: "preActivate", iccids: preActivateData.identifier.identifiers, status: "noMassID", request_id: resp.data.requestId diff --git a/packages/sim-consumidor-objenious/config/eventBus.config.ts b/packages/sim-consumidor-objenious/config/eventBus.config.ts index 143b7db..4c5db47 100644 --- a/packages/sim-consumidor-objenious/config/eventBus.config.ts +++ b/packages/sim-consumidor-objenious/config/eventBus.config.ts @@ -1,6 +1,6 @@ -import { RabbitMQEventBus, RMQConnectionParams } from "#shared/infrastructure/RabbitMQEventBus" +import { RabbitMQEventBus, RMQConnectionParams } from "sim-shared/infrastructure/RabbitMQEventBus.js" import { Channel } from "amqp-connection-manager" -import { env } from "./env" +import { env } from "./env/index.js" const rmqUser = env.RABBITMQ_USER const rmqPass = env.RABBITMQ_PASSWORD diff --git a/packages/sim-consumidor-objenious/config/httpClient.config.ts b/packages/sim-consumidor-objenious/config/httpClient.config.ts index a5d9ef6..6d37725 100644 --- a/packages/sim-consumidor-objenious/config/httpClient.config.ts +++ b/packages/sim-consumidor-objenious/config/httpClient.config.ts @@ -1,6 +1,6 @@ -import { HttpClient } from "#shared/infrastructure/HTTPClient.js" +import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js" import { JWTService } from "../aplication/JWT.service.js" -import { env } from "./env" +import { env } from "./env/index.js" const OBJ_BASE_URL = env.OBJ_BASE_URL diff --git a/packages/sim-consumidor-objenious/config/postgreConfig.ts b/packages/sim-consumidor-objenious/config/postgreConfig.ts index 1d75041..adb003a 100644 --- a/packages/sim-consumidor-objenious/config/postgreConfig.ts +++ b/packages/sim-consumidor-objenious/config/postgreConfig.ts @@ -1,6 +1,6 @@ import { Pool, QueryResult } from 'pg'; -import { PgClient } from '#shared/infrastructure/PgClient' -import { env } from './env'; +import { PgClient } from 'sim-shared/infrastructure/PgClient.js' +import { env } from './env/index.js'; // Configuracion de la conexion a la BDD, deberia ser la // Misma para todos los servicios pero hasta que se unifique todo diff --git a/packages/sim-consumidor-objenious/domain/operationsRepository.port.ts b/packages/sim-consumidor-objenious/domain/operationsRepository.port.ts index 4df2da2..23c82d9 100644 --- a/packages/sim-consumidor-objenious/domain/operationsRepository.port.ts +++ b/packages/sim-consumidor-objenious/domain/operationsRepository.port.ts @@ -1,4 +1,4 @@ -import { Result } from "#shared/domain/Result.js"; +import { Result } from "sim-shared/domain/Result.js"; export type StatusEnum = 'error' | 'finished' | 'noRequestId' | 'running' | 'noMassID'; @@ -38,7 +38,7 @@ export type ObjeniousOperationChange = { } export namespace Objenious { - export type Status = "STAND_BY" | "IN_PROGRESS" | "ENDED" | "CANCELLED"; + export type Status = "En Cours" | "Terminé"; export type Identifier = "IMSI" | "MSISDN" | "REFERENCE" | "ICCID" | "IMEI" export type ResponseGetRequestById = { created: string, @@ -88,7 +88,7 @@ export namespace Objenious { created: string, started?: string, ended?: string, - status: Status, + status: string, info?: string } } diff --git a/packages/sim-consumidor-objenious/index.ts b/packages/sim-consumidor-objenious/index.ts index 7b486eb..f884b23 100644 --- a/packages/sim-consumidor-objenious/index.ts +++ b/packages/sim-consumidor-objenious/index.ts @@ -3,7 +3,7 @@ import { OperationsRepository } from "#adapters/OperationRepository.js" import { startRMQClient } from "#config/eventBus.config.js" import { httpInstance } from "#config/httpClient.config.js" import { pgPool } from "#config/postgreConfig.js" -import { PgClient } from "#shared/infrastructure/PgClient.js" +import { PgClient } from "sim-shared/infrastructure/PgClient.js" import { SimUseCases } from "aplication/Sim.usecases.js" import { SimController } from "./aplication/Sim.controller.js" import { SimRouter } from "./aplication/Sim.router.js" diff --git a/packages/sim-consumidor-objenious/package.json b/packages/sim-consumidor-objenious/package.json index 678d325..f19f7c7 100644 --- a/packages/sim-consumidor-objenious/package.json +++ b/packages/sim-consumidor-objenious/package.json @@ -14,6 +14,48 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#config/*.js": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#config/*": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#adapters/*.js": { + "types": "./infrastructure/*.ts", + "default": "./infrastructure/*.js" + }, + "#adapters/*": { + "types": "./infrastructure/*.ts", + "default": "./infrastructure/*.js" + }, + "#domain/*.js": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#domain/*": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#ports/*.js": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#ports/*": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "amqplib": "^0.10.9", @@ -35,4 +77,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/sim-consumidor-objenious/tsconfig.json b/packages/sim-consumidor-objenious/tsconfig.json index 60e4425..d46487c 100644 --- a/packages/sim-consumidor-objenious/tsconfig.json +++ b/packages/sim-consumidor-objenious/tsconfig.json @@ -2,30 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist", - "baseUrl": ".", - "paths": { - "#config/*": [ - "config/*" - ], - "#adapters/*": [ - "infrastructure/*" - ], - "#domain/*": [ - "domain/*" - ], - "#ports/*": [ - "ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "../shared/*" - ], - "#root/*": [ - "../../*" - ] - } + "baseUrl": "." }, "exclude": [ "node_modules" @@ -37,4 +14,4 @@ "files": [ "index.ts" ] -} +} \ No newline at end of file diff --git a/packages/sim-entrada-eventos/aplication/Sim.controller.ts b/packages/sim-entrada-eventos/aplication/Sim.controller.ts index 3742cf2..4c27325 100644 --- a/packages/sim-entrada-eventos/aplication/Sim.controller.ts +++ b/packages/sim-entrada-eventos/aplication/Sim.controller.ts @@ -1,5 +1,5 @@ import { Request, Response } from "express" -import { SimUsecases } from "aplication/Sim.usecases" +import { SimUsecases } from "aplication/Sim.usecases.js" import { error } from "node:console" // Partiendo del caracter 3 2 de pais + 2 de compañia diff --git a/packages/sim-entrada-eventos/config/eventBusConfig.ts b/packages/sim-entrada-eventos/config/eventBusConfig.ts index 3165ed9..0b57ac9 100644 --- a/packages/sim-entrada-eventos/config/eventBusConfig.ts +++ b/packages/sim-entrada-eventos/config/eventBusConfig.ts @@ -1,4 +1,4 @@ -import { RabbitMQEventBus, RMQConnectionParams } from "#shared/infrastructure/RabbitMQEventBus" +import { RabbitMQEventBus, RMQConnectionParams } from "sim-shared/infrastructure/RabbitMQEventBus.js" import { env } from "./env" const rmqUser = env.RABBITMQ_USER diff --git a/packages/sim-entrada-eventos/index.ts b/packages/sim-entrada-eventos/index.ts index ff8ab67..9401c98 100644 --- a/packages/sim-entrada-eventos/index.ts +++ b/packages/sim-entrada-eventos/index.ts @@ -2,7 +2,7 @@ import express from "express" import cors from 'cors'; import { simRoutes } from "./infrastructure/simRoutes.http.js" import { rabbitmqEventBus } from '#config/eventBusConfig'; -import { env } from "#config/env" +import { env } from "#config/env/index.js" const PORT = env.API_PORT const HOSTNAME = "0.0.0.0" diff --git a/packages/sim-entrada-eventos/package.json b/packages/sim-entrada-eventos/package.json index 45a9bfe..705991b 100644 --- a/packages/sim-entrada-eventos/package.json +++ b/packages/sim-entrada-eventos/package.json @@ -12,6 +12,48 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#config/*.js": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#config/*": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#adapters/*.js": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#adapters/*": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#domain/*.js": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#domain/*": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#ports/*.js": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#ports/*": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "amqplib": "^0.10.9", @@ -32,4 +74,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/sim-entrada-eventos/tsconfig.json b/packages/sim-entrada-eventos/tsconfig.json index 2148eac..d46487c 100644 --- a/packages/sim-entrada-eventos/tsconfig.json +++ b/packages/sim-entrada-eventos/tsconfig.json @@ -2,27 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist", - "baseUrl": ".", - "paths": { - "#config/*": [ - "config/*" - ], - "#adapters/*": [ - "adapters/*" - ], - "#domain/*": [ - "domain/*" - ], - "#ports/*": [ - "ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "../shared/*" - ], - } + "baseUrl": "." }, "exclude": [ "node_modules" diff --git a/packages/sim-objenious-cron/config/httpClient.config.ts b/packages/sim-objenious-cron/config/httpClient.config.ts index c17c495..bd612a5 100644 --- a/packages/sim-objenious-cron/config/httpClient.config.ts +++ b/packages/sim-objenious-cron/config/httpClient.config.ts @@ -1,4 +1,4 @@ -import { HttpClient } from "#shared/infrastructure/HTTPClient.js" +import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js" import { JWTService } from "sim-consumidor-objenious/aplication/JWT.service.js" import { env } from "./env/index.js" diff --git a/packages/sim-objenious-cron/package.json b/packages/sim-objenious-cron/package.json index 7f7f125..276fffe 100644 --- a/packages/sim-objenious-cron/package.json +++ b/packages/sim-objenious-cron/package.json @@ -13,6 +13,48 @@ "author": "", "license": "ISC", "packageManager": "yarn@4.12.0", + "imports": { + "#config/*.js": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#config/*": { + "types": "./config/*.ts", + "default": "./config/*.js" + }, + "#adapters/*.js": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#adapters/*": { + "types": "./adapters/*.ts", + "default": "./adapters/*.js" + }, + "#domain/*.js": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#domain/*": { + "types": "./domain/*.ts", + "default": "./domain/*.js" + }, + "#ports/*.js": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#ports/*": { + "types": "./ports/*.ts", + "default": "./ports/*.js" + }, + "#tests/*.js": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + }, + "#tests/*": { + "types": "./__tests__/*.ts", + "default": "./__tests__/*.js" + } + }, "dependencies": { "@tsconfig/node22": "*", "cors": "*", @@ -35,4 +77,4 @@ "tsx": "*", "vitest": "*" } -} +} \ No newline at end of file diff --git a/packages/sim-objenious-cron/tasks/check_objenious_request.ts b/packages/sim-objenious-cron/tasks/check_objenious_request.ts index 59f3ed1..ca652d5 100644 --- a/packages/sim-objenious-cron/tasks/check_objenious_request.ts +++ b/packages/sim-objenious-cron/tasks/check_objenious_request.ts @@ -1,6 +1,5 @@ -import { IOperationsRepository, Objenious, ObjeniousOperation, ObjeniousOperationChange, StatusEnum } from "#objenious-shared/domain/operationsRepository.port.js" -import { HttpClient } from "#shared/infrastructure/HTTPClient.js"; -import { constants } from "node:buffer"; +import { IOperationsRepository, Objenious, ObjeniousOperation, ObjeniousOperationChange, StatusEnum } from "sim-consumidor-objenious/domain/operationsRepository.port.js" +import { HttpClient } from "sim-shared/infrastructure/HTTPClient.js"; export class CheckObjeniousRequests { constructor( @@ -135,7 +134,9 @@ export class CheckObjeniousRequests { const sanitizedStatus = objStatus.trim().toLowerCase() // No tengo el resto porque no aparecen en la documentación // asumo que todos los demas sn running y se deben volver a comrobar + // ! Importante las claves siempre en minuscula, los valores son cammelCase const equivalentMap = new Map([ + ["en cours", "running"], ["terminé", "finished"] ]) const res = equivalentMap.get(sanitizedStatus) @@ -197,4 +198,3 @@ export class CheckObjeniousRequests { return operationsList } } - diff --git a/packages/sim-objenious-cron/tsconfig.json b/packages/sim-objenious-cron/tsconfig.json index f2301fd..0b9f089 100644 --- a/packages/sim-objenious-cron/tsconfig.json +++ b/packages/sim-objenious-cron/tsconfig.json @@ -2,31 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../dist", - "baseUrl": ".", - "paths": { - "#config/*": [ - "config/*" - ], - "#adapters/*": [ - "adapters/*" - ], - "#domain/*": [ - "domain/*" - ], - "#ports/*": [ - "ports/*" - ], - "#tests/*": [ - "__tests__/*" - ], - "#shared/*": [ - "../shared/*" - ], - // De momento se usa el consumidor como principal - "#objenious-shared/*": [ - "../sim-consumidor-objenious/*" - ] - } + "baseUrl": "." }, "exclude": [ "node_modules" @@ -39,4 +15,4 @@ "files": [ "index.ts" ] -} +} \ No newline at end of file