cardus 0.0.33 → 0.0.35

package/dist/index.js

@@ -16,11 +16,10 @@ exports.IntegrationManager = void 0;
 const moment_1 = __importDefault(require("moment"));
 const insertTempShipment_1 = require("./insertTempShipment");
 const dataToInsert = {
-    tempShipment: [],
     lines: [],
-    content: [],
+    contents: [],
     details: [],
-    external: [],
+    externals: [],
 };
 class IntegrationManager {
     constructor(params) {
@@ -35,7 +34,7 @@ class IntegrationManager {
             });
             if (!idEnvioTemporal)
                 throw new Error('Temp shipments could not be created');
-            yield this.insertExternalShipment({
+            this.insertExternalShipment({
                 idUsuario,
                 order,
                 idEnvioTemporal
@@ -59,8 +58,8 @@ class IntegrationManager {
             });
             return yield this.services.integrationsService.insertTempShipment(tempShipmentData);
         });
-        this.insertExternalShipment = (_c) => __awaiter(this, [_c], void 0, function* ({ idUsuario, order, idEnvioTemporal }) {
-            const idEnvioExterno = yield this.services.integrationsService.insertExternalShipment({
+        this.insertExternalShipment = ({ idUsuario, order, idEnvioTemporal }) => {
+            dataToInsert.externals.push({
                 id_envio_temporal_usuario: idEnvioTemporal,
                 codigo_envio_externo: order.codigoEnvioExterno,
                 id_usuario: idUsuario,
@@ -74,12 +73,11 @@ class IntegrationManager {
                 id_documento_holded: order.idDocumentoHolded,
                 tipo_documento_holded: order.tipoDocumentoHolded || ''
             });
-            return idEnvioExterno;
-        });
-        this.insertTempShipmentLines = (_d) => __awaiter(this, [_d], void 0, function* ({ idEnvioTemporal, group }) {
+        };
+        this.insertTempShipmentLines = (_c) => __awaiter(this, [_c], void 0, function* ({ idEnvioTemporal, group }) {
             const grouped = group.grouped === 1 || group.grouped === '1';
-            if (grouped)
-                yield this.services.integrationsService.insertTempShipmentLines({
+            if (grouped) {
+                dataToInsert.lines.push({
                     id_envio: idEnvioTemporal,
                     bulto: {
                         peso: group.weight,
@@ -88,6 +86,7 @@ class IntegrationManager {
                         largo: group.length
                     }
                 });
+            }
         });
         this.services = {
             integrationsService: params.integrationsService,
@@ -119,6 +118,7 @@ class IntegrationManager {
                 type: this.type
             });
             const isPriorityByDefault = () => __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 ||
@@ -136,9 +136,6 @@ class IntegrationManager {
                     const parsedOrder = yield modificarOrdenOriginal({
                         originalOrder: order
                     });
-                    const duplicatedTempShipment = yield integrationsService.checkDuplicateTempShipment(parsedOrder.codigoEnvioExterno, idUsuario);
-                    if (duplicatedTempShipment)
-                        throw new Error('Envio Duplicado');
                     return this.insertOrder({
                         order: parsedOrder,
                         agencyId: yield this.getAgencyIdForTempShipment({
@@ -171,39 +168,40 @@ class IntegrationManager {
                 user,
                 tempShimpmentIds: successfullShipments.map((successfullShipment) => successfullShipment.idEnvioTemporal)
             });
+            yield integrationsService.insertTempShipmentMultipleLines(dataToInsert.lines);
+            yield integrationsService.insertTempShipmentMultipleDetails(dataToInsert.details);
+            yield integrationsService.insertTempShipmentMultipleContents(dataToInsert.contents);
+            yield integrationsService.insertTempShipmentMultipleExternals(dataToInsert.externals);
             return { filteredOrders, insertedTempShipments: successfullShipments };
         });
     }
     insertUserDefaultConfigurationContent(_a) {
         return __awaiter(this, arguments, void 0, function* ({ user, tempShimpmentIds }) {
             const idUsuario = user.id_usuario;
-            const { usersService, configurationService, integrationsService } = this.services;
-            const insert = (data, tempShimpmentId) => __awaiter(this, void 0, void 0, function* () {
-                return Promise.allSettled(data.map((tempContent) => __awaiter(this, void 0, void 0, function* () {
-                    yield integrationsService.insertTempContent(Object.assign(Object.assign({}, tempContent), { id_envio: tempShimpmentId }));
-                })));
-            });
-            const insertOrdersResult = yield new this.executionManager({
-                arrayParams: tempShimpmentIds,
-                executable: (order) => __awaiter(this, void 0, void 0, function* () {
-                    const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) || [];
-                    if (userSavedData.length > 0) {
-                        yield insert(userSavedData, order);
-                    }
-                    else {
-                        const userFakeData = configurationService.getFakeDefaultProformaConfiguration(idUsuario, user.dni);
-                        yield insert(userFakeData, order);
-                    }
-                }),
-                regularExecutionTime: 100, // ms
-                initialBatchQuantity: 5 // de cinco en cinco
-            }).upload();
+            const { configurationService } = this.services;
+            const insert = (data, tempShimpmentId) => {
+                data.forEach((tempContent) => {
+                    dataToInsert.contents.push(Object.assign(Object.assign({}, tempContent), { id_envio: tempShimpmentId }));
+                });
+            };
+            let userConfiguration = null;
+            const userSavedData = (yield configurationService.getDefaultProformaConfiguration(idUsuario)) || [];
+            if (userSavedData.length === 0) {
+                userConfiguration = userSavedData;
+            }
+            else {
+                const userFakeData = configurationService.getFakeDefaultProformaConfiguration(idUsuario, user.dni);
+                userConfiguration = userFakeData;
+            }
+            if (userConfiguration && userConfiguration !== null) {
+                tempShimpmentIds.forEach(tempShimpmentId => {
+                    insert(userConfiguration, tempShimpmentId);
+                });
+            }
         });
     }
     insertQuantityRelatedLines(_a) {
         return __awaiter(this, arguments, void 0, function* ({ orders, idUsuario, crearBulto, estaAgrupado }) {
-            const { integrationsService } = this.services;
-            const quantityRelatedFunctions = [];
             const obtenerBultosYCantidades = orders.map((_b) => __awaiter(this, [_b], void 0, function* ({ idEnvioTemporal, lineas }) {
                 if (!idEnvioTemporal)
                     return null;
@@ -234,18 +232,16 @@ class IntegrationManager {
                                 bulto
                             });
                         }
-                        integrationsService.insertTempShipmentMultipleLines(dataToInsert.lines);
-                        quantityRelatedFunctions.push(integrationsService.insertTempDetailsShipment({
+                        dataToInsert.details.push({
                             id_envio: idEnvioTemporal,
                             bulto
-                        }));
+                        });
                     });
                 }
                 catch (e) {
                     console.log(e);
                 }
             });
-            yield Promise.allSettled(quantityRelatedFunctions);
         });
     }
 }

package/index.ts

@@ -27,11 +27,10 @@ import {
 } from './types';
 
 const dataToInsert: DataToInsert = {
-  tempShipment: [],
   lines: [],
-  content: [],
+  contents: [],
   details: [],
-  external: [],
+  externals: [],
 }
 
 interface Services {
@@ -104,8 +103,9 @@ export class IntegrationManager {
       });
 
     const isPriorityByDefault = async () => {
+      // TODO sacar esto de aqui, no hay que hacerlo cada vez, con una vale
       const usuariosGeneiPriority = await this.services.customizationService.getUsersWithSection(8);
-       const esPotencialmentePriority = usuariosGeneiPriority.some(
+      const esPotencialmentePriority = usuariosGeneiPriority.some(
         (seccion: { id_usuario: any; tipo_cliente: any; id_comercial: any; }) =>
           seccion.id_usuario === user.id_usuario ||
           seccion.tipo_cliente === user.tipo_cliente ||
@@ -126,12 +126,6 @@ export class IntegrationManager {
           originalOrder: order
         });
 
-        const duplicatedTempShipment = await integrationsService.checkDuplicateTempShipment(
-          parsedOrder.codigoEnvioExterno,
-          idUsuario
-        );
-        if (duplicatedTempShipment) throw new Error('Envio Duplicado');
-
         return this.insertOrder({
           order: parsedOrder,
           agencyId: await this.getAgencyIdForTempShipment({
@@ -169,6 +163,10 @@ 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);
 
     return { filteredOrders, insertedTempShipments: successfullShipments };
   }
@@ -181,47 +179,42 @@ export class IntegrationManager {
     tempShimpmentIds: number[];
   }) {
     const idUsuario = user.id_usuario
-    const { usersService, configurationService, integrationsService } =
+    const { configurationService } =
       this.services;
 
-    const insert = async (
+    const insert = (
       data: UserDefaultConfigurationContent[],
       tempShimpmentId: number
     ) => {
-      return Promise.allSettled(
-        data.map(async (tempContent) => {
-          await integrationsService.insertTempContent({
+      data.forEach((tempContent) => {
+          dataToInsert.contents.push({
             ...tempContent,
-
             id_envio: tempShimpmentId
-          });
-        })
-      );
+        });   
+      })
     };
 
-    const insertOrdersResult = await new this.executionManager({
-      arrayParams: tempShimpmentIds,
-
-      executable: async (order: any) => {
-        const userSavedData =
+    let userConfiguration: UserDefaultConfigurationContent[] | any = null;
+    const userSavedData =
           (await configurationService.getDefaultProformaConfiguration(
             idUsuario
           )) || [];
-
-        if (userSavedData.length > 0) {
-          await insert(userSavedData, order);
-        } else {
-          const userFakeData =
-            configurationService.getFakeDefaultProformaConfiguration(
-              idUsuario,
-              user.dni
-            );
-          await insert(userFakeData, order);
-        }
-      },
-      regularExecutionTime: 100, // ms
-      initialBatchQuantity: 5 // de cinco en cinco
-    }).upload();
+    if (userSavedData.length === 0){
+      userConfiguration = userSavedData;
+    }
+    else {
+      const userFakeData =
+        configurationService.getFakeDefaultProformaConfiguration(
+          idUsuario,
+          user.dni
+        );
+      userConfiguration = userFakeData;
+    }
+    if (userConfiguration && userConfiguration !== null){
+      tempShimpmentIds.forEach(tempShimpmentId => {
+        insert(userConfiguration, tempShimpmentId);
+      })
+    }
   }
 
   insertOrder = async ({
@@ -253,7 +246,7 @@ export class IntegrationManager {
     if (!idEnvioTemporal)
       throw new Error('Temp shipments could not be created');
 
-    await this.insertExternalShipment({
+    this.insertExternalShipment({
       idUsuario,
       order,
       idEnvioTemporal
@@ -296,7 +289,7 @@ export class IntegrationManager {
     );
   };
 
-  insertExternalShipment = async ({
+  insertExternalShipment = ({
     idUsuario,
     order,
     idEnvioTemporal
@@ -304,24 +297,22 @@ export class IntegrationManager {
     idUsuario: number;
     order: ModifiedOrder;
     idEnvioTemporal: number;
-  }): Promise<number | false> => {
-    const idEnvioExterno =
-      await this.services.integrationsService.insertExternalShipment({
-        id_envio_temporal_usuario: idEnvioTemporal,
-        codigo_envio_externo: order.codigoEnvioExterno,
-        id_usuario: idUsuario,
-        fecha_hora_creacion: moment().format('YYYY-MM-DD HH:mm:ss'),
-        servicio: this.type,
-        id_interno_shopify: order.idInternoShopify,
-        fecha_creacion_externa: moment(order?.fechaCreacionExterna).isValid()
-          ? moment(order.fechaCreacionExterna).format('YYYY-MM-DD HH:mm:ss')
-          : null,
-        marketplaceId: order.marketplaceId,
-        id_documento_holded: order.idDocumentoHolded,
-        tipo_documento_holded: order.tipoDocumentoHolded || ''
-      });
-
-    return idEnvioExterno;
+  }): undefined => {
+    
+    dataToInsert.externals.push({
+      id_envio_temporal_usuario: idEnvioTemporal,
+      codigo_envio_externo: order.codigoEnvioExterno,
+      id_usuario: idUsuario,
+      fecha_hora_creacion: moment().format('YYYY-MM-DD HH:mm:ss'),
+      servicio: this.type,
+      id_interno_shopify: order.idInternoShopify,
+      fecha_creacion_externa: moment(order?.fechaCreacionExterna).isValid()
+        ? moment(order.fechaCreacionExterna).format('YYYY-MM-DD HH:mm:ss')
+        : null,
+      marketplaceId: order.marketplaceId,
+      id_documento_holded: order.idDocumentoHolded,
+      tipo_documento_holded: order.tipoDocumentoHolded || ''
+      })
   };
 
   insertTempShipmentLines = async ({
@@ -333,8 +324,8 @@ export class IntegrationManager {
   }) => {
     const grouped = group.grouped === 1 || group.grouped === '1';
 
-    if (grouped)
-      await this.services.integrationsService.insertTempShipmentLines({
+    if (grouped) {
+      dataToInsert.lines.push({
         id_envio: idEnvioTemporal,
         bulto: {
           peso: group.weight,
@@ -342,7 +333,8 @@ export class IntegrationManager {
           ancho: group.width,
           largo: group.length
         }
-      });
+      })
+    }
   };
 
   async insertQuantityRelatedLines({
@@ -356,8 +348,6 @@ export class IntegrationManager {
     crearBulto: CrearBulto;
     estaAgrupado: boolean;
   }) {
-    const { integrationsService } = this.services;
-    const quantityRelatedFunctions: Array<Promise<undefined>> = [];
 
     const obtenerBultosYCantidades = orders.map(
       async ({ idEnvioTemporal, lineas }) => {
@@ -394,24 +384,19 @@ export class IntegrationManager {
         arrayFake.forEach(() => {
           if (!estaAgrupado) {
             dataToInsert.lines.push({
-              id_envio: idEnvioTemporal, 
+              id_envio: idEnvioTemporal,
               bulto
             });
           }
-          integrationsService.insertTempShipmentMultipleLines(dataToInsert.lines);
-
-          quantityRelatedFunctions.push(
-            integrationsService.insertTempDetailsShipment({
-              id_envio: idEnvioTemporal,
-              bulto
-            })
-          );
+          dataToInsert.details.push({
+            id_envio: idEnvioTemporal,
+            bulto
+          });
         });
+
       } catch (e) {
         console.log(e);
       }
     });
-
-    await Promise.allSettled(quantityRelatedFunctions);
   }
 }

package/package.json

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

package/types/index.ts

@@ -107,7 +107,6 @@ type FetchAllOrders = () => Promise<OriginalOrder[]>;
 
 export type CrearBulto = (params: {
   lineItems: { idEnvioTemporal: number; line: AnyObject };
-
   idUsuario: number;
 }) => Promise<Bulto>;
 
@@ -174,8 +173,6 @@ export type IntegrationsService = {
     bulto: Pick<Bulto['bulto'], 'peso' | 'alto' | 'ancho' | 'largo'>;
   }) => Promise<undefined>;
 
-  insertTempShipmentMultipleLines: (lines: DataToInsert["lines"]) => number | false;
-
   insertTempDetailsShipment: (params: {
     id_envio: number;
     bulto: Bulto['bulto'];
@@ -184,6 +181,14 @@ export type IntegrationsService = {
   insertTempContent: (
     params: UserDefaultConfigurationContent & { id_envio: number }
   ) => Promise<number | false>;
+
+  insertTempShipmentMultipleLines: (lines: DataToInsert["lines"]) => number | false;
+
+  insertTempShipmentMultipleDetails: (details: DataToInsert["details"]) => number | false;
+
+  insertTempShipmentMultipleContents: (contents: DataToInsert["contents"]) => number | false;
+
+  insertTempShipmentMultipleExternals: (externals: DataToInsert["externals"]) => number | false;
 };
 
 export type SellerAddress = {
@@ -309,12 +314,34 @@ export type ExecutionManager = {
 };
 
 export type DataToInsert = {
-  tempShipment: any[]; 
-  lines: {
-      id_envio: number;
-      bulto: Pick<Bulto['bulto'], 'peso' | 'alto' | 'ancho' | 'largo'>; 
-  }[];
-  content: any[];
-  details: any[];
-  external: any[];
+  lines: InsertContentShipmentLine[];
+  contents: InsertContentShipmentData[];
+  details: InsertContentShipmentDetail[];
+  externals: InsertContentShipmentExternal[];
 };
+
+type InsertContentShipmentLine = {
+    id_envio: number,
+    bulto: Pick<Bulto['bulto'], 'peso' | 'alto' | 'ancho' | 'largo'>;
+}
+
+type InsertContentShipmentData = 
+  UserDefaultConfigurationContent & { id_envio: number }
+
+type InsertContentShipmentDetail = {
+    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;
+  }