@things-factory/operato-hub 4.3.146 → 4.3.147

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js +54 -51
  2. package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map +1 -1
  3. package/package.json +2 -2
  4. package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts +51 -49
package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js CHANGED
@@ -51,65 +51,68 @@ exports.sellercraftPackMarketplaceOrderResolver = {
51
51
  let releaseGoodsWithoutPackageId = await releaseGoodQb.getMany();
52
52
  if ((releaseGoodsWithoutPackageId === null || releaseGoodsWithoutPackageId === void 0 ? void 0 : releaseGoodsWithoutPackageId.length) > 0) {
53
53
  await Promise.all(releaseGoodsWithoutPackageId.map(async (releaseGood) => {
54
- try {
55
- const orderProducts = releaseGood.orderProducts;
56
- let sellercraftOPs = [];
57
- sellercraftOPs = orderProducts.map(orderProduct => {
58
- const product = orderProduct.product;
59
- return {
60
- sku: product.sku,
61
- releaseQty: orderProduct.releaseQty,
62
- uom: 'EA'
63
- };
64
- });
65
- const orderInformation = {
66
- accountId: sellercraft.accountId,
67
- orderId: releaseGood.refNo2,
68
- sellercraftOPs
69
- };
70
- const orderPack = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } } }));
71
- (0, integration_base_1.createPayloadLog)(sellercraft.accountId, `/order/pack`, orderInformation, JSON.stringify(orderPack), context, integration_base_1.PayloadType.EGESTION, 'scheduler');
72
- if (orderPack === null || orderPack === void 0 ? void 0 : orderPack.packages) {
73
- const packages = orderPack.packages;
74
- await tx
75
- .getRepository(sales_base_1.ReleaseGood)
76
- .update({ id: releaseGood.id }, { packageId: packages[0].packageId, updatedAt: new Date() });
77
- await Promise.all(packages.map(async (pkg) => {
78
- const items = pkg.items;
79
- const orderPackage = {
80
- name: sales_base_1.OrderNoGenerator.orderPackage(),
81
- packageId: pkg.packageId,
82
- status: sales_base_1.ORDER_STATUS.PROCESSING,
83
- releaseGood,
84
- domain: releaseGood.domain,
85
- bizplace,
86
- creator: releaseGood.creator,
87
- updater: releaseGood.updater
54
+ await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
55
+ try {
56
+ const orderProducts = releaseGood.orderProducts;
57
+ let sellercraftOPs = [];
58
+ sellercraftOPs = orderProducts.map(orderProduct => {
59
+ const product = orderProduct.product;
60
+ return {
61
+ sku: product.sku,
62
+ releaseQty: orderProduct.releaseQty,
63
+ uom: 'EA'
88
64
  };
89
- let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
90
- const orderPackageItems = items.map(itm => {
91
- const { sku, qty } = itm;
92
- const matchedOrderProduct = orderProducts.find(op => op.product.sku == sku);
93
- return {
94
- name: sales_base_1.OrderNoGenerator.orderPackageItem(),
95
- orderProduct: matchedOrderProduct,
65
+ });
66
+ const orderInformation = {
67
+ accountId: sellercraft.accountId,
68
+ orderId: releaseGood.refNo2,
69
+ sellercraftOPs
70
+ };
71
+ const orderPack = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } } }));
72
+ (0, integration_base_1.createPayloadLog)(sellercraft.accountId, `/order/pack`, orderInformation, JSON.stringify(orderPack), { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } }, integration_base_1.PayloadType.EGESTION, 'scheduler');
73
+ if (orderPack === null || orderPack === void 0 ? void 0 : orderPack.packages) {
74
+ const packages = orderPack.packages;
75
+ await tx2
76
+ .getRepository(sales_base_1.ReleaseGood)
77
+ .update({ id: releaseGood.id }, { packageId: packages[0].packageId, updatedAt: new Date() });
78
+ for (let idx = 0; idx < packages.length; idx++) {
79
+ let pkg = packages[idx];
80
+ const items = pkg.items;
81
+ const orderPackage = {
82
+ name: sales_base_1.OrderNoGenerator.orderPackage(),
83
+ packageId: pkg.packageId,
96
84
  status: sales_base_1.ORDER_STATUS.PROCESSING,
97
- releaseQty: qty,
98
- orderPackage: savedOrderPackage,
85
+ releaseGood,
99
86
  domain: releaseGood.domain,
100
87
  bizplace,
101
88
  creator: releaseGood.creator,
102
89
  updater: releaseGood.updater
103
90
  };
104
- });
105
- await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
106
- }));
91
+ let savedOrderPackage = await tx2.getRepository(sales_base_1.OrderPackage).save(orderPackage);
92
+ const orderPackageItems = items.map(itm => {
93
+ const { sku, qty } = itm;
94
+ const matchedOrderProduct = orderProducts.find(op => op.product.sku == sku);
95
+ return {
96
+ name: sales_base_1.OrderNoGenerator.orderPackageItem(),
97
+ orderProduct: matchedOrderProduct,
98
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
99
+ releaseQty: qty,
100
+ orderPackage: savedOrderPackage,
101
+ domain: releaseGood.domain,
102
+ bizplace,
103
+ creator: releaseGood.creator,
104
+ updater: releaseGood.updater
105
+ };
106
+ });
107
+ await tx2.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
108
+ }
109
+ }
110
+ }
111
+ catch (e) {
112
+ env_1.logger.error(`sellercraftPackMarketplaceOrder: ${e}`);
113
+ await tx2.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true });
107
114
  }
108
- }
109
- catch (e) {
110
- env_1.logger.error(`sellercraftPackMarketplaceOrder: ${e}`);
111
- await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true });
112
- }
115
+ });
113
116
  }));
