cardus 0.0.25 → 0.0.27

package/dist/index.js

@@ -17,13 +17,14 @@ 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 }) {
+        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
+                idUsuario,
+                isPriority,
             });
             if (!idEnvioTemporal)
                 throw new Error('Temp shipments could not be created');
@@ -37,7 +38,7 @@ class IntegrationManager {
                 yield this.insertTempShipmentLines({ idEnvioTemporal, group });
             return Object.assign(order, { idEnvioTemporal });
         });
-        this.insertTempShipment = (_b) => __awaiter(this, [_b], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario }) {
+        this.insertTempShipment = (_b) => __awaiter(this, [_b], void 0, function* ({ order, agencyId, warehouseId, sellerAddress, idUsuario, isPriority }) {
             const tempShipmentData = yield (0, insertTempShipment_1.cookTempShipment)({
                 order,
                 shipmentType: this.shipmentType,
@@ -46,7 +47,8 @@ class IntegrationManager {
                 sellerAddress,
                 idUsuario,
                 findNextPickupDate: this.findNextPickupDate,
-                countriesService: this.services.countriesService
+                countriesService: this.services.countriesService,
+                isPriority
             });
             return yield this.services.integrationsService.insertTempShipment(tempShipmentData);
         });
@@ -85,16 +87,18 @@ class IntegrationManager {
             addressesService: params.addressesService,
             countriesService: params.countriesService,
             configurationService: params.configurationService,
-            usersService: params.usersService
+            usersService: params.usersService,
+            customizationService: params.customizationService,
         };
         this.shipmentType = params.shipmentType;
         this.type = params.type;
         this.executionManager = params.executionManager;
         this.findNextPickupDate = params.findNextPickupDate;
-        this.getAgencyIdFromTempShipment = params.getAgencyIdFromTempShipment;
+        this.getAgencyIdForTempShipment = params.getAgencyIdForTempShipment;
     }
     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
@@ -107,7 +111,19 @@ class IntegrationManager {
                 orders: allOrders,
                 type: this.type
             });
