cardus 0.0.38 → 0.0.40

package/dist/index.js

@@ -19,7 +19,7 @@ const dataToInsert = {
     lines: [],
     contents: [],
     details: [],
-    externals: [],
+    externals: []
 };
 class IntegrationManager {
     constructor(params) {
@@ -30,7 +30,7 @@ class IntegrationManager {
                 warehouseId,
                 sellerAddress,
                 idUsuario,
-                isPriority,
+                isPriority
             });
             if (!idEnvioTemporal)
                 throw new Error('Temp shipments could not be created');
@@ -94,7 +94,7 @@ class IntegrationManager {
             countriesService: params.countriesService,
             configurationService: params.configurationService,
             usersService: params.usersService,
-            customizationService: params.customizationService,
+            customizationService: params.customizationService
         };
         this.shipmentType = params.shipmentType;
         this.type = params.type;
@@ -118,7 +118,6 @@ class IntegrationManager {
                 type: this.type
             });
             const checkIsPriorityByDefault = () => __awaiter(this, void 0, void 0, function* () {
-                // TODO sacar esto de aqui, no hay que hacerlo cada vez, con una vale
                 const usuariosGeneiPriority = yield this.services.customizationService.getUsersWithSection(8);
                 const esPotencialmentePriority = usuariosGeneiPriority.some((seccion) => seccion.id_usuario === user.id_usuario ||
                     seccion.tipo_cliente === user.tipo_cliente ||
@@ -143,13 +142,13 @@ class IntegrationManager {
                             defaultAgencyId: agencyId,
                             userId: idUsuario,
                             integrationId: this.shipmentType,
-                            tempShipmentData: parsedOrder,
+                            tempShipmentData: parsedOrder
                         }),
                         warehouseId,
                         sellerAddress,
                         idUsuario,
                         group,
-                        isPriority: isPriorityByDefault,
+                        isPriority: isPriorityByDefault
                     });
                 }),
                 regularExecutionTime: 8000, // ms
@@ -186,7 +185,8 @@ class IntegrationManager {
                 });
             };
             let userConfiguration = null;
-            const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) || [];
+            const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) ||
+                [];
             if (userSavedData.length > 0) {
                 userConfiguration = userSavedData;
             }