114
117
  }
115
118
  }
package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.146",
3
+ "version": "4.3.147",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -117,5 +117,5 @@
117
117
  "resolutions": {
118
118
  "core-js": "^3.16.0"
119
119
  },
120
- "gitHead": "919fc314fca9647235fb02b8837e5c42813455bb"
120
+ "gitHead": "a8fbd4a85889b0ee87ac41e1686ab6b98d893dbf"
121
121
  }
package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts CHANGED
@@ -17,7 +17,7 @@ import { Domain } from '@things-factory/shell'
17
17
  import { Worksheet } from '@things-factory/worksheet-base'
18
18
 
19
19
  export const sellercraftPackMarketplaceOrderResolver = {
20
- async sellercraftPackMarketplaceOrder(_: void, {}, context: any): Promise<void> {
20
+ async sellercraftPackMarketplaceOrder(_: void, { }, context: any): Promise<void> {
21
21
  try {
22
22
  await getConnection().transaction(async tx => {
23
23
  const sellercrafts: Sellercraft[] = await tx
@@ -64,50 +64,51 @@ export const sellercraftPackMarketplaceOrderResolver = {
64
64
  if (releaseGoodsWithoutPackageId?.length > 0) {
65
65
  await Promise.all(
66
66
  releaseGoodsWithoutPackageId.map(async releaseGood => {
67
- try {
68
- const orderProducts: OrderProduct[] = releaseGood.orderProducts
69
- let sellercraftOPs: any[] = []
67
+ await getConnection().transaction(async tx2 => {
68
+ try {
69
+ const orderProducts: OrderProduct[] = releaseGood.orderProducts
70
+ let sellercraftOPs: any[] = []
71
+
72
+ sellercraftOPs = orderProducts.map(orderProduct => {
73
+ const product: Product = orderProduct.product
74
+
75
+ return {
76
+ sku: product.sku,
77
+ releaseQty: orderProduct.releaseQty,
78
+ uom: 'EA'
79
+ }
80
+ })
81
+
82
+ const orderInformation: any = {
83
+ accountId: sellercraft.accountId,
84
+ orderId: releaseGood.refNo2,
85
+ sellercraftOPs
86
+ }
70
87
 
71
- sellercraftOPs = orderProducts.map(orderProduct => {
72
- const product: Product = orderProduct.product
88
+ const orderPack: any = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
89
+ ...orderInformation,
90
+ context: { state: { domain: releaseGood?.domain, user: null } }
91
+ })
92
+
93
+ createPayloadLog(
94
+ sellercraft.accountId,
95
+ `/order/pack`,
96
+ orderInformation,
97
+ JSON.stringify(orderPack),
98
+ { state: { domain: releaseGood?.domain, user: null } },
99
+ PayloadType.EGESTION,
100
+ 'scheduler'
101
+ )
73
102
 
74
- return {
75
- sku: product.sku,
76
- releaseQty: orderProduct.releaseQty,
77
- uom: 'EA'
78
- }
79
- })
103
+ if (orderPack?.packages) {
104
+ const packages: any[] = orderPack.packages
80
105
 
81
- const orderInformation: any = {
82
- accountId: sellercraft.accountId,
83
- orderId: releaseGood.refNo2,
84
- sellercraftOPs
85
- }
106
+ await tx2
107
+ .getRepository(ReleaseGood)
108
+ .update({ id: releaseGood.id }, { packageId: packages[0].packageId, updatedAt: new Date() })
86
109
 
87
- const orderPack: any = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
88
- ...orderInformation,
89
- context: { state: { domain: releaseGood?.domain, user: null } }
90
- })
91
-
92
- createPayloadLog(
93
- sellercraft.accountId,
94
- `/order/pack`,
95
- orderInformation,
96
- JSON.stringify(orderPack),
97
- context,
98
- PayloadType.EGESTION,
99
- 'scheduler'
100
- )
101
-
102
- if (orderPack?.packages) {
103
- const packages: any[] = orderPack.packages
104
-
105
- await tx
106
- .getRepository(ReleaseGood)
107
- .update({ id: releaseGood.id }, { packageId: packages[0].packageId, updatedAt: new Date() })
108
-
109
- await Promise.all(
110
- packages.map(async pkg => {
110
+ for (let idx = 0; idx < packages.length; idx++) {
111
+ let pkg = packages[idx]
111
112
  const items = pkg.items
112
113
  const orderPackage: OrderPackage = {
113
114
  name: OrderNoGenerator.orderPackage(),
@@ -120,7 +121,7 @@ export const sellercraftPackMarketplaceOrderResolver = {
120
121
  updater: releaseGood.updater
121
122
  }
122
123
 
123
- let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
124
+ let savedOrderPackage: OrderPackage = await tx2.getRepository(OrderPackage).save(orderPackage)
124
125
 
125
126
  const orderPackageItems: OrderPackageItem[] = items.map(itm => {
126
127
  const { sku, qty } = itm
@@ -139,14 +140,15 @@ export const sellercraftPackMarketplaceOrderResolver = {
139
140
  }
140
141
  })
141
142
 
142
- await tx.getRepository(OrderPackageItem).save(orderPackageItems)
143
- })
144
- )
143
+ await tx2.getRepository(OrderPackageItem).save(orderPackageItems)
144
+ }
145
+ }
146
+ } catch (e) {
147
+ logger.error(`sellercraftPackMarketplaceOrder: ${e}`)
148
+ await tx2.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
145
149
  }
146
- } catch (e) {
147
- logger.error(`sellercraftPackMarketplaceOrder: ${e}`)
148
- await tx.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
149
- }
150
+
151
+ })
150
152
  })
151
153
  )
152
154
  }