cardus 0.0.71 → 0.0.73

package/dist/index.js

@@ -91,6 +91,7 @@ class IntegrationManager {
             const sellerAddress = warehouseId > 0
                 ? yield addressesService.getWarehouseAddress(idUsuario)
                 : yield addressesService.getAddress(addressId, idUsuario);
+            const country = yield this.services.countriesService.getCountry(sellerAddress.id_pais);
             const allOrders = yield fetchAllOrders();
             const filteredOrders = yield integrationsService.filterExternalDuplicatedOrders({
                 id_usuario: idUsuario,
@@ -149,7 +150,8 @@ class IntegrationManager {
             });
             yield this.insertUserDefaultConfigurationContent({
                 user,
-                tempShimpmentIds: successfullShipments.map((successfullShipment) => successfullShipment.idEnvioTemporal)
+                tempShimpmentIds: successfullShipments.map((successfullShipment) => successfullShipment.idEnvioTemporal),
+                countryName: country.nombre_pais_en
             });
             // modificamos la agencia, cuando se tenga que hacer
             yield Promise.allSettled(successfullShipments.map((order) => __awaiter(this, void 0, void 0, function* () {
@@ -174,7 +176,7 @@ class IntegrationManager {
             })));
             yield Promise.allSettled([
                 integrationsService.insertTempShipmentMultipleLines(this.dataToInsert.lines),
-                integrationsService.insertTempShipmentMultipleDetails(this.dataToInsert.details.map((detail) => (Object.assign(Object.assign({}, detail), { url_producto: JSON.stringify(this.dataToInsert.details), ski_producto: 'AAAAA' })))),
+                integrationsService.insertTempShipmentMultipleDetails(this.dataToInsert.details),
                 integrationsService.insertTempShipmentMultipleContents(this.dataToInsert.contents),
                 integrationsService.insertTempShipmentMultipleExternals(this.dataToInsert.externals)
             ]);
@@ -186,12 +188,14 @@ class IntegrationManager {
         });
     }
     insertUserDefaultConfigurationContent(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ user, tempShimpmentIds }) {
+        return __awaiter(this, arguments, void 0, function* ({ user, tempShimpmentIds, countryName }) {
             const idUsuario = user.id_usuario;
             const { configurationService, llmAPIService } = this.services;
             const insert = (data, tempShimpmentId) => {
                 data.forEach((tempContent) => {
-                    this.dataToInsert.contents.push(Object.assign(Object.assign({}, tempContent), { id_envio: tempShimpmentId }));
+                    if (tempContent.contenido) {
+                        this.dataToInsert.contents.push(Object.assign(Object.assign({}, tempContent), { id_envio: tempShimpmentId }));
+                    }
                 });
             };
             // Limpia los contenidos para eliminar valores no deseados
@@ -208,10 +212,13 @@ class IntegrationManager {
                 [];
             if (integrationShipmentDetails) {
                 const shipmentContentFromDetails = yield Promise.all(integrationShipmentDetails.map((detail) => __awaiter(this, void 0, void 0, function* () {
-                    const taric = yield llmAPIService.getTaricCode('chatgpt', detail.bulto.nombre_producto || '');
+                    const taric = detail.bulto.nombre_producto
+                        ? yield llmAPIService.getTaricCode('chatgpt', detail.bulto.nombre_producto)
+                        : null;
                     return {
+                        id_envio: detail.id_envio,
                         id_usuario: idUsuario,
-                        contenido: JSON.stringify(this.dataToInsert.details),
+                        contenido: detail.bulto.nombre_producto,
                         valor: detail.bulto.valor || getRandomContentValue(),
                         dni: user.dni,
                         taric,
@@ -219,7 +226,7 @@ class IntegrationManager {
                         eori_exportacion: user.eori_export,
                         peso_bruto: detail.bulto.peso,
                         peso_neto: detail.bulto.peso,
-                        origen: 1, // Sacar del país de origen de la orden pendiente. Nombre de país en inglés.
+                        origen: countryName,
                         cantidad: detail.cantidad,
                         reason_export: '1'
                     };

package/index.ts

@@ -111,6 +111,9 @@ export class IntegrationManager {
       warehouseId > 0
         ? await addressesService.getWarehouseAddress(idUsuario)
         : await addressesService.getAddress(addressId, idUsuario);
+    const country = await this.services.countriesService.getCountry(
+      sellerAddress.id_pais
+    );
 
     const allOrders = await fetchAllOrders();
     const filteredOrders =
@@ -194,7 +197,8 @@ export class IntegrationManager {
       user,
       tempShimpmentIds: successfullShipments.map(
         (successfullShipment) => successfullShipment.idEnvioTemporal
-      )
+      ),
+      countryName: country.nombre_pais_en
     });
 
     // modificamos la agencia, cuando se tenga que hacer
@@ -230,11 +234,7 @@ export class IntegrationManager {
         this.dataToInsert.lines
       ),
       integrationsService.insertTempShipmentMultipleDetails(
-        this.dataToInsert.details.map((detail) => ({
-          ...detail,
-          url_producto: JSON.stringify(this.dataToInsert.details),
-          ski_producto: 'AAAAA'
-        }))
+        this.dataToInsert.details
       ),
       integrationsService.insertTempShipmentMultipleContents(
         this.dataToInsert.contents
@@ -253,10 +253,12 @@ export class IntegrationManager {
 
   async insertUserDefaultConfigurationContent({
     user,
-    tempShimpmentIds
+    tempShimpmentIds,
+    countryName
   }: {
     user: Record<string, string | number>;
     tempShimpmentIds: number[];
+    countryName: string;
   }) {
     const idUsuario = user.id_usuario as number;
     const { configurationService, llmAPIService } = this.services;
@@ -266,10 +268,12 @@ export class IntegrationManager {
       tempShimpmentId: number
     ) => {
       data.forEach((tempContent) => {
-        this.dataToInsert.contents.push({
-          ...tempContent,
-          id_envio: tempShimpmentId
-        });
+        if (tempContent.contenido) {
+          this.dataToInsert.contents.push({
+            ...tempContent,
+            id_envio: tempShimpmentId
+          });
+        }
       });
     };
 
@@ -298,14 +302,17 @@ export class IntegrationManager {
     if (integrationShipmentDetails) {
       const shipmentContentFromDetails = await Promise.all(
         integrationShipmentDetails.map(async (detail) => {
-          const taric = await llmAPIService.getTaricCode(
-            'chatgpt',
-            detail.bulto.nombre_producto || ''
-          );
+          const taric = detail.bulto.nombre_producto
+            ? await llmAPIService.getTaricCode(
+                'chatgpt',
+                detail.bulto.nombre_producto
+              )
+            : null;
 
           return {
+            id_envio: detail.id_envio,
             id_usuario: idUsuario,
-            contenido: JSON.stringify(this.dataToInsert.details),
+            contenido: detail.bulto.nombre_producto,
             valor: detail.bulto.valor || getRandomContentValue(),
             dni: user.dni,
             taric,
@@ -313,7 +320,7 @@ export class IntegrationManager {
             eori_exportacion: user.eori_export,
             peso_bruto: detail.bulto.peso,
             peso_neto: detail.bulto.peso,
-            origen: 1, // Sacar del país de origen de la orden pendiente. Nombre de país en inglés.
+            origen: countryName,
             cantidad: detail.cantidad,
             reason_export: '1'
           } as UserDefaultConfigurationContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cardus",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "description": "an integration manager",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/types/index.ts

@@ -266,11 +266,17 @@ export type AddressesService = {
   getAddress: (addressId: number, idUsuario: number) => Promise<SellerAddress>;
 };
 
-type Country = { nombre_pais: string; id_pais?: number };
+type Country = {
+  nombre_pais: string;
+  id_pais?: number;
+  nombre_pais_en: string;
+};
 type Provincia = { nombre_provincia?: string };
 type Zone = string;
 
 export type CountriesService = {
+  getCountry: (id_pais: Country['id_pais']) => Promise<Country>;
+
   getCountryFromCountryCode: (
     countryCode: string
   ) => Promise<{ nombre_pais: string; id_pais?: number }>;
@@ -289,6 +295,7 @@ export type CountriesService = {
 };
 
 export type UserDefaultConfigurationContent = {
+  id_envio: number;
   id_usuario: number;
   contenido: string;
   valor: number;
@@ -298,7 +305,7 @@ export type UserDefaultConfigurationContent = {
   eori_exportacion: string;
   peso_bruto: number;
   peso_neto: number;
-  origen: number;
+  origen: string;
   cantidad: number;
   reason_export: '1' | '2' | '3' | '4' | '5';
 };