cardus 0.0.107 → 0.0.108

package/__tests__/insertTempShipments.test.ts

@@ -376,6 +376,46 @@ describe('IntegrationManager.insertTempShipments', () => {
     expect(addressesService.getAddress).not.toHaveBeenCalledWith(10, 77);
   });
 
+  it('uses sellerAddress from the order when addressId is not provided', async () => {
+    const { manager, addressesService, integrationsService } = buildFixture();
+    arrangeDefaultStubs({ manager, shipmentId: 12345 });
+
+    await manager.insertTempShipments({
+      payload: buildPayload({ addressId: null }),
+      fetchAllOrders: async () => [
+        buildOrder({
+          sellerAddress: {
+            id_pais: 44,
+            codigo_postal: '28001',
+            nombre: 'Origen Excel',
+            direccion: 'Calle Falsa 123',
+            poblacion: 'Madrid',
+            provincia: 'Madrid',
+            id_zona: 7,
+            nombre_pais: 'España',
+            telefono: '600000000',
+            observaciones: '',
+            mail: 'origen@example.com',
+            country_code_unico: 'ES'
+          }
+        })
+      ],
+      crearBulto: jest.fn(),
+      modificarOrdenOriginal: async ({ originalOrder }) => originalOrder
+    });
+
+    expect(addressesService.getAddress).not.toHaveBeenCalledWith(null, 77);
+    expect(integrationsService.insertTempShipment).toHaveBeenCalledWith(
+      expect.objectContaining({
+        nom_ape_salida: 'Origen Excel',
+        direccion_salida: 'Calle Falsa 123',
+        cod_pos_salida: '28001',
+        pais_salida: 'España'
+      }),
+      false
+    );
+  });
+
   it('passes shouldFindWarehouseSkus=true to insertQuantityRelatedLines when sku_almacen is enabled', async () => {
     const { manager } = buildFixture({ skuAlmacen: 1 });
     arrangeDefaultStubs({ manager, shipmentId: 12345 });

package/dist/__tests__/insertTempShipments.test.js

@@ -316,6 +316,42 @@ describe('IntegrationManager.insertTempShipments', () => {
         expect(addressesService.getWarehouseAddress).toHaveBeenCalledWith(77);
         expect(addressesService.getAddress).not.toHaveBeenCalledWith(10, 77);
     }));
+    it('uses sellerAddress from the order when addressId is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { manager, addressesService, integrationsService } = buildFixture();
+        arrangeDefaultStubs({ manager, shipmentId: 12345 });
+        yield manager.insertTempShipments({
+            payload: buildPayload({ addressId: null }),
+            fetchAllOrders: () => __awaiter(void 0, void 0, void 0, function* () {
+                return [
+                    buildOrder({
+                        sellerAddress: {
+                            id_pais: 44,
+                            codigo_postal: '28001',
+                            nombre: 'Origen Excel',
+                            direccion: 'Calle Falsa 123',
+                            poblacion: 'Madrid',
+                            provincia: 'Madrid',
+                            id_zona: 7,
+                            nombre_pais: 'España',
+                            telefono: '600000000',
+                            observaciones: '',
+                            mail: 'origen@example.com',
+                            country_code_unico: 'ES'
+                        }
+                    })
+                ];
+            }),
+            crearBulto: jest.fn(),
+            modificarOrdenOriginal: (_c) => __awaiter(void 0, [_c], void 0, function* ({ originalOrder }) { return originalOrder; })
+        });
+        expect(addressesService.getAddress).not.toHaveBeenCalledWith(null, 77);
+        expect(integrationsService.insertTempShipment).toHaveBeenCalledWith(expect.objectContaining({
+            nom_ape_salida: 'Origen Excel',
+            direccion_salida: 'Calle Falsa 123',
+            cod_pos_salida: '28001',
+            pais_salida: 'España'
+        }), false);
+    }));
     it('passes shouldFindWarehouseSkus=true to insertQuantityRelatedLines when sku_almacen is enabled', () => __awaiter(void 0, void 0, void 0, function* () {
         const { manager } = buildFixture({ skuAlmacen: 1 });
         arrangeDefaultStubs({ manager, shipmentId: 12345 });
@@ -326,7 +362,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             payload: buildPayload(),
             fetchAllOrders: () => __awaiter(void 0, void 0, void 0, function* () { return [buildOrder()]; }),
             crearBulto: jest.fn(),
-            modificarOrdenOriginal: (_c) => __awaiter(void 0, [_c], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_d) => __awaiter(void 0, [_d], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         insertQuantitySpy.mock.calls[0][0].shouldFindWarehouseSkus = true;
         expect(insertQuantitySpy).toHaveBeenCalledWith(expect.objectContaining({
@@ -353,7 +389,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             }),
             fetchAllOrders: () => __awaiter(void 0, void 0, void 0, function* () { return [buildOrder()]; }),
             crearBulto: jest.fn(),
-            modificarOrdenOriginal: (_d) => __awaiter(void 0, [_d], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_e) => __awaiter(void 0, [_e], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(insertQuantitySpy).toHaveBeenCalledWith(expect.objectContaining({
             group: {
@@ -367,7 +403,7 @@ describe('IntegrationManager.insertTempShipments', () => {
         expect(response.sequentialInsertion).toBe(false);
     }));
     it('updates agency when rule engine returns a different agency and uses shipment details in that decision', () => __awaiter(void 0, void 0, void 0, function* () {
-        const getAgencyIdForTempShipment = jest.fn((_e) => __awaiter(void 0, [_e], void 0, function* ({ shipmentDetails }) {
+        const getAgencyIdForTempShipment = jest.fn((_f) => __awaiter(void 0, [_f], void 0, function* ({ shipmentDetails }) {
             expect(shipmentDetails).toEqual([
                 expect.objectContaining({ id_envio: 12345, cantidad: 2 })
             ]);
@@ -381,7 +417,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             payload: buildPayload({ agencyId: 50 }),
             fetchAllOrders: () => __awaiter(void 0, void 0, void 0, function* () { return [buildOrder()]; }),
             crearBulto: jest.fn(),
-            modificarOrdenOriginal: (_f) => __awaiter(void 0, [_f], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_g) => __awaiter(void 0, [_g], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(getAgencyIdForTempShipment).toHaveBeenCalledTimes(1);
         expect(integrationsService.updateTempShimpment).toHaveBeenCalledWith({
@@ -393,7 +429,7 @@ describe('IntegrationManager.insertTempShipments', () => {
     it('sends grouped package line to bulk insert when group=1 and order has more than one line', () => __awaiter(void 0, void 0, void 0, function* () {
         const { manager, integrationsService } = buildFixture();
         arrangeRealQuantityFlow({ manager, shipmentId: 12345 });
-        const crearBulto = jest.fn((_g) => __awaiter(void 0, [_g], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_h) => __awaiter(void 0, [_h], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 1.2,
@@ -422,7 +458,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_h) => __awaiter(void 0, [_h], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_j) => __awaiter(void 0, [_j], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -453,7 +489,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             measuresFromConfig: 1
         });
         arrangeRealQuantityFlow({ manager, shipmentId: 12345 });
-        const crearBulto = jest.fn((_j) => __awaiter(void 0, [_j], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_k) => __awaiter(void 0, [_k], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 1,
@@ -479,7 +515,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_k) => __awaiter(void 0, [_k], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_l) => __awaiter(void 0, [_l], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -510,7 +546,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             measuresFromConfig: 0
         });
         arrangeRealQuantityFlow({ manager, shipmentId: 12345 });
-        const crearBulto = jest.fn((_l) => __awaiter(void 0, [_l], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_m) => __awaiter(void 0, [_m], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 2,
@@ -536,7 +572,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_m) => __awaiter(void 0, [_m], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_o) => __awaiter(void 0, [_o], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -565,12 +601,12 @@ describe('IntegrationManager.insertTempShipments', () => {
             skuAlmacen: 1
         });
         arrangeRealQuantityFlow({ manager, shipmentId: 12345 });
-        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_o) => __awaiter(void 0, [_o], void 0, function* ({ sku }) {
+        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_p) => __awaiter(void 0, [_p], void 0, function* ({ sku }) {
             return ({
                 id: sku === 'SKU-01' ? 111 : 222
             });
         }));
-        const crearBulto = jest.fn((_p) => __awaiter(void 0, [_p], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_q) => __awaiter(void 0, [_q], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 2,
@@ -597,7 +633,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_q) => __awaiter(void 0, [_q], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_r) => __awaiter(void 0, [_r], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             expect.objectContaining({ id_envio: 12345 }),
@@ -626,7 +662,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2001, 2002]
         });
-        const crearBulto = jest.fn((_r) => __awaiter(void 0, [_r], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_s) => __awaiter(void 0, [_s], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 1.5,
@@ -664,7 +700,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_s) => __awaiter(void 0, [_s], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_t) => __awaiter(void 0, [_t], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -700,7 +736,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2101, 2102]
         });
-        const crearBulto = jest.fn((_t) => __awaiter(void 0, [_t], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_u) => __awaiter(void 0, [_u], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 2,
@@ -737,7 +773,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_u) => __awaiter(void 0, [_u], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_v) => __awaiter(void 0, [_v], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         const linesArg = integrationsService.insertTempShipmentMultipleLines.mock.calls[0][0];
         expect(linesArg).toHaveLength(8);
@@ -767,7 +803,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2201, 2202]
         });
-        const crearBulto = jest.fn((_v) => __awaiter(void 0, [_v], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_w) => __awaiter(void 0, [_w], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 1,
@@ -798,7 +834,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_w) => __awaiter(void 0, [_w], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_x) => __awaiter(void 0, [_x], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -832,7 +868,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2301, 2302]
         });
-        const crearBulto = jest.fn((_x) => __awaiter(void 0, [_x], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_y) => __awaiter(void 0, [_y], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 3,
@@ -863,7 +899,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_y) => __awaiter(void 0, [_y], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_z) => __awaiter(void 0, [_z], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -911,14 +947,14 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2401, 2402]
         });
-        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_z) => __awaiter(void 0, [_z], void 0, function* ({ sku }) {
+        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_0) => __awaiter(void 0, [_0], void 0, function* ({ sku }) {
             if (sku === 'SKU-I1')
                 return { id: 901 };
             if (sku === 'SKU-J1')
                 return { id: 902 };
             return { id: 999 };
         }));
-        const crearBulto = jest.fn((_0) => __awaiter(void 0, [_0], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_1) => __awaiter(void 0, [_1], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 2,
@@ -956,7 +992,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_1) => __awaiter(void 0, [_1], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_2) => __awaiter(void 0, [_2], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleJsonQuantityReferences).toHaveBeenCalledWith([
             {
@@ -1003,7 +1039,7 @@ describe('IntegrationManager.insertTempShipments', () => {
             manager,
             shipmentIds: [2501, 2502]
         });
-        const crearBulto = jest.fn((_2) => __awaiter(void 0, [_2], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_3) => __awaiter(void 0, [_3], void 0, function* ({ lineItems }) {
             const groupedOrderLine = lineItems.line.sku_producto.startsWith('SKU-K');
             return {
                 bulto: {
@@ -1038,7 +1074,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_3) => __awaiter(void 0, [_3], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_4) => __awaiter(void 0, [_4], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         expect(integrationsService.insertTempShipmentMultipleLines).toHaveBeenCalledWith([
             {
@@ -1079,8 +1115,8 @@ describe('IntegrationManager.insertTempShipments', () => {
         manager.services.integrationsService.insertTempShipment
             .mockResolvedValueOnce(2601)
             .mockResolvedValueOnce(2602);
-        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_4) => __awaiter(void 0, [_4], void 0, function* ({ sku }) { return ({ id: sku === 'SKU-M1' ? 7001 : 7002 }); }));
-        manager.getModifiedOrderBasedOnRules = jest.fn((_5) => __awaiter(void 0, [_5], void 0, function* ({ parsedOrder }) {
+        manager.services.warehouseService.getProductReferenceFromSku = jest.fn((_5) => __awaiter(void 0, [_5], void 0, function* ({ sku }) { return ({ id: sku === 'SKU-M1' ? 7001 : 7002 }); }));
+        manager.getModifiedOrderBasedOnRules = jest.fn((_6) => __awaiter(void 0, [_6], void 0, function* ({ parsedOrder }) {
             if (parsedOrder.codigoEnvioExterno === 'EXT-ABORT') {
                 return {
                     partialTempShipmentModified: { abort_creation: true },
@@ -1092,7 +1128,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 packagesModified: []
             };
         }));
-        const crearBulto = jest.fn((_6) => __awaiter(void 0, [_6], void 0, function* ({ lineItems }) {
+        const crearBulto = jest.fn((_7) => __awaiter(void 0, [_7], void 0, function* ({ lineItems }) {
             return ({
                 bulto: {
                     peso: 2,
@@ -1124,7 +1160,7 @@ describe('IntegrationManager.insertTempShipments', () => {
                 ];
             }),
             crearBulto,
-            modificarOrdenOriginal: (_7) => __awaiter(void 0, [_7], void 0, function* ({ originalOrder }) { return originalOrder; })
+            modificarOrdenOriginal: (_8) => __awaiter(void 0, [_8], void 0, function* ({ originalOrder }) { return originalOrder; })
         });
         const linesArg = integrationsService.insertTempShipmentMultipleLines.mock.calls[0][0];
         const detailsArg = integrationsService.insertTempShipmentMultipleDetails.mock.calls[0][0];

package/dist/index.js

@@ -61,11 +61,12 @@ class IntegrationManager {
         return __awaiter(this, arguments, void 0, function* ({ payload: { idUsuario, agencyId, addressId, warehouseId, group, sequentialInsertion = false }, fetchAllOrders, crearBulto, modificarOrdenOriginal }) {
             const user = yield this.services.usersService.obtenerUsuarioId(idUsuario);
             const { integrationsService, addressesService } = this.services;
-            // esto hay que pasarlo ya en los parametros
-            const sellerAddress = warehouseId > 0
+            const defaultSellerAddress = warehouseId > 0
                 ? yield addressesService.getWarehouseAddress(idUsuario)
-                : yield addressesService.getAddress(addressId, idUsuario);
-            const country = yield this.services.countriesService.getCountry(sellerAddress.id_pais);
+                : addressId
+                    ? yield addressesService.getAddress(addressId, idUsuario)
+                    : null;
+            let sellerAddressForContents = defaultSellerAddress;
             const userIntegrationConfiguration = yield integrationsService.getDefaultIntegrationsData({
                 id_usuario: idUsuario,
                 id_integracion: this.integrationType
@@ -94,6 +95,7 @@ class IntegrationManager {
             const insertOrdersResult = yield new this.executionManager({
                 arrayParams: filteredOrders,
                 executable: (order) => __awaiter(this, void 0, void 0, function* () {
+                    var _b;
                     const parsedOrder = yield modificarOrdenOriginal({
                         originalOrder: order
                     });
@@ -101,12 +103,17 @@ class IntegrationManager {
                     if (parsedOrder.direccionSalidaId) {
                         direccionSalida = yield addressesService.getAddress(parsedOrder.direccionSalidaId, idUsuario);
                     }
+                    const currentSellerAddress = (_b = direccionSalida !== null && direccionSalida !== void 0 ? direccionSalida : parsedOrder.sellerAddress) !== null && _b !== void 0 ? _b : defaultSellerAddress;
+                    if (!currentSellerAddress) {
+                        throw new Error('Seller address could not be resolved');
+                    }
+                    sellerAddressForContents !== null && sellerAddressForContents !== void 0 ? sellerAddressForContents : (sellerAddressForContents = currentSellerAddress);
                     const tempShipmentData = yield (0, insertTempShipment_1.cookTempShipment)({
                         order: parsedOrder,
                         shipmentType: this.shipmentType,
                         agencyId,
                         warehouseId,
-                        sellerAddress: direccionSalida !== null && direccionSalida !== void 0 ? direccionSalida : sellerAddress,
+                        sellerAddress: currentSellerAddress,
                         idUsuario,
                         findNextPickupDate: this.findNextPickupDate,
                         countriesService: this.services.countriesService,
@@ -127,7 +134,7 @@ class IntegrationManager {
                         userId: idUsuario,
                         integrationId: this.integrationType,
                         parsedOrder,
-                        sellerAddress,
+                        sellerAddress: currentSellerAddress,
                         shipmentDetails,
                         tempShipmentData,
                         packages: this.dataToInsert.lines.get(idEnvioTemporal) || []
@@ -164,7 +171,7 @@ class IntegrationManager {
                             acc[tempShipmentId].push(curr);
                             return acc;
                         }, {});
-                        yield Promise.all(Object.entries(bultosYCantidadesGroupedByShipment).map((_b) => __awaiter(this, [_b], void 0, function* ([tempShipmentId, bultosYCantidades]) {
+                        yield Promise.all(Object.entries(bultosYCantidadesGroupedByShipment).map((_c) => __awaiter(this, [_c], void 0, function* ([tempShipmentId, bultosYCantidades]) {
                             const json_referencias_cantidades = yield this.createJsonQuantityReferencesFromLines({
                                 idUsuario,
                                 warehouseId,
@@ -191,6 +198,10 @@ class IntegrationManager {
                 regularExecutionTime: 8000, // ms
                 initialBatchQuantity: sequentialInsertion ? 1 : 5 // si la insercion no es secuencial, de cinco en cinco
             }).upload();
+            if (!sellerAddressForContents) {
+                throw new Error('Seller address could not be resolved');
+            }
+            const country = yield this.services.countriesService.getCountry(sellerAddressForContents.id_pais);
             // content (dentro de esta funcion coge los detalles y evoluciona a partir de ahi)
             yield this.insertUserDefaultConfigurationContent({
                 user,

package/index.ts

@@ -111,15 +111,13 @@ export class IntegrationManager {
   }: InsertParams) {
     const user = await this.services.usersService.obtenerUsuarioId(idUsuario);
     const { integrationsService, addressesService } = this.services;
-    // esto hay que pasarlo ya en los parametros
-    const sellerAddress =
+    const defaultSellerAddress =
       warehouseId > 0
         ? await addressesService.getWarehouseAddress(idUsuario)
-        : await addressesService.getAddress(addressId, idUsuario);
-
-    const country = await this.services.countriesService.getCountry(
-      sellerAddress.id_pais
-    );
+        : addressId
+          ? await addressesService.getAddress(addressId, idUsuario)
+          : null;
+    let sellerAddressForContents = defaultSellerAddress;
 
     const userIntegrationConfiguration =
       await integrationsService.getDefaultIntegrationsData({
@@ -176,13 +174,21 @@ export class IntegrationManager {
             idUsuario
           );
         }
+        const currentSellerAddress =
+          direccionSalida ?? parsedOrder.sellerAddress ?? defaultSellerAddress;
+
+        if (!currentSellerAddress) {
+          throw new Error('Seller address could not be resolved');
+        }
+
+        sellerAddressForContents ??= currentSellerAddress;
 
         const tempShipmentData = await cookTempShipment({
           order: parsedOrder,
           shipmentType: this.shipmentType,
           agencyId,
           warehouseId,
-          sellerAddress: direccionSalida ?? sellerAddress,
+          sellerAddress: currentSellerAddress,
           idUsuario,
           findNextPickupDate: this.findNextPickupDate,
           countriesService: this.services.countriesService,
@@ -213,7 +219,7 @@ export class IntegrationManager {
             userId: idUsuario,
             integrationId: this.integrationType,
             parsedOrder,
-            sellerAddress,
+            sellerAddress: currentSellerAddress,
             shipmentDetails,
             tempShipmentData,
             packages: this.dataToInsert.lines.get(idEnvioTemporal) || []
@@ -307,6 +313,14 @@ export class IntegrationManager {
       initialBatchQuantity: sequentialInsertion ? 1 : 5 // si la insercion no es secuencial, de cinco en cinco
     }).upload();
 
+    if (!sellerAddressForContents) {
+      throw new Error('Seller address could not be resolved');
+    }
+
+    const country = await this.services.countriesService.getCountry(
+      sellerAddressForContents.id_pais
+    );
+
     // content (dentro de esta funcion coge los detalles y evoluciona a partir de ahi)
     await this.insertUserDefaultConfigurationContent({
       user,

package/package.json

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

package/types/index.ts

@@ -123,7 +123,7 @@ export type ModifiedOrder = {
   telefonoLLegada: string | undefined;
   emailLLegada: string | undefined;
   cantidadContrareembolso: number | null;
-  codigoEnvioExterno?: string;
+  codigoEnvioExterno: string;
   idInternoShopify?: string;
   precio: number | null;
   fechaCreacionExterna?: string | null;
@@ -139,6 +139,7 @@ export type ModifiedOrder = {
   observacionesLLegada?: string;
   observaciones?: string;
   direccionSalidaId?: number | null;
+  sellerAddress?: SellerAddress | null;
 };
 
 export interface ModifiedOrderExtended extends ModifiedOrder {
@@ -468,7 +469,7 @@ export type InsertContentShipmentDetail = {
 
 type InsertContentShipmentExternal = {
   id_envio_temporal_usuario: number;
-  codigo_envio_externo: string | undefined;
+  codigo_envio_externo: string;
   id_usuario: number;
   fecha_hora_creacion: string;
   servicio: Type;