cardus 0.0.108 → 0.0.112

package/__tests__/insertTempShipments.test.ts

@@ -376,7 +376,7 @@ describe('IntegrationManager.insertTempShipments', () => {
     expect(addressesService.getAddress).not.toHaveBeenCalledWith(10, 77);
   });
 
-  it('uses sellerAddress from the order when addressId is not provided', async () => {
+  it('uses sellerAddress from the order when addressId is not provided ', async () => {
     const { manager, addressesService, integrationsService } = buildFixture();
     arrangeDefaultStubs({ manager, shipmentId: 12345 });
 

package/dist/__tests__/insertTempShipments.test.js

@@ -316,7 +316,7 @@ describe('IntegrationManager.insertTempShipments', () => {
         expect(addressesService.getWarehouseAddress).toHaveBeenCalledWith(77);
         expect(addressesService.getAddress).not.toHaveBeenCalledWith(10, 77);
     }));
-    it('uses sellerAddress from the order when addressId is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('uses sellerAddress from the order when addressId is not provided ', () => __awaiter(void 0, void 0, void 0, function* () {
         const { manager, addressesService, integrationsService } = buildFixture();
         arrangeDefaultStubs({ manager, shipmentId: 12345 });
         yield manager.insertTempShipments({

package/dist/index.js

@@ -66,7 +66,6 @@ class IntegrationManager {
                 : addressId
                     ? yield addressesService.getAddress(addressId, idUsuario)
                     : null;
-            let sellerAddressForContents = defaultSellerAddress;
             const userIntegrationConfiguration = yield integrationsService.getDefaultIntegrationsData({
                 id_usuario: idUsuario,
                 id_integracion: this.integrationType
@@ -103,11 +102,10 @@ class IntegrationManager {
                     if (parsedOrder.direccionSalidaId) {
                         direccionSalida = yield addressesService.getAddress(parsedOrder.direccionSalidaId, idUsuario);
                     }
-                    const currentSellerAddress = (_b = direccionSalida !== null && direccionSalida !== void 0 ? direccionSalida : parsedOrder.sellerAddress) !== null && _b !== void 0 ? _b : defaultSellerAddress;
+                    const currentSellerAddress = (_b = direccionSalida !== null && direccionSalida !== void 0 ? direccionSalida : parsedOrder.direccionSalidaPersonalizada) !== null && _b !== void 0 ? _b : defaultSellerAddress;
                     if (!currentSellerAddress) {
                         throw new Error('Seller address could not be resolved');
                     }
-                    sellerAddressForContents !== null && sellerAddressForContents !== void 0 ? sellerAddressForContents : (sellerAddressForContents = currentSellerAddress);
                     const tempShipmentData = yield (0, insertTempShipment_1.cookTempShipment)({
                         order: parsedOrder,
                         shipmentType: this.shipmentType,
@@ -193,20 +191,18 @@ class IntegrationManager {
                     });
                     // details
                     this.dataToInsert.details.push(...shipmentDetails);
+                    const country = yield this.services.countriesService.getCountry(currentSellerAddress.id_pais);
+                    // mete los contents
+                    yield this.insertUserDefaultConfigurationContent({
+                        user,
+                        countryName: country.nombre_pais_en,
+                        shipmentDetails
+                    });
                     return Object.assign(parsedOrder, { idEnvioTemporal, agencyId });
                 }),
                 regularExecutionTime: 8000, // ms
                 initialBatchQuantity: sequentialInsertion ? 1 : 5 // si la insercion no es secuencial, de cinco en cinco
             }).upload();
-            if (!sellerAddressForContents) {
-                throw new Error('Seller address could not be resolved');
-            }
-            const country = yield this.services.countriesService.getCountry(sellerAddressForContents.id_pais);
-            // content (dentro de esta funcion coge los detalles y evoluciona a partir de ahi)
-            yield this.insertUserDefaultConfigurationContent({
-                user,
-                countryName: country.nombre_pais_en
-            });
             const arrayPackages = [...this.dataToInsert.lines.values()].flat().flat();
             yield Promise.allSettled([
                 integrationsService.insertTempShipmentMultipleLines(arrayPackages),
@@ -227,7 +223,7 @@ class IntegrationManager {
         });
     }
     insertUserDefaultConfigurationContent(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ user, countryName }) {
+        return __awaiter(this, arguments, void 0, function* ({ user, countryName, shipmentDetails }) {
             const idUsuario = user.id_usuario;
             const { configurationService, llmAPIService } = this.services;
             const insert = (data) => {
@@ -245,10 +241,8 @@ class IntegrationManager {
             const getRandomContentValue = () => {
                 return Math.floor(Math.random() * 5) + 1;
             };
-            const integrationShipmentDetails = this.dataToInsert.details;
+            const integrationShipmentDetails = shipmentDetails;
             let shipmentContent = null;
-            const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) ||
-                [];
             if (integrationShipmentDetails) {
                 const shipmentContentFromDetails = yield Promise.all(integrationShipmentDetails.map((detail) => __awaiter(this, void 0, void 0, function* () {
                     let taric = null;
@@ -281,12 +275,15 @@ class IntegrationManager {
                 })));
                 shipmentContent = shipmentContentFromDetails;
             }
-            else if (userSavedData.length > 0) {
-                shipmentContent = userSavedData;
-            }
             else {
-                const userFakeData = configurationService.getFakeDefaultProformaConfiguration(idUsuario, user.dni);
-                shipmentContent = userFakeData;
+                const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) || [];
+                if (userSavedData.length > 0) {
+                    shipmentContent = userSavedData;
+                }
+                else {
+                    const userFakeData = configurationService.getFakeDefaultProformaConfiguration(idUsuario, user.dni);
+                    shipmentContent = userFakeData;
+                }
             }
             if (shipmentContent) {
                 shipmentContent = cleanContentData(shipmentContent);

package/index.ts

@@ -117,7 +117,6 @@ export class IntegrationManager {
         : addressId
           ? await addressesService.getAddress(addressId, idUsuario)
           : null;
-    let sellerAddressForContents = defaultSellerAddress;
 
     const userIntegrationConfiguration =
       await integrationsService.getDefaultIntegrationsData({
@@ -175,14 +174,14 @@ export class IntegrationManager {
           );
         }
         const currentSellerAddress =
-          direccionSalida ?? parsedOrder.sellerAddress ?? defaultSellerAddress;
+          direccionSalida ??
+          parsedOrder.direccionSalidaPersonalizada ??
+          defaultSellerAddress;
 
         if (!currentSellerAddress) {
           throw new Error('Seller address could not be resolved');
         }
 
-        sellerAddressForContents ??= currentSellerAddress;
-
         const tempShipmentData = await cookTempShipment({
           order: parsedOrder,
           shipmentType: this.shipmentType,
@@ -307,26 +306,23 @@ export class IntegrationManager {
         // details
         this.dataToInsert.details.push(...shipmentDetails);
 
+        const country = await this.services.countriesService.getCountry(
+          currentSellerAddress.id_pais
+        );
+
+        // mete los contents
+        await this.insertUserDefaultConfigurationContent({
+          user,
+          countryName: country.nombre_pais_en,
+          shipmentDetails
+        });
+
         return Object.assign(parsedOrder, { idEnvioTemporal, agencyId });
       },
       regularExecutionTime: 8000, // ms
       initialBatchQuantity: sequentialInsertion ? 1 : 5 // si la insercion no es secuencial, de cinco en cinco
     }).upload();
 
-    if (!sellerAddressForContents) {
-      throw new Error('Seller address could not be resolved');
-    }
-
-    const country = await this.services.countriesService.getCountry(
-      sellerAddressForContents.id_pais
-    );
-
-    // content (dentro de esta funcion coge los detalles y evoluciona a partir de ahi)
-    await this.insertUserDefaultConfigurationContent({
-      user,
-      countryName: country.nombre_pais_en
-    });
-
     const arrayPackages = [...this.dataToInsert.lines.values()].flat().flat();
 
     await Promise.allSettled([
@@ -362,10 +358,12 @@ export class IntegrationManager {
 
   async insertUserDefaultConfigurationContent({
     user,
-    countryName
+    countryName,
+    shipmentDetails
   }: {
     user: Record<string, string | number>;
     countryName: string;
+    shipmentDetails: InsertContentShipmentDetail[];
   }) {
     const idUsuario = user.id_usuario as number;
     const { configurationService, llmAPIService } = this.services;
@@ -396,11 +394,8 @@ export class IntegrationManager {
       return Math.floor(Math.random() * 5) + 1;
     };
 
-    const integrationShipmentDetails = this.dataToInsert.details;
+    const integrationShipmentDetails = shipmentDetails;
     let shipmentContent: UserDefaultConfigurationContent[] | null = null;
-    const userSavedData =
-      (await configurationService.getDefaultProformaConfiguration(idUsuario)) ||
-      [];
 
     if (integrationShipmentDetails) {
       const shipmentContentFromDetails = await Promise.all(
@@ -438,15 +433,22 @@ export class IntegrationManager {
       );
 
       shipmentContent = shipmentContentFromDetails;
-    } else if (userSavedData.length > 0) {
-      shipmentContent = userSavedData;
     } else {
-      const userFakeData =
-        configurationService.getFakeDefaultProformaConfiguration(
-          idUsuario,
-          user.dni as string
-        );
-      shipmentContent = userFakeData;
+      const userSavedData =
+        (await configurationService.getDefaultProformaConfiguration(
+          idUsuario
+        )) || [];
+
+      if (userSavedData.length > 0) {
+        shipmentContent = userSavedData;
+      } else {
+        const userFakeData =
+          configurationService.getFakeDefaultProformaConfiguration(
+            idUsuario,
+            user.dni as string
+          );
+        shipmentContent = userFakeData;
+      }
     }
 
     if (shipmentContent) {

package/package.json

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

package/types/index.ts

@@ -123,7 +123,7 @@ export type ModifiedOrder = {
   telefonoLLegada: string | undefined;
   emailLLegada: string | undefined;
   cantidadContrareembolso: number | null;
-  codigoEnvioExterno: string;
+  codigoEnvioExterno?: string;
   idInternoShopify?: string;
   precio: number | null;
   fechaCreacionExterna?: string | null;
@@ -139,7 +139,7 @@ export type ModifiedOrder = {
   observacionesLLegada?: string;
   observaciones?: string;
   direccionSalidaId?: number | null;
-  sellerAddress?: SellerAddress | null;
+  direccionSalidaPersonalizada?: SellerAddress | null;
 };
 
 export interface ModifiedOrderExtended extends ModifiedOrder {
@@ -469,7 +469,7 @@ export type InsertContentShipmentDetail = {
 
 type InsertContentShipmentExternal = {
   id_envio_temporal_usuario: number;
-  codigo_envio_externo: string;
+  codigo_envio_externo: string | undefined;
   id_usuario: number;
   fecha_hora_creacion: string;
   servicio: Type;