-            const insertOrdersResult = yield new this.executionManager({
+            const isPriorityByDefault = () => __awaiter(this, void 0, void 0, function* () {
+                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 ||
+                    seccion.id_comercial === user.id_comercial);
+                if (!esPotencialmentePriority) {
+                    return 0;
+                }
+                else {
+                    return +user.priority; // 1 o 0
+                }
+            });
+            const insertOrdersResult = new this.executionManager({
                 arrayParams: allOrders,
                 executable: (order) => __awaiter(this, void 0, void 0, function* () {
                     const parsedOrder = yield modificarOrdenOriginal({
@@ -118,15 +134,17 @@ class IntegrationManager {
                         throw new Error('Envio Duplicado');
                     return this.insertOrder({
                         order: parsedOrder,
-                        agencyId: yield this.getAgencyIdFromTempShipment({
+                        agencyId: yield this.getAgencyIdForTempShipment({
                             defaultAgencyId: agencyId,
+                            userId: idUsuario,
                             integrationId: this.shipmentType,
-                            tempShipmentData: parsedOrder
+                            tempShipmentData: parsedOrder,
                         }),
                         warehouseId,
                         sellerAddress,
                         idUsuario,
-                        group
+                        group,
+                        isPriority: yield isPriorityByDefault(),
                     });
                 }),
                 regularExecutionTime: 100, // ms
@@ -143,14 +161,15 @@ class IntegrationManager {
                 estaAgrupado
             });
             yield this.insertUserDefaultConfigurationContent({
-                idUsuario,
+                user,
                 tempShimpmentIds: successfullShipments.map((successfullShipment) => successfullShipment.idEnvioTemporal)
             });
             return filteredOrders;
         });
     }
     insertUserDefaultConfigurationContent(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ idUsuario, tempShimpmentIds }) {
+        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* () {
@@ -165,7 +184,6 @@ class IntegrationManager {
                         yield insert(userSavedData, order);
                     }
                     else {
-                        const user = yield usersService.obtenerUsuarioId(idUsuario);
                         const userFakeData = configurationService.getFakeDefaultProformaConfiguration(idUsuario, user.dni);
                         yield insert(userFakeData, order);
                     }

package/dist/insertTempShipment/index.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cookTempShipment = void 0;
 const moment_1 = __importDefault(require("moment"));
-const cookTempShipment = (_a) => __awaiter(void 0, [_a], void 0, function* ({ order, shipmentType, agencyId, warehouseId, sellerAddress, idUsuario, findNextPickupDate, countriesService }) {
+const cookTempShipment = (_a) => __awaiter(void 0, [_a], void 0, function* ({ order, shipmentType, agencyId, warehouseId, sellerAddress, idUsuario, findNextPickupDate, countriesService, isPriority }) {
     let zonaLLegada = {};
     if (order.codigoPaisLLegada)
         zonaLLegada = yield countriesService.getCountryFromCountryCode(order.codigoPaisLLegada);
@@ -116,7 +116,7 @@ const cookTempShipment = (_a) => __awaiter(void 0, [_a], void 0, function* ({ or
     const dataInsert = (yield setters.reduce((acc, curr) => __awaiter(void 0, void 0, void 0, function* () {
         const accumulated = yield acc;
         const stepResult = yield curr(Object.assign(Object.assign({}, order), accumulated));
-        return Object.assign(Object.assign({}, accumulated), stepResult);
+        return Object.assign(Object.assign(Object.assign({}, accumulated), stepResult), { priority: isPriority });
     }), {}));
     return dataInsert;
 });

package/index.ts

@@ -20,7 +20,9 @@ import {
   ModifiedOrder,
   ShipmentType,
   UserDefaultConfigurationContent,
-  GetAgencyIdForTempShipment
+  GetAgencyIdForTempShipment,
+  IsPriority,
+  CustomizationService
 } from './types';
 
 interface Services {
@@ -29,6 +31,7 @@ interface Services {
   countriesService: CountriesService;
   configurationService: ConfigurationService;
   usersService: UsersService;
+  customizationService: CustomizationService;
 }
 
 export class IntegrationManager {
@@ -37,7 +40,7 @@ export class IntegrationManager {
   executionManager: ExecutionManager;
   findNextPickupDate: FindNextPickupDate;
   shipmentType: ShipmentType;
-  getAgencyIdFromTempShipment: GetAgencyIdForTempShipment;
+  getAgencyIdForTempShipment: GetAgencyIdForTempShipment;
 
   constructor(params: {
     integrationsService: IntegrationsService;
@@ -45,25 +48,27 @@ export class IntegrationManager {
     countriesService: CountriesService;
     configurationService: ConfigurationService;
     usersService: UsersService;
+    customizationService: CustomizationService;
     type: Type;
     shipmentType: ShipmentType;
     executionManager: ExecutionManager;
     findNextPickupDate: FindNextPickupDate;
-    getAgencyIdFromTempShipment: GetAgencyIdForTempShipment;
+    getAgencyIdForTempShipment: GetAgencyIdForTempShipment;
   }) {
     this.services = {
       integrationsService: params.integrationsService,
       addressesService: params.addressesService,
       countriesService: params.countriesService,
       configurationService: params.configurationService,
-      usersService: params.usersService
+      usersService: params.usersService,
+      customizationService: params.customizationService,
     };
 
     this.shipmentType = params.shipmentType;
     this.type = params.type;
     this.executionManager = params.executionManager;
     this.findNextPickupDate = params.findNextPickupDate;
-    this.getAgencyIdFromTempShipment = params.getAgencyIdFromTempShipment;
+    this.getAgencyIdForTempShipment = params.getAgencyIdForTempShipment;
   }
 
   async insertTempShipments({
@@ -72,6 +77,7 @@ export class IntegrationManager {
     crearBulto,
     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
@@ -88,31 +94,48 @@ export class IntegrationManager {
         type: this.type
       });
 
-    const insertOrdersResult = await new this.executionManager({
+    const isPriorityByDefault = async () => {
+      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 === user.id_usuario ||
+          seccion.tipo_cliente === user.tipo_cliente ||
+          seccion.id_comercial === user.id_comercial
+      );
+
+      if (!esPotencialmentePriority) {
+        return 0;
+      } else {
+        return +user.priority; // 1 o 0
+      }
+    };
+
+    const insertOrdersResult = new this.executionManager({
       arrayParams: allOrders,
       executable: async (order: OriginalOrder) => {
         const parsedOrder = await modificarOrdenOriginal({
           originalOrder: order
         });
 
-        const duplicatedTempShipment =
-          await integrationsService.checkDuplicateTempShipment(
-            parsedOrder.codigoEnvioExterno,
-            idUsuario
-          );
+        const duplicatedTempShipment = await integrationsService.checkDuplicateTempShipment(
+          parsedOrder.codigoEnvioExterno,
+          idUsuario
+        );
         if (duplicatedTempShipment) throw new Error('Envio Duplicado');
 
         return this.insertOrder({
           order: parsedOrder,
-          agencyId: await this.getAgencyIdFromTempShipment({
+          agencyId: await this.getAgencyIdForTempShipment({
             defaultAgencyId: agencyId,
+            userId: idUsuario,
             integrationId: this.shipmentType,
-            tempShipmentData: parsedOrder
+            tempShipmentData: parsedOrder,
           }),
           warehouseId,
           sellerAddress,
           idUsuario,
-          group
+          group,
+          isPriority: await isPriorityByDefault(),
         });
       },
       regularExecutionTime: 100, // ms
@@ -132,7 +155,7 @@ export class IntegrationManager {
     });
 
     await this.insertUserDefaultConfigurationContent({
-      idUsuario,
+      user,
       tempShimpmentIds: successfullShipments.map(
         (successfullShipment) => successfullShipment.idEnvioTemporal
       )
@@ -142,12 +165,13 @@ export class IntegrationManager {
   }
 
   async insertUserDefaultConfigurationContent({
-    idUsuario,
+    user,
     tempShimpmentIds
   }: {
-    idUsuario: number;
+    user: { id_usuario: number, dni: string };
     tempShimpmentIds: number[];
   }) {
+    const idUsuario = user.id_usuario
     const { usersService, configurationService, integrationsService } =
       this.services;
 
@@ -178,7 +202,6 @@ export class IntegrationManager {
         if (userSavedData.length > 0) {
           await insert(userSavedData, order);
         } else {
-          const user = await usersService.obtenerUsuarioId(idUsuario);
           const userFakeData =
             configurationService.getFakeDefaultProformaConfiguration(
               idUsuario,
@@ -198,7 +221,8 @@ export class IntegrationManager {
     warehouseId,
     sellerAddress,
     idUsuario,
-    group
+    group,
+    isPriority
   }: {
     order: ModifiedOrder;
     agencyId: number;
@@ -206,13 +230,15 @@ export class IntegrationManager {
     sellerAddress: SellerAddress;
     idUsuario: number;
     group: Group;
+    isPriority: IsPriority
   }): Promise<ModifiedOrderExtended> => {
     const idEnvioTemporal = await this.insertTempShipment({
       order,
       agencyId,
       warehouseId,
       sellerAddress,
-      idUsuario
+      idUsuario,
+      isPriority,
     });
 
     if (!idEnvioTemporal)
@@ -234,13 +260,15 @@ export class IntegrationManager {
     agencyId,
     warehouseId,
     sellerAddress,
-    idUsuario
+    idUsuario,
+    isPriority
   }: {
     order: ModifiedOrder;
     agencyId: number;
     warehouseId: number;
     sellerAddress: SellerAddress;
     idUsuario: number;
+    isPriority: IsPriority
   }) => {
     const tempShipmentData = await cookTempShipment({
       order,
@@ -250,7 +278,8 @@ export class IntegrationManager {
       sellerAddress,
       idUsuario,
       findNextPickupDate: this.findNextPickupDate,
-      countriesService: this.services.countriesService
+      countriesService: this.services.countriesService,
+      isPriority
     });
 
     return await this.services.integrationsService.insertTempShipment(

package/insertTempShipment/index.ts

@@ -5,7 +5,8 @@ import {
   ModifiedOrder,
   CountriesService,
   FindNextPickupDate,
-  SellerAddress
+  SellerAddress,
+  IsPriority
 } from 'types';
 
 type ZonaLLegada = { nombre_pais: string; id_pais: number };
@@ -18,7 +19,8 @@ export const cookTempShipment = async ({
   sellerAddress,
   idUsuario,
   findNextPickupDate,
-  countriesService
+  countriesService,
+  isPriority
 }: {
   order: ModifiedOrder;
   shipmentType: ShipmentType;
@@ -28,6 +30,7 @@ export const cookTempShipment = async ({
   idUsuario: number;
   findNextPickupDate: FindNextPickupDate;
   countriesService: CountriesService;
+  isPriority: IsPriority
 }): Promise<Shipment> => {
   let zonaLLegada = {};
   if (order.codigoPaisLLegada)
@@ -173,7 +176,8 @@ export const cookTempShipment = async ({
 
     return {
       ...accumulated,
-      ...stepResult
+      ...stepResult,
+      priority: isPriority
     };
 
   }, {})) as Shipment;

package/package.json

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

package/types/index.ts

@@ -32,6 +32,7 @@ export type Shipment = {
   tipo_envio: Type;
   codigo_envio_externo: string;
   id_almacen: number;
+  priority: 0 | 1;
 };
 
 const shipmentTypes = {
@@ -94,6 +95,7 @@ export type ModifiedOrder = {
   marketplaceId?: string | null;
   idDocumentoHolded?: string;
   tipoDocumentoHolded?: string;
+  isPriority: 0 | 1;
 };
 
 export interface ModifiedOrderExtended extends ModifiedOrder {
@@ -241,6 +243,10 @@ export type UserDefaultConfigurationContent = {
 
 type User = {
   dni: string;
+  id_usuario: number;
+  tipo_cliente: number;
+  id_comercial: number;
+  priority: number;
 };
 
 export type ConfigurationService = {
@@ -255,10 +261,16 @@ export type ConfigurationService = {
   ) => UserDefaultConfigurationContent[];
 };
 
+export type IsPriority = number
+
 export type UsersService = {
   obtenerUsuarioId: (id_usuario: number) => Promise<User>;
 };
 
+export type CustomizationService = {
+  getUsersWithSection: (seccion: number) => Promise<User[]>;
+}
+
 export type FindNextPickupDate = (params: {
   fecha?: string;
   cp_salida: string;
@@ -283,6 +295,7 @@ type ExecutionManagerUploadReturn = {
 
 export type GetAgencyIdForTempShipment = (params: {
   defaultAgencyId: number;
+  userId: number;
   integrationId: number;
   tempShipmentData: ModifiedOrder;
 }) => Promise<number>;