cardus 0.0.52 → 0.0.54

package/dist/index.js

@@ -17,28 +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 }) {
-            const idEnvioTemporal = yield this.insertTempShipment({
-                order,
-                agencyId,
-                warehouseId,
-                sellerAddress,
-                idUsuario,
-                isPriority
-            });
-            if (!idEnvioTemporal)
-                throw new Error('Temp shipments could not be created');
-            this.insertExternalShipment({
-                idUsuario,
-                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 }) {
+        this.insertTempShipment = (_a) => __awaiter(this, [_a], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario, isPriority }) {
             const tempShipmentData = yield (0, insertTempShipment_1.cookTempShipment)({
                 order,
                 shipmentType: this.shipmentType,
@@ -68,8 +47,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 +60,7 @@ class IntegrationManager {
                     }
                 });
             }
-        });
+        };
         this.services = {
             integrationsService: params.integrationsService,
             addressesService: params.addressesService,
@@ -106,7 +85,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
@@ -137,7 +115,7 @@ class IntegrationManager {
                     const parsedOrder = yield modificarOrdenOriginal({
                         originalOrder: order
                     });
-                    return this.insertOrder({
+                    const idEnvioTemporal = yield this.insertTempShipment({
                         order: parsedOrder,
                         agencyId: yield this.getAgencyIdForTempShipment({
                             defaultAgencyId: agencyId,
@@ -149,9 +127,16 @@ class IntegrationManager {
                         warehouseId,
                         sellerAddress,
                         idUsuario,
-                        group,
                         isPriority: isPriorityByDefault
                     });
+                    if (!idEnvioTemporal) {
+                        throw new Error('Temp shipments could not be created');
+                    }
+                    this.insertExternalShipment({
+                        idUsuario,
+                        order: parsedOrder,
+                        idEnvioTemporal
+                    });
                 }),
                 regularExecutionTime: 8000, // ms
                 initialBatchQuantity: 5 // de cinco en cinco
@@ -164,7 +149,7 @@ class IntegrationManager {
                 orders: successfullShipments,
                 idUsuario,
                 crearBulto,
-                estaAgrupado
+                group
             });
             yield this.insertUserDefaultConfigurationContent({
                 user,
@@ -206,15 +191,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, forzarAgrupamientoDeLinea } = result;
                 if (cantidad && bulto) {
-                    return { bulto, cantidad, idEnvioTemporal };
+                    return {
+                        bulto,
+                        cantidad,
+                        idEnvioTemporal,
+                        forzarAgrupamientoDeLinea: !!forzarAgrupamientoDeLinea
+                    };
                 }
                 return null;
             });
@@ -222,6 +213,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);
@@ -232,22 +226,28 @@ class IntegrationManager {
             bultosYCantidades.forEach((each) => {
                 if (!each)
                     return;
-                const { bulto, cantidad, idEnvioTemporal } = each;
+                const { bulto, cantidad, idEnvioTemporal, forzarAgrupamientoDeLinea } = each;
                 try {
+                    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
                     });
-                    arrayFake.forEach(() => {
-                        if (!estaAgrupado) {
+                    if (!grouped && !forzarAgrupamientoDeLinea) {
+                        arrayFake.forEach(() => {
                             this.dataToInsert.lines.push({
                                 id_envio: idEnvioTemporal,
                                 bulto
                             });
-                        }
-                    });
+                        });
+                    }
                 }
                 catch (e) {
                     console.log(e);

package/dist/insertTempShipment/index.js

@@ -106,13 +106,17 @@ const cookTempShipment = (_a) => __awaiter(void 0, [_a], void 0, function* ({ or
         id_almacen: warehouseId,
         agencia_envio_integracion: order.agenciaEnvioIntegracion
     });
+    const setReferenciaCliente = (order) => ({
+        referencia_cliente: order.referenciaCliente || null
+    });
     const setters = [
         setDatosVendedor,
         setDatosComprador,
         setUbicacionComprador,
         setReembolso,
         setFechas,
-        setBultos
+        setBultos,
+        setReferenciaCliente
     ];
     const dataInsert = (yield setters.reduce((acc, curr) => __awaiter(void 0, void 0, void 0, function* () {
         const accumulated = yield acc;

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 =
@@ -140,7 +139,7 @@ export class IntegrationManager {
           originalOrder: order
         });
 
-        return this.insertOrder({
+        const idEnvioTemporal = await this.insertTempShipment({
           order: parsedOrder,
           agencyId: await this.getAgencyIdForTempShipment({
             defaultAgencyId: agencyId,
@@ -152,9 +151,18 @@ export class IntegrationManager {
           warehouseId,
           sellerAddress,
           idUsuario,
-          group,
           isPriority: isPriorityByDefault
         });
+
+        if (!idEnvioTemporal) {
+          throw new Error('Temp shipments could not be created');
+        }
+
+        this.insertExternalShipment({
+          idUsuario,
+          order: parsedOrder,
+          idEnvioTemporal
+        });
       },
       regularExecutionTime: 8000, // ms
       initialBatchQuantity: 5 // de cinco en cinco
@@ -169,7 +177,7 @@ export class IntegrationManager {
       orders: successfullShipments,
       idUsuario,
       crearBulto,
-      estaAgrupado
+      group
     });
 
     await this.insertUserDefaultConfigurationContent({
@@ -239,46 +247,6 @@ export class IntegrationManager {
     }
   }
 
-  insertOrder = async ({
-    order,
-    agencyId,
-    warehouseId,
-    sellerAddress,
-    idUsuario,
-    group,
-    isPriority
-  }: {
-    order: ModifiedOrder;
-    agencyId: number;
-    warehouseId: number;
-    sellerAddress: SellerAddress;
-    idUsuario: number;
-    group: Group;
-    isPriority: IsPriority;
-  }): Promise<ModifiedOrderExtended> => {
-    const idEnvioTemporal = await this.insertTempShipment({
-      order,
-      agencyId,
-      warehouseId,
-      sellerAddress,
-      idUsuario,
-      isPriority
-    });
-
-    if (!idEnvioTemporal)
-      throw new Error('Temp shipments could not be created');
-
-    this.insertExternalShipment({
-      idUsuario,
-      order,
-      idEnvioTemporal
-    });
-
-    const grouped = Number(group?.grouped === 1);
-    if (grouped) await this.insertTempShipmentLines({ idEnvioTemporal, group });
-    return Object.assign(order, { idEnvioTemporal });
-  };
-
   insertTempShipment = async ({
     order,
     agencyId,
@@ -337,15 +305,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,
@@ -363,19 +330,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;
+      forzarAgrupamientoDeLinea: boolean;
     };
 
+    const grouped = Number(group?.grouped === 1);
+
     const createBultoFromLine = async ({
       line,
       idEnvioTemporal
@@ -387,10 +357,15 @@ export class IntegrationManager {
         lineItems: { idEnvioTemporal, line },
         idUsuario
       });
-      const { bulto, cantidad } = result;
+      const { bulto, cantidad, forzarAgrupamientoDeLinea } = result;
 
       if (cantidad && bulto) {
-        return { bulto, cantidad, idEnvioTemporal };
+        return {
+          bulto,
+          cantidad,
+          idEnvioTemporal,
+          forzarAgrupamientoDeLinea: !!forzarAgrupamientoDeLinea
+        };
       }
       return null;
     };
@@ -399,6 +374,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);
@@ -410,8 +390,16 @@ export class IntegrationManager {
 
     bultosYCantidades.forEach((each) => {
       if (!each) return;
-      const { bulto, cantidad, idEnvioTemporal } = each;
+      const { bulto, cantidad, idEnvioTemporal, forzarAgrupamientoDeLinea } =
+        each;
       try {
+        if (!grouped && forzarAgrupamientoDeLinea) {
+          this.dataToInsert.lines.push({
+            id_envio: idEnvioTemporal,
+            bulto
+          });
+        }
+
         const arrayFake = Array.from({ length: Number(cantidad) });
 
         this.dataToInsert.details.push({
@@ -420,14 +408,14 @@ export class IntegrationManager {
           cantidad
         });
 
-        arrayFake.forEach(() => {
-          if (!estaAgrupado) {
+        if (!grouped && !forzarAgrupamientoDeLinea) {
+          arrayFake.forEach(() => {
             this.dataToInsert.lines.push({
               id_envio: idEnvioTemporal,
               bulto
             });
-          }
-        });
+          });
+        }
       } catch (e) {
         console.log(e);
       }

package/insertTempShipment/index.ts

@@ -154,13 +154,18 @@ export const cookTempShipment = async ({
     agencia_envio_integracion: order.agenciaEnvioIntegracion
   });
 
+  const setReferenciaCliente = (order: ModifiedOrder) => ({
+    referencia_cliente: order.referenciaCliente || null
+  });
+
   const setters = [
     setDatosVendedor,
     setDatosComprador,
     setUbicacionComprador,
     setReembolso,
     setFechas,
-    setBultos
+    setBultos,
+    setReferenciaCliente
   ];
 
   const dataInsert = (await setters.reduce(async (acc, curr) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cardus",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "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;
+  forzarAgrupamientoDeLinea: boolean;
 };
 
 export type ModifiedOrder = {
@@ -117,6 +118,7 @@ export type ModifiedOrder = {
   isPriority: 0 | 1;
   idCarrier?: number | null;
   agenciaEnvioIntegracion: string | null;
+  referenciaCliente?: string;
 };
 
 export interface ModifiedOrderExtended extends ModifiedOrder {
@@ -128,7 +130,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;
@@ -173,7 +175,10 @@ export type IntegrationsService = {
     idUsuario: number
   ) => Promise<boolean>;
 
-  insertTempShipment: (params: Shipment, check?: boolean) => number | false;
+  insertTempShipment: (
+    params: Shipment,
+    check?: boolean
+  ) => Promise<number | false>;
 
   insertExternalShipment: (params: {
     id_envio_temporal_usuario: number;