@@ -195,7 +195,7 @@ class IntegrationManager {
                 userConfiguration = userFakeData;
             }
             if (userConfiguration && userConfiguration !== null) {
-                tempShimpmentIds.forEach(tempShimpmentId => {
+                tempShimpmentIds.forEach((tempShimpmentId) => {
                     insert(userConfiguration, tempShimpmentId);
                 });
             }
@@ -203,27 +203,30 @@ class IntegrationManager {
     }
     insertQuantityRelatedLines(_a) {
         return __awaiter(this, arguments, void 0, function* ({ orders, idUsuario, crearBulto, estaAgrupado }) {
-            const obtenerBultosYCantidades = orders.map((_b) => __awaiter(this, [_b], void 0, function* ({ idEnvioTemporal, lineas }) {
-                if (!idEnvioTemporal)
+            const createBultoFromLine = (_b) => __awaiter(this, [_b], void 0, function* ({ line, idEnvioTemporal }) {
+                const { bulto, cantidad = 0 } = yield crearBulto({
+                    lineItems: { idEnvioTemporal, line },
+                    idUsuario
+                });
+                if (cantidad === 0)
                     return null;
-                return yield Promise.all(lineas.map((line) => __awaiter(this, void 0, void 0, function* () {
-                    const { bulto, cantidad = 0 } = yield crearBulto({
-                        lineItems: { idEnvioTemporal, line },
-                        idUsuario
-                    });
-                    if (cantidad === 0)
-                        return null;
-                    return { bulto, cantidad, idEnvioTemporal };
-                })));
-            }));
-            const bultosYCantidades = (yield new Promise((res) => __awaiter(this, void 0, void 0, function* () {
-                const bultosYCantidadesAnidados = yield Promise.all(obtenerBultosYCantidades);
-                const bultosYCantidades = bultosYCantidadesAnidados
-                    .flat()
-                    .filter(Boolean);
-                res(bultosYCantidades);
-            })));
-            bultosYCantidades.forEach(({ bulto, cantidad, idEnvioTemporal }) => {
+                return { bulto, cantidad, idEnvioTemporal };
+            });
+            const obtenerBultosYCantidades = [];
+            orders.forEach(({ idEnvioTemporal, lineas }) => {
+                if (!idEnvioTemporal)
+                    return;
+                lineas.forEach((line) => {
+                    const bultoPromise = createBultoFromLine({ line, idEnvioTemporal });
+                    obtenerBultosYCantidades.push(bultoPromise);
+                });
+            });
+            let bultosYCantidades = yield Promise.all(obtenerBultosYCantidades);
+            bultosYCantidades = bultosYCantidades.filter(Boolean);
+            bultosYCantidades.forEach((each) => {
+                if (!each)
+                    return;
+                const { bulto, cantidad, idEnvioTemporal } = each;
                 try {
                     const arrayFake = Array.from({ length: Number(cantidad) });
                     arrayFake.forEach(() => {

package/index.ts

@@ -24,14 +24,16 @@ import {
   IsPriority,
   CustomizationService,
   DataToInsert,
+  InsertContentShipmentLine,
+  Bulto
 } from './types';
 
 const dataToInsert: DataToInsert = {
   lines: [],
   contents: [],
   details: [],
-  externals: [],
-}
+  externals: []
+};
 
 interface Services {
   integrationsService: IntegrationsService;
@@ -69,7 +71,7 @@ export class IntegrationManager {
       countriesService: params.countriesService,
       configurationService: params.configurationService,
       usersService: params.usersService,
-      customizationService: params.customizationService,
+      customizationService: params.customizationService
     };
 
     this.shipmentType = params.shipmentType;
@@ -103,10 +105,14 @@ export class IntegrationManager {
       });
 
     const checkIsPriorityByDefault = async () => {
-      // TODO sacar esto de aqui, no hay que hacerlo cada vez, con una vale
-      const usuariosGeneiPriority = await this.services.customizationService.getUsersWithSection(8);
+      const usuariosGeneiPriority =
+        await this.services.customizationService.getUsersWithSection(8);
       const esPotencialmentePriority = usuariosGeneiPriority.some(
-        (seccion: { id_usuario: any; tipo_cliente: any; id_comercial: any; }) =>
+        (seccion: {
+          id_usuario: number | string;
+          tipo_cliente: number;
+          id_comercial: number | string;
+        }) =>
           seccion.id_usuario === user.id_usuario ||
           seccion.tipo_cliente === user.tipo_cliente ||
           seccion.id_comercial === user.id_comercial
@@ -119,7 +125,7 @@ export class IntegrationManager {
       }
     };
 
-    const isPriorityByDefault = await checkIsPriorityByDefault()
+    const isPriorityByDefault = await checkIsPriorityByDefault();
 
     const insertOrdersResult = await new this.executionManager({
       arrayParams: allOrders,
@@ -134,13 +140,13 @@ export class IntegrationManager {
             defaultAgencyId: agencyId,
             userId: idUsuario,
             integrationId: this.shipmentType,
-            tempShipmentData: parsedOrder,
+            tempShipmentData: parsedOrder
           }),
           warehouseId,
           sellerAddress,
           idUsuario,
           group,
-          isPriority: isPriorityByDefault,
+          isPriority: isPriorityByDefault
         });
       },
       regularExecutionTime: 8000, // ms
@@ -165,10 +171,18 @@ export class IntegrationManager {
         (successfullShipment) => successfullShipment.idEnvioTemporal
       )
     });
-    await integrationsService.insertTempShipmentMultipleLines(dataToInsert.lines);
-    await integrationsService.insertTempShipmentMultipleDetails(dataToInsert.details);
-    await integrationsService.insertTempShipmentMultipleContents(dataToInsert.contents);
-    await integrationsService.insertTempShipmentMultipleExternals(dataToInsert.externals);
+    await integrationsService.insertTempShipmentMultipleLines(
+      dataToInsert.lines
+    );
+    await integrationsService.insertTempShipmentMultipleDetails(
+      dataToInsert.details
+    );
+    await integrationsService.insertTempShipmentMultipleContents(
+      dataToInsert.contents
+    );
+    await integrationsService.insertTempShipmentMultipleExternals(
+      dataToInsert.externals
+    );
 
     return { filteredOrders, insertedTempShipments: successfullShipments };
   }
@@ -177,34 +191,31 @@ export class IntegrationManager {
     user,
     tempShimpmentIds
   }: {
-    user: { id_usuario: number, dni: string };
+    user: { id_usuario: number; dni: string };
     tempShimpmentIds: number[];
   }) {
-    const idUsuario = user.id_usuario
-    const { configurationService } =
-      this.services;
+    const idUsuario = user.id_usuario;
+    const { configurationService } = this.services;
 
     const insert = (
       data: UserDefaultConfigurationContent[],
       tempShimpmentId: number
     ) => {
       data.forEach((tempContent) => {
-          dataToInsert.contents.push({
-            ...tempContent,
-            id_envio: tempShimpmentId
-        });   
-      })
+        dataToInsert.contents.push({
+          ...tempContent,
+          id_envio: tempShimpmentId
+        });
+      });
     };
 
-    let userConfiguration: UserDefaultConfigurationContent[] | any = null;
+    let userConfiguration: UserDefaultConfigurationContent[] | null = null;
     const userSavedData =
-          (await configurationService.getDefaultProformaConfiguration(
-            idUsuario
-          )) || [];
-    if (userSavedData.length > 0){
+      (await configurationService.getDefaultProformaConfiguration(idUsuario)) ||
+      [];
+    if (userSavedData.length > 0) {
       userConfiguration = userSavedData;
-    }
-    else {
+    } else {
       const userFakeData =
         configurationService.getFakeDefaultProformaConfiguration(
           idUsuario,
@@ -212,10 +223,10 @@ export class IntegrationManager {
         );
       userConfiguration = userFakeData;
     }
-    if (userConfiguration && userConfiguration !== null){
-      tempShimpmentIds.forEach(tempShimpmentId => {
+    if (userConfiguration && userConfiguration !== null) {
+      tempShimpmentIds.forEach((tempShimpmentId) => {
         insert(userConfiguration, tempShimpmentId);
-      })
+      });
     }
   }
 
@@ -234,7 +245,7 @@ export class IntegrationManager {
     sellerAddress: SellerAddress;
     idUsuario: number;
     group: Group;
-    isPriority: IsPriority
+    isPriority: IsPriority;
   }): Promise<ModifiedOrderExtended> => {
     const idEnvioTemporal = await this.insertTempShipment({
       order,
@@ -242,7 +253,7 @@ export class IntegrationManager {
       warehouseId,
       sellerAddress,
       idUsuario,
-      isPriority,
+      isPriority
     });
 
     if (!idEnvioTemporal)
@@ -272,7 +283,7 @@ export class IntegrationManager {
     warehouseId: number;
     sellerAddress: SellerAddress;
     idUsuario: number;
-    isPriority: IsPriority
+    isPriority: IsPriority;
   }) => {
     const tempShipmentData = await cookTempShipment({
       order,
@@ -301,7 +312,6 @@ export class IntegrationManager {
     order: ModifiedOrder;
     idEnvioTemporal: number;
   }): undefined => {
-    
     dataToInsert.externals.push({
       id_envio_temporal_usuario: idEnvioTemporal,
       codigo_envio_externo: order.codigoEnvioExterno,
@@ -315,7 +325,7 @@ export class IntegrationManager {
       marketplaceId: order.marketplaceId,
       id_documento_holded: order.idDocumentoHolded,
       tipo_documento_holded: order.tipoDocumentoHolded || ''
-      })
+    });
   };
 
   insertTempShipmentLines = async ({
@@ -336,7 +346,7 @@ export class IntegrationManager {
           ancho: group.width,
           largo: group.length
         }
-      })
+      });
     }
   };
 
@@ -351,36 +361,43 @@ export class IntegrationManager {
     crearBulto: CrearBulto;
     estaAgrupado: boolean;
   }) {
+    type BultoYCantidad = {
+      bulto: Bulto['bulto'];
+      cantidad: Bulto['cantidad'];
+      idEnvioTemporal: number;
+    };
 
-    const obtenerBultosYCantidades = orders.map(
-      async ({ idEnvioTemporal, lineas }) => {
-        if (!idEnvioTemporal) return null;
-        return await Promise.all(
-          lineas.map(async (line) => {
-            const { bulto, cantidad = 0 } = await crearBulto({
-              lineItems: { idEnvioTemporal, line },
-              idUsuario
-            });
-            if (cantidad === 0) return null;
-            return { bulto, cantidad, idEnvioTemporal };
-          })
-        );
-      }
-    );
+    const createBultoFromLine = async ({
+      line,
+      idEnvioTemporal
+    }: {
+      line: InsertContentShipmentLine;
+      idEnvioTemporal: number;
+    }): Promise<BultoYCantidad | null> => {
+      const { bulto, cantidad = 0 } = await crearBulto({
+        lineItems: { idEnvioTemporal, line },
+        idUsuario
+      });
+      if (cantidad === 0) return null;
+      return { bulto, cantidad, idEnvioTemporal };
+    };
 
-    const bultosYCantidades = (await new Promise(async (res) => {
-      const bultosYCantidadesAnidados = await Promise.all(
-        obtenerBultosYCantidades
-      );
+    const obtenerBultosYCantidades: Array<Promise<BultoYCantidad | null>> = [];
 
-      const bultosYCantidades = bultosYCantidadesAnidados
-        .flat()
-        .filter(Boolean);
+    orders.forEach(({ idEnvioTemporal, lineas }) => {
+      if (!idEnvioTemporal) return;
+      lineas.forEach((line) => {
+        const bultoPromise = createBultoFromLine({ line, idEnvioTemporal });
+        obtenerBultosYCantidades.push(bultoPromise);
+      });
+    });
 
-      res(bultosYCantidades);
-    })) as Array<any>;
+    let bultosYCantidades = await Promise.all(obtenerBultosYCantidades);
+    bultosYCantidades = bultosYCantidades.filter(Boolean);
 
-    bultosYCantidades.forEach(({ bulto, cantidad, idEnvioTemporal }) => {
+    bultosYCantidades.forEach((each) => {
+      if (!each) return;
+      const { bulto, cantidad, idEnvioTemporal } = each;
       try {
         const arrayFake = Array.from({ length: Number(cantidad) });
 
@@ -396,10 +413,9 @@ export class IntegrationManager {
             bulto
           });
         });
-
       } catch (e) {
         console.log(e);
       }
     });
   }
-}
+}

package/insertTempShipment/index.ts

@@ -30,7 +30,7 @@ export const cookTempShipment = async ({
   idUsuario: number;
   findNextPickupDate: FindNextPickupDate;
   countriesService: CountriesService;
-  isPriority: IsPriority
+  isPriority: IsPriority;
 }): Promise<Shipment> => {
   let zonaLLegada = {};
   if (order.codigoPaisLLegada)
@@ -54,7 +54,6 @@ export const cookTempShipment = async ({
     mail_salida: sellerAddress.mail
   });
 
-
   const setUbicacionComprador = async (order: ModifiedOrder) => {
     type CompradorLocation = {
       pais_llegada: string | null;
@@ -62,7 +61,6 @@ export const cookTempShipment = async ({
       id_zona_llegada: string | null;
     };
 
-
     const compradorLocation: CompradorLocation = {
       pais_llegada: null,
       provincia_llegada: null,
@@ -93,7 +91,6 @@ export const cookTempShipment = async ({
     return compradorLocation;
   };
 
-
   const setDatosComprador = async (order: ModifiedOrder) => ({
     nom_ape_llegada: order.primerApellidoLLegada
       ? order.nombreLLegada + ' ' + order.primerApellidoLLegada
@@ -113,12 +110,10 @@ export const cookTempShipment = async ({
     mail_llegada: order.emailLLegada || 'no informado'
   });
 
-
   const setReembolso = (order: ModifiedOrder) => {
     return { cantidad_contrareembolso: order.cantidadContrareembolso };
   };
 
-
   const setFechas = async (order: ModifiedOrder) => {
     const date = moment().format('YYYY-MM-DD');
     const beginHour = '09:00';
@@ -179,8 +174,7 @@ export const cookTempShipment = async ({
       ...stepResult,
       priority: isPriority
     };
-
   }, {})) as Shipment;
 
   return dataInsert;
-};
+};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "cardus",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "an integration manager",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "scripts": {
     "build": "rm -rf dist && tsc --build",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "npm run format && npm run build",
     "test": "jest",
     "lint": "eslint --ignore-path .eslintignore --ext .js,.ts && npm run format",
     "format": "prettier --config .prettierrc './**/*.ts' --write"

package/types/index.ts

@@ -77,7 +77,7 @@ export type Bulto = {
 };
 
 export type ModifiedOrder = {
-  lineas: Array<AnyObject>;
+  lineas: Array<InsertContentShipmentLine>;
   codigoPaisLLegada: string | undefined;
   codigoPostalLLegada: string | undefined;
   primerApellidoLLegada: string | undefined;
@@ -182,13 +182,21 @@ export type IntegrationsService = {
     params: UserDefaultConfigurationContent & { id_envio: number }
   ) => Promise<number | false>;
 
-  insertTempShipmentMultipleLines: (lines: DataToInsert["lines"]) => number | false;
+  insertTempShipmentMultipleLines: (
+    lines: DataToInsert['lines']
+  ) => number | false;
 
-  insertTempShipmentMultipleDetails: (details: DataToInsert["details"]) => number | false;
+  insertTempShipmentMultipleDetails: (
+    details: DataToInsert['details']
+  ) => number | false;
 
-  insertTempShipmentMultipleContents: (contents: DataToInsert["contents"]) => number | false;
+  insertTempShipmentMultipleContents: (
+    contents: DataToInsert['contents']
+  ) => number | false;
 
-  insertTempShipmentMultipleExternals: (externals: DataToInsert["externals"]) => number | false;
+  insertTempShipmentMultipleExternals: (
+    externals: DataToInsert['externals']
+  ) => number | false;
 };
 
 export type SellerAddress = {
@@ -269,7 +277,7 @@ export type ConfigurationService = {
   ) => UserDefaultConfigurationContent[];
 };
 
-export type IsPriority = number
+export type IsPriority = number;
 
 export type UsersService = {
   obtenerUsuarioId: (id_usuario: number) => Promise<User>;
@@ -277,7 +285,7 @@ export type UsersService = {
 
 export type CustomizationService = {
   getUsersWithSection: (seccion: number) => Promise<User[]>;
-}
+};
 
 export type FindNextPickupDate = (params: {
   fecha?: string;
@@ -320,28 +328,29 @@ export type DataToInsert = {
   externals: InsertContentShipmentExternal[];
 };
 
-type InsertContentShipmentLine = {
-    id_envio: number,
-    bulto: Pick<Bulto['bulto'], 'peso' | 'alto' | 'ancho' | 'largo'>;
-}
+export type InsertContentShipmentLine = {
+  id_envio: number;
+  bulto: Pick<Bulto['bulto'], 'peso' | 'alto' | 'ancho' | 'largo'>;
+};
 
-type InsertContentShipmentData = 
-  UserDefaultConfigurationContent & { id_envio: number }
+type InsertContentShipmentData = UserDefaultConfigurationContent & {
+  id_envio: number;
+};
 
 type InsertContentShipmentDetail = {
-    id_envio: number;
-    bulto: Bulto['bulto'];
-  }
+  id_envio: number;
+  bulto: Bulto['bulto'];
+};
 
-  type InsertContentShipmentExternal = {
-    id_envio_temporal_usuario: number;
-    codigo_envio_externo: string;
-    id_usuario: number;
-    fecha_hora_creacion: string;
-    servicio: Type;
-    id_interno_shopify?: string;
-    fecha_creacion_externa: string | null;
-    marketplaceId?: string | null;
-    id_documento_holded?: string;
-    tipo_documento_holded?: string;
-  }
+type InsertContentShipmentExternal = {
+  id_envio_temporal_usuario: number;
+  codigo_envio_externo: string;
+  id_usuario: number;
+  fecha_hora_creacion: string;
+  servicio: Type;
+  id_interno_shopify?: string;
+  fecha_creacion_externa: string | null;
+  marketplaceId?: string | null;
+  id_documento_holded?: string;
+  tipo_documento_holded?: string;
+};