cardus 0.0.54 → 0.0.56

package/dist/index.js

@@ -117,13 +117,7 @@ class IntegrationManager {
                     });
                     const idEnvioTemporal = yield this.insertTempShipment({
                         order: parsedOrder,
-                        agencyId: yield this.getAgencyIdForTempShipment({
-                            defaultAgencyId: agencyId,
-                            userId: idUsuario,
-                            integrationId: this.integrationType,
-                            tempShipmentData: parsedOrder,
-                            sellerAddress
-                        }),
+                        agencyId,
                         warehouseId,
                         sellerAddress,
                         idUsuario,
@@ -137,6 +131,7 @@ class IntegrationManager {
                         order: parsedOrder,
                         idEnvioTemporal
                     });
+                    return Object.assign(parsedOrder, { idEnvioTemporal, agencyId });
                 }),
                 regularExecutionTime: 8000, // ms
                 initialBatchQuantity: 5 // de cinco en cinco
@@ -155,10 +150,31 @@ class IntegrationManager {
                 user,
                 tempShimpmentIds: successfullShipments.map((successfullShipment) => successfullShipment.idEnvioTemporal)
             });
-            yield integrationsService.insertTempShipmentMultipleLines(this.dataToInsert.lines);
-            yield integrationsService.insertTempShipmentMultipleDetails(this.dataToInsert.details);
-            yield integrationsService.insertTempShipmentMultipleContents(this.dataToInsert.contents);
-            yield integrationsService.insertTempShipmentMultipleExternals(this.dataToInsert.externals);
+            // modificamos la agencia, cuando se tenga que hacer
+            successfullShipments.forEach((order) => __awaiter(this, void 0, void 0, function* () {
+                const shipmentDetails = this.dataToInsert.details.filter(({ id_envio }) => {
+                    return id_envio === order.idEnvioTemporal;
+                });
+                const newAgencyId = yield this.getAgencyIdForTempShipment({
+                    defaultAgencyId: agencyId,
+                    userId: idUsuario,
+                    integrationId: this.integrationType,
+                    tempShipmentData: order,
+                    sellerAddress,
+                    shipmentDetails
+                });
+                if (newAgencyId !== order.agencyId) {
+                    integrationsService.updateTempShimpment({
+                        id_envio: order.idEnvioTemporal,
+                        id_usuario: idUsuario,
+                        id_agencia: newAgencyId
+                    });
+                }
+            }));
+            integrationsService.insertTempShipmentMultipleLines(this.dataToInsert.lines);
+            integrationsService.insertTempShipmentMultipleDetails(this.dataToInsert.details);
+            integrationsService.insertTempShipmentMultipleContents(this.dataToInsert.contents);
+            integrationsService.insertTempShipmentMultipleExternals(this.dataToInsert.externals);
             return { filteredOrders, insertedTempShipments: successfullShipments };
         });
     }
@@ -192,6 +208,12 @@ class IntegrationManager {
     }
     insertQuantityRelatedLines(_a) {
         return __awaiter(this, arguments, void 0, function* ({ orders, idUsuario, crearBulto, group }) {
+            /*
+             basicamente la logica es:
+             1 - si esta agrupado, crea una linea por cada pedido
+             2 - si "forzarAgrupamientoDeLinea" es true, se crea una linea por cada linea
+             3- si NO esta agrupado y "forzarAgrupamientoDeLinea" NO es true, se crea una linea por cada unidad de cada linea
+            */
             const grouped = Number((group === null || group === void 0 ? void 0 : group.grouped) === 1);
             const createBultoFromLine = (_b) => __awaiter(this, [_b], void 0, function* ({ line, idEnvioTemporal }) {
                 const result = yield crearBulto({
@@ -228,19 +250,19 @@ class IntegrationManager {
                     return;
                 const { bulto, cantidad, idEnvioTemporal, forzarAgrupamientoDeLinea } = each;
                 try {
+                    this.dataToInsert.details.push({
+                        id_envio: idEnvioTemporal,
+                        bulto,
+                        cantidad
+                    });
                     if (!grouped && forzarAgrupamientoDeLinea) {
                         this.dataToInsert.lines.push({
                             id_envio: idEnvioTemporal,
                             bulto
                         });
                     }
-                    const arrayFake = Array.from({ length: Number(cantidad) });
-                    this.dataToInsert.details.push({
-                        id_envio: idEnvioTemporal,
-                        bulto,
-                        cantidad
-                    });
                     if (!grouped && !forzarAgrupamientoDeLinea) {
+                        const arrayFake = Array.from({ length: Number(cantidad) });
                         arrayFake.forEach(() => {
                             this.dataToInsert.lines.push({
                                 id_envio: idEnvioTemporal,

package/index.ts

@@ -141,13 +141,7 @@ export class IntegrationManager {
 
         const idEnvioTemporal = await this.insertTempShipment({
           order: parsedOrder,
-          agencyId: await this.getAgencyIdForTempShipment({
-            defaultAgencyId: agencyId,
-            userId: idUsuario,
-            integrationId: this.integrationType,
-            tempShipmentData: parsedOrder,
-            sellerAddress
-          }),
+          agencyId,
           warehouseId,
           sellerAddress,
           idUsuario,
@@ -163,6 +157,8 @@ export class IntegrationManager {
           order: parsedOrder,
           idEnvioTemporal
         });
+
+        return Object.assign(parsedOrder, { idEnvioTemporal, agencyId });
       },
       regularExecutionTime: 8000, // ms
       initialBatchQuantity: 5 // de cinco en cinco
@@ -171,7 +167,10 @@ export class IntegrationManager {
     const successfullShipments = insertOrdersResult
       .filter(Boolean)
       .filter((each) => each.status === 'fulfilled')
-      .map((each) => each.value);
+      .map((each) => each.value) as (ModifiedOrder & {
+      idEnvioTemporal: number;
+      agencyId: number;
+    })[];
 
     await this.insertQuantityRelatedLines({
       orders: successfullShipments,
@@ -186,16 +185,44 @@ export class IntegrationManager {
         (successfullShipment) => successfullShipment.idEnvioTemporal
       )
     });
-    await integrationsService.insertTempShipmentMultipleLines(
+
+    // modificamos la agencia, cuando se tenga que hacer
+
+    successfullShipments.forEach(async (order) => {
+      const shipmentDetails = this.dataToInsert.details.filter(
+        ({ id_envio }) => {
+          return id_envio === order.idEnvioTemporal;
+        }
+      );
+
+      const newAgencyId = await this.getAgencyIdForTempShipment({
+        defaultAgencyId: agencyId,
+        userId: idUsuario,
+        integrationId: this.integrationType,
+        tempShipmentData: order,
+        sellerAddress,
+        shipmentDetails
+      });
+
+      if (newAgencyId !== order.agencyId) {
+        integrationsService.updateTempShimpment({
+          id_envio: order.idEnvioTemporal,
+          id_usuario: idUsuario,
+          id_agencia: newAgencyId
+        });
+      }
+    });
+
+    integrationsService.insertTempShipmentMultipleLines(
       this.dataToInsert.lines
     );
-    await integrationsService.insertTempShipmentMultipleDetails(
+    integrationsService.insertTempShipmentMultipleDetails(
       this.dataToInsert.details
     );
-    await integrationsService.insertTempShipmentMultipleContents(
+    integrationsService.insertTempShipmentMultipleContents(
       this.dataToInsert.contents
     );
-    await integrationsService.insertTempShipmentMultipleExternals(
+    integrationsService.insertTempShipmentMultipleExternals(
       this.dataToInsert.externals
     );
 
@@ -344,6 +371,13 @@ export class IntegrationManager {
       forzarAgrupamientoDeLinea: boolean;
     };
 
+    /*
+     basicamente la logica es: 
+     1 - si esta agrupado, crea una linea por cada pedido
+     2 - si "forzarAgrupamientoDeLinea" es true, se crea una linea por cada linea
+     3- si NO esta agrupado y "forzarAgrupamientoDeLinea" NO es true, se crea una linea por cada unidad de cada linea
+    */
+
     const grouped = Number(group?.grouped === 1);
 
     const createBultoFromLine = async ({
@@ -393,6 +427,12 @@ export class IntegrationManager {
       const { bulto, cantidad, idEnvioTemporal, forzarAgrupamientoDeLinea } =
         each;
       try {
+        this.dataToInsert.details.push({
+          id_envio: idEnvioTemporal,
+          bulto,
+          cantidad
+        });
+
         if (!grouped && forzarAgrupamientoDeLinea) {
           this.dataToInsert.lines.push({
             id_envio: idEnvioTemporal,
@@ -400,15 +440,9 @@ export class IntegrationManager {
           });
         }
 
-        const arrayFake = Array.from({ length: Number(cantidad) });
-
-        this.dataToInsert.details.push({
-          id_envio: idEnvioTemporal,
-          bulto,
-          cantidad
-        });
-
         if (!grouped && !forzarAgrupamientoDeLinea) {
+          const arrayFake = Array.from({ length: Number(cantidad) });
+
           arrayFake.forEach(() => {
             this.dataToInsert.lines.push({
               id_envio: idEnvioTemporal,

package/package.json

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

package/types/index.ts

@@ -222,6 +222,15 @@ export type IntegrationsService = {
   insertTempShipmentMultipleExternals: (
     externals: DataToInsert['externals']
   ) => number | false;
+  updateTempShimpment: ({
+    id_envio,
+    id_usuario,
+    id_agencia
+  }: {
+    id_envio: number;
+    id_usuario: number;
+    id_agencia: number;
+  }) => Promise<boolean>;
 };
 
 export type SellerAddress = {
@@ -340,6 +349,7 @@ export type GetAgencyIdForTempShipment = (params: {
   integrationId: number;
   tempShipmentData: ModifiedOrder;
   sellerAddress: SellerAddress;
+  shipmentDetails: InsertContentShipmentDetail[];
 }) => Promise<number>;
 
 export type ExecutionManager = {