cardus 0.0.51 → 0.0.53

package/dist/index.js

@@ -17,7 +17,7 @@ const moment_1 = __importDefault(require("moment"));
 const insertTempShipment_1 = require("./insertTempShipment");
 class IntegrationManager {
     constructor(params) {
-        this.insertOrder = (_a) => __awaiter(this, [_a], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario, group, isPriority }) {
+        this.insertOrder = (_a) => __awaiter(this, [_a], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario, isPriority }) {
             const idEnvioTemporal = yield this.insertTempShipment({
                 order,
                 agencyId,
@@ -33,9 +33,6 @@ class IntegrationManager {
                 order,
                 idEnvioTemporal
             });
-            const grouped = Number((group === null || group === void 0 ? void 0 : group.grouped) === 1);
-            if (grouped)
-                yield this.insertTempShipmentLines({ idEnvioTemporal, group });
             return Object.assign(order, { idEnvioTemporal });
         });
         this.insertTempShipment = (_b) => __awaiter(this, [_b], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario, isPriority }) {
@@ -68,8 +65,8 @@ class IntegrationManager {
                 tipo_documento_holded: order.tipoDocumentoHolded || ''
             });
         };
-        this.insertTempShipmentLines = (_c) => __awaiter(this, [_c], void 0, function* ({ idEnvioTemporal, group }) {
-            const grouped = group.grouped === 1 || group.grouped === '1';
+        this.insertTempShipmentGroupLine = ({ idEnvioTemporal, group }) => {
+            const grouped = (group === null || group === void 0 ? void 0 : group.grouped) === 1 || (group === null || group === void 0 ? void 0 : group.grouped) === '1';
             if (grouped) {
                 this.dataToInsert.lines.push({
                     id_envio: idEnvioTemporal,
@@ -81,7 +78,7 @@ class IntegrationManager {
                     }
                 });
             }
-        });
+        };
         this.services = {
             integrationsService: params.integrationsService,
             addressesService: params.addressesService,
@@ -106,7 +103,6 @@ class IntegrationManager {
     insertTempShipments(_a) {
         return __awaiter(this, arguments, void 0, function* ({ payload: { idUsuario, agencyId, addressId, warehouseId, group }, fetchAllOrders, crearBulto, modificarOrdenOriginal }) {
             const user = yield this.services.usersService.obtenerUsuarioId(idUsuario);
-            const estaAgrupado = Number(group === null || group === void 0 ? void 0 : group.grouped) === 1;
             const { integrationsService, addressesService } = this.services;
             // esto hay que pasarlo ya en los parametros
             const sellerAddress = warehouseId > 0
@@ -143,12 +139,12 @@ class IntegrationManager {
                             defaultAgencyId: agencyId,
                             userId: idUsuario,
                             integrationId: this.integrationType,
-                            tempShipmentData: parsedOrder
+                            tempShipmentData: parsedOrder,
+                            sellerAddress
                         }),
                         warehouseId,
                         sellerAddress,
                         idUsuario,
-                        group,
                         isPriority: isPriorityByDefault
                     });
                 }),
@@ -163,7 +159,7 @@ class IntegrationManager {
                 orders: successfullShipments,
                 idUsuario,
                 crearBulto,
-                estaAgrupado
+                group
             });
             yield this.insertUserDefaultConfigurationContent({
                 user,
@@ -205,15 +201,21 @@ class IntegrationManager {
         });
     }
     insertQuantityRelatedLines(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ orders, idUsuario, crearBulto, estaAgrupado }) {
+        return __awaiter(this, arguments, void 0, function* ({ orders, idUsuario, crearBulto, group }) {
+            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({
                     lineItems: { idEnvioTemporal, line },
                     idUsuario
                 });
-                const { bulto, cantidad } = result;
+                const { bulto, cantidad, forzarAgrupamiento } = result;
                 if (cantidad && bulto) {
-                    return { bulto, cantidad, idEnvioTemporal };
+                    return {
+                        bulto,
+                        cantidad,
+                        idEnvioTemporal,
+                        forzarAgrupamiento: !!forzarAgrupamiento
+                    };
                 }
                 return null;
             });
@@ -221,6 +223,9 @@ class IntegrationManager {
             orders.forEach(({ idEnvioTemporal, lineas }) => {
                 if (!idEnvioTemporal)
                     return;
+                if (grouped) {
+                    this.insertTempShipmentGroupLine({ idEnvioTemporal, group });
+                }
                 lineas.forEach((line) => {
                     const bultoPromise = createBultoFromLine({ line, idEnvioTemporal });
                     obtenerBultosYCantidades.push(bultoPromise);
@@ -231,22 +236,28 @@ class IntegrationManager {
             bultosYCantidades.forEach((each) => {
                 if (!each)
                     return;
-                const { bulto, cantidad, idEnvioTemporal } = each;
+                const { bulto, cantidad, idEnvioTemporal, forzarAgrupamiento } = each;
                 try {
+                    if (!grouped && forzarAgrupamiento) {
+                        this.dataToInsert.lines.push({
+                            id_envio: idEnvioTemporal,
+                            bulto
+                        });
+                    }
                     const arrayFake = Array.from({ length: Number(cantidad) });
                     this.dataToInsert.details.push({
                         id_envio: idEnvioTemporal,
                         bulto,
                         cantidad
                     });
-                    arrayFake.forEach(() => {
-                        if (!estaAgrupado) {
+                    if (!grouped && !forzarAgrupamiento) {
+                        arrayFake.forEach(() => {
                             this.dataToInsert.lines.push({
                                 id_envio: idEnvioTemporal,
                                 bulto
                             });
-                        }
-                    });
+                        });
+                    }
                 }
                 catch (e) {
                     console.log(e);

package/index.ts

@@ -94,7 +94,6 @@ export class IntegrationManager {
     modificarOrdenOriginal
   }: InsertParams) {
     const user = await this.services.usersService.obtenerUsuarioId(idUsuario);
-    const estaAgrupado = Number(group?.grouped) === 1;
     const { integrationsService, addressesService } = this.services;
     // esto hay que pasarlo ya en los parametros
     const sellerAddress =
@@ -146,12 +145,12 @@ export class IntegrationManager {
             defaultAgencyId: agencyId,
             userId: idUsuario,
             integrationId: this.integrationType,
-            tempShipmentData: parsedOrder
+            tempShipmentData: parsedOrder,
+            sellerAddress
           }),
           warehouseId,
           sellerAddress,
           idUsuario,
-          group,
           isPriority: isPriorityByDefault
         });
       },
@@ -168,7 +167,7 @@ export class IntegrationManager {
       orders: successfullShipments,
       idUsuario,
       crearBulto,
-      estaAgrupado
+      group
     });
 
     await this.insertUserDefaultConfigurationContent({
@@ -244,7 +243,6 @@ export class IntegrationManager {
     warehouseId,
     sellerAddress,
     idUsuario,
-    group,
     isPriority
   }: {
     order: ModifiedOrder;
@@ -252,7 +250,6 @@ export class IntegrationManager {
     warehouseId: number;
     sellerAddress: SellerAddress;
     idUsuario: number;
-    group: Group;
     isPriority: IsPriority;
   }): Promise<ModifiedOrderExtended> => {
     const idEnvioTemporal = await this.insertTempShipment({
@@ -273,8 +270,6 @@ export class IntegrationManager {
       idEnvioTemporal
     });
 
-    const grouped = Number(group?.grouped === 1);
-    if (grouped) await this.insertTempShipmentLines({ idEnvioTemporal, group });
     return Object.assign(order, { idEnvioTemporal });
   };
 
@@ -336,15 +331,14 @@ export class IntegrationManager {
     });
   };
 
-  insertTempShipmentLines = async ({
+  insertTempShipmentGroupLine = ({
     idEnvioTemporal,
     group
   }: {
     idEnvioTemporal: number;
     group: Group;
   }) => {
-    const grouped = group.grouped === 1 || group.grouped === '1';
-
+    const grouped = group?.grouped === 1 || group?.grouped === '1';
     if (grouped) {
       this.dataToInsert.lines.push({
         id_envio: idEnvioTemporal,
@@ -362,19 +356,22 @@ export class IntegrationManager {
     orders,
     idUsuario,
     crearBulto,
-    estaAgrupado
+    group
   }: {
     orders: ModifiedOrderExtended[];
     idUsuario: number;
     crearBulto: CrearBulto;
-    estaAgrupado: boolean;
+    group: Group;
   }) {
     type BultoYCantidad = {
       bulto: Bulto['bulto'];
       cantidad: Bulto['cantidad'];
       idEnvioTemporal: number;
+      forzarAgrupamiento: boolean;
     };
 
+    const grouped = Number(group?.grouped === 1);
+
     const createBultoFromLine = async ({
       line,
       idEnvioTemporal
@@ -386,10 +383,15 @@ export class IntegrationManager {
         lineItems: { idEnvioTemporal, line },
         idUsuario
       });
-      const { bulto, cantidad } = result;
+      const { bulto, cantidad, forzarAgrupamiento } = result;
 
       if (cantidad && bulto) {
-        return { bulto, cantidad, idEnvioTemporal };
+        return {
+          bulto,
+          cantidad,
+          idEnvioTemporal,
+          forzarAgrupamiento: !!forzarAgrupamiento
+        };
       }
       return null;
     };
@@ -398,6 +400,11 @@ export class IntegrationManager {
 
     orders.forEach(({ idEnvioTemporal, lineas }) => {
       if (!idEnvioTemporal) return;
+
+      if (grouped) {
+        this.insertTempShipmentGroupLine({ idEnvioTemporal, group });
+      }
+
       lineas.forEach((line) => {
         const bultoPromise = createBultoFromLine({ line, idEnvioTemporal });
         obtenerBultosYCantidades.push(bultoPromise);
@@ -409,8 +416,15 @@ export class IntegrationManager {
 
     bultosYCantidades.forEach((each) => {
       if (!each) return;
-      const { bulto, cantidad, idEnvioTemporal } = each;
+      const { bulto, cantidad, idEnvioTemporal, forzarAgrupamiento } = each;
       try {
+        if (!grouped && forzarAgrupamiento) {
+          this.dataToInsert.lines.push({
+            id_envio: idEnvioTemporal,
+            bulto
+          });
+        }
+
         const arrayFake = Array.from({ length: Number(cantidad) });
 
         this.dataToInsert.details.push({
@@ -419,14 +433,14 @@ export class IntegrationManager {
           cantidad
         });
 
-        arrayFake.forEach(() => {
-          if (!estaAgrupado) {
+        if (!grouped && !forzarAgrupamiento) {
+          arrayFake.forEach(() => {
             this.dataToInsert.lines.push({
               id_envio: idEnvioTemporal,
               bulto
             });
-          }
-        });
+          });
+        }
       } catch (e) {
         console.log(e);
       }

package/package.json

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

package/types/index.ts

@@ -93,6 +93,7 @@ export type Bulto = {
     nombre_producto: string | null;
   };
   cantidad: number;
+  forzarAgrupamiento: boolean;
 };
 
 export type ModifiedOrder = {
@@ -128,7 +129,7 @@ type FetchAllOrders = () => Promise<OriginalOrder[]>;
 export type CrearBulto = (params: {
   lineItems: { idEnvioTemporal: number; line: AnyObject };
   idUsuario: number;
-}) => Promise<Bulto | { bulto: null; cantidad: 0 }>;
+}) => Promise<Bulto>;
 
 type ModificarOrdenOriginal = (param: {
   originalOrder: OriginalOrder;
@@ -334,6 +335,7 @@ export type GetAgencyIdForTempShipment = (params: {
   userId: number;
   integrationId: number;
   tempShipmentData: ModifiedOrder;
+  sellerAddress: SellerAddress;
 }) => Promise<number>;
 
 export type ExecutionManager = {