@things-factory/operato-hub 4.3.551 → 4.3.553

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 (7) hide show
  1. package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js +63 -20
  2. package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map +1 -1
  3. package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js +60 -18
  4. package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map +1 -1
  5. package/package.json +4 -4
  6. package/server/graphql/resolvers/synchronization/powrup-pack-order.ts +107 -23
  7. package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts +105 -19
package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js CHANGED
@@ -23,6 +23,7 @@ exports.powrupPackOrderResolver = {
23
23
  .innerJoinAndSelect('rg.domain', 'domain')
24
24
  .innerJoinAndSelect('rg.bizplace', 'bizplace')
25
25
  .innerJoinAndSelect('rg.creator', 'creator')
26
+ .innerJoinAndSelect('rg.creator', 'updater')
26
27
  .innerJoinAndSelect('rg.orderProducts', 'op')
27
28
  .innerJoinAndSelect('op.product', 'prd')
28
29
  .innerJoinAndSelect('op.productDetail', 'pd')
@@ -87,30 +88,21 @@ exports.powrupPackOrderResolver = {
87
88
  domain: releaseGood.domain,
88
89
  bizplace: releaseGood.bizplace,
89
90
  creator: releaseGood.creator,
90
- updater: releaseGood.updater
91
+ updater: releaseGood.updater,
92
+ originalPackResponse: JSON.stringify(pkg)
91
93
  };
92
94
  let savedOrderPackage = await tx2.getRepository(sales_base_1.OrderPackage).save(orderPackage);
93
- const orderPackageItems = items.map(itm => {
94
- const { refCode, qty } = itm;
95
- if (!refCode) {
96
- throw new Error(`universalIdentifier missing`);
97
- }
98
- const matchedOrderProduct = orderProducts.find(op => op.productDetail.refCode == refCode);
99
- return {
100
- name: sales_base_1.OrderNoGenerator.orderPackageItem(),
101
- orderProduct: matchedOrderProduct,
102
- status: sales_base_1.ORDER_STATUS.PROCESSING,
103
- releaseQty: qty,
104
- orderPackage: savedOrderPackage,
105
- domain: releaseGood.domain,
106
- bizplace: releaseGood.bizplace,
107
- creator: releaseGood.creator,
108
- updater: releaseGood.updater,
109
- productDetail: matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.productDetail
110
- };
111
- });
95
+ const orderPackageItems = await createOrderPackageItems(orderProducts, savedOrderPackage, items, releaseGood, false);
112
96
  await tx2.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
113
97
  }
98
+ const unassignedOrderProducts = orderProducts.filter(op => {
99
+ return (op.releaseQty > 0 ||
100
+ !packages.some(pkg => pkg.items.some(itm => itm.refCode === op.productDetail.refCode)));
101
+ });
102
+ if (unassignedOrderProducts.length > 0) {
103
+ let unassignedPackageItems = await assignUnassignedOrderItems(tx2, releaseGood, unassignedOrderProducts);
104
+ await tx2.getRepository(sales_base_1.OrderPackageItem).save(unassignedPackageItems);
105
+ }
114
106
  }
115
107
  }
116
108
  catch (e) {
@@ -137,4 +129,55 @@ exports.powrupPackOrderResolver = {
137
129
  }
138
130
  }
139
131
  };
132
+ async function createOrderPackageItems(orderProducts, orderPackage, items, releaseGood, unassignedItems) {
133
+ return items
134
+ .map(itm => {
135
+ var _a;
136
+ const { refCode, qty, productDetail, releaseQty } = itm;
137
+ if (!refCode && !unassignedItems) {
138
+ throw new Error(`universalIdentifier missing`);
139
+ }
140
+ const idx = orderProducts.findIndex(op => { var _a, _b; return ((_a = op.productDetail) === null || _a === void 0 ? void 0 : _a.refCode) == refCode || ((_b = op.productDetail) === null || _b === void 0 ? void 0 : _b.refCode) == (productDetail === null || productDetail === void 0 ? void 0 : productDetail.refCode); });
141
+ const matchedOrderProduct = idx !== -1 ? Object.assign({}, orderProducts[idx]) : undefined;
142
+ const matchedOrderPackageItem = (_a = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.orderPackageItems) === null || _a === void 0 ? void 0 : _a.find(itm => itm.orderProductId == (matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.id));
143
+ if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
144
+ return null;
145
+ }
146
+ const commonProperties = {
147
+ orderProduct: matchedOrderProduct,
148
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
149
+ orderPackage: orderPackage,
150
+ domain: releaseGood.domain,
151
+ bizplace: releaseGood.bizplace,
152
+ creator: releaseGood.creator,
153
+ updater: releaseGood.updater,
154
+ productDetail: matchedOrderProduct.productDetail
155
+ };
156
+ // If an existing order package item is found, update its release quantity
157
+ if (matchedOrderPackageItem) {
158
+ return Object.assign(Object.assign({}, commonProperties), { id: matchedOrderPackageItem.id, name: matchedOrderPackageItem.name, releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0) });
159
+ }
160
+ // Update release quantity of the matched order product
161
+ orderProducts[idx].releaseQty = (orderProducts[idx].releaseQty || 0) - (qty || 0);
162
+ // Return a new order package item if no existing item was found
163
+ return Object.assign(Object.assign({}, commonProperties), { name: sales_base_1.OrderNoGenerator.orderPackageItem(), releaseQty: releaseQty
164
+ ? releaseQty
165
+ : qty > matchedOrderProduct.releaseQty
166
+ ? matchedOrderProduct.releaseQty
167
+ : qty });
168
+ })
169
+ .filter(item => item != null);
170
+ }
171
+ async function assignUnassignedOrderItems(tx2, releaseGood, unassignedItems) {
172
+ const orderPackages = await tx2.getRepository(sales_base_1.OrderPackage).find({
173
+ where: { releaseGood: releaseGood.id },
174
+ relations: ['orderPackageItems']
175
+ });
176
+ let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
177
+ return (currentOrderPackage === null || currentOrderPackage === void 0 ? void 0 : currentOrderPackage.orderPackageItems.length) < (minOrderPackage === null || minOrderPackage === void 0 ? void 0 : minOrderPackage.orderPackageItems.length)
178
+ ? currentOrderPackage
179
+ : minOrderPackage;
180
+ }, orderPackages[0]);
181
+ return await createOrderPackageItems(unassignedItems, selectedOrderPackage, unassignedItems, releaseGood, true);
182
+ }
140
183
  //# sourceMappingURL=powrup-pack-order.js.map
package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"powrup-pack-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/powrup-pack-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js CHANGED
@@ -26,6 +26,7 @@ exports.sellercraftPackMarketplaceOrderResolver = {
26
26
  .createQueryBuilder('rg')
27
27
  .innerJoinAndSelect('rg.domain', 'domain')
28
28
  .innerJoinAndSelect('rg.creator', 'creator')
29
+ .innerJoinAndSelect('rg.updater', 'updater')
29
30
  .innerJoinAndSelect('rg.orderProducts', 'op')
30
31
  .innerJoinAndSelect('op.product', 'prd')
31
32
  .leftJoinAndSelect('op.productDetail', 'pd')
@@ -62,7 +63,9 @@ exports.sellercraftPackMarketplaceOrderResolver = {
62
63
  };
63
64
  await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
64
65
  try {
65
- const orderProducts = releaseGood.orderProducts;
66
+ //sourceData contains the original order products created through api
67
+ const sourceData = JSON.parse(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.sourceData);
68
+ const orderProducts = sourceData.orderProducts;
66
69
  let sellercraftOPs = [];
67
70
  sellercraftOPs = orderProducts.map(orderProduct => {
68
71
  const product = orderProduct.product;
@@ -98,27 +101,21 @@ exports.sellercraftPackMarketplaceOrderResolver = {
98
101
  domain: releaseGood.domain,
99
102
  bizplace,
100
103
  creator: releaseGood.creator,
101
- updater: releaseGood.updater
104
+ updater: releaseGood.updater,
105
+ originalPackResponse: JSON.stringify(pkg)
102
106
  };
103
107
  let savedOrderPackage = await tx2.getRepository(sales_base_1.OrderPackage).save(orderPackage);
104
- const orderPackageItems = items.map(itm => {
105
- const { sku, qty } = itm;
106
- const matchedOrderProduct = orderProducts.find(op => op.product.sku == sku);
107
- return {
108
- name: sales_base_1.OrderNoGenerator.orderPackageItem(),
109
- orderProduct: matchedOrderProduct,
110
- status: sales_base_1.ORDER_STATUS.PROCESSING,
111
- releaseQty: qty,
112
- orderPackage: savedOrderPackage,
113
- domain: releaseGood.domain,
114
- bizplace,
115
- creator: releaseGood.creator,
116
- updater: releaseGood.updater,
117
- productDetail: matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.productDetail
118
- };
119
- });
108
+ const orderPackageItems = await createOrderPackageItems(releaseGood.orderProducts, savedOrderPackage, items, Object.assign(Object.assign({}, releaseGood), { bizplace }));
120
109
  await tx2.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
121
110
  }
111
+ const unassignedOrderProducts = releaseGood.orderProducts.filter(op => {
112
+ return (op.releaseQty > 0 ||
113
+ !packages.some(pkg => pkg.items.some(itm => itm.sku === op.product.sku)));
114
+ });
115
+ if (unassignedOrderProducts.length > 0) {
116
+ let unassignedPackageItems = await assignUnassignedOrderItems(tx2, Object.assign(Object.assign({}, releaseGood), { bizplace }), unassignedOrderProducts);
117
+ await tx2.getRepository(sales_base_1.OrderPackageItem).save(unassignedPackageItems);
118
+ }
122
119
  }
123
120
  }
124
121
  catch (e) {
@@ -141,4 +138,49 @@ exports.sellercraftPackMarketplaceOrderResolver = {
141
138
  }
142
139
  }
143
140
  };
141
+ async function createOrderPackageItems(orderProducts, orderPackage, items, releaseGood) {
142
+ return items
143
+ .map(itm => {
144
+ var _a;
145
+ const { sku, qty, product, releaseQty } = itm;
146
+ const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == (product === null || product === void 0 ? void 0 : product.sku));
147
+ const matchedOrderProduct = idx !== -1 ? Object.assign({}, orderProducts[idx]) : undefined;
148
+ const matchedOrderPackageItem = (_a = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.orderPackageItems) === null || _a === void 0 ? void 0 : _a.find(itm => itm.orderProductId === (matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.id));
149
+ if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
150
+ return null;
151
+ }
152
+ const commonProperties = {
153
+ orderProduct: matchedOrderProduct,
154
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
155
+ orderPackage: orderPackage,
156
+ domain: releaseGood.domain,
157
+ bizplace: releaseGood.bizplace,
158
+ creator: releaseGood.creator,
159
+ updater: releaseGood.updater,
160
+ productDetail: matchedOrderProduct.productDetail
161
+ };
162
+ // If an existing order package item is found, update its release quantity
163
+ if (matchedOrderPackageItem) {
164
+ return Object.assign(Object.assign({}, commonProperties), { id: matchedOrderPackageItem.id, name: matchedOrderPackageItem.name, releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0) });
165
+ }
166
+ // Update release quantity of the matched order product
167
+ releaseGood.orderProducts[idx].releaseQty =
168
+ (releaseGood.orderProducts[idx].releaseQty || 0) - (qty || releaseQty || 0);
169
+ // Return a new order package item if no existing item was found
170
+ return Object.assign(Object.assign({}, commonProperties), { name: sales_base_1.OrderNoGenerator.orderPackageItem(), releaseQty: releaseQty ? releaseQty : (qty > matchedOrderProduct.releaseQty ? matchedOrderProduct.releaseQty : qty) });
171
+ })
172
+ .filter(item => item != null);
173
+ }
174
+ async function assignUnassignedOrderItems(tx2, releaseGood, unassignedOrderProducts) {
175
+ const orderPackages = await tx2.getRepository(sales_base_1.OrderPackage).find({
176
+ where: { releaseGood: releaseGood.id },
177
+ relations: ['orderPackageItems']
178
+ });
179
+ let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
180
+ return (currentOrderPackage === null || currentOrderPackage === void 0 ? void 0 : currentOrderPackage.orderPackageItems.length) < (minOrderPackage === null || minOrderPackage === void 0 ? void 0 : minOrderPackage.orderPackageItems.length)
181
+ ? currentOrderPackage
182
+ : minOrderPackage;
183
+ }, orderPackages[0]);
184
+ return await createOrderPackageItems(unassignedOrderProducts, selectedOrderPackage, unassignedOrderProducts, releaseGood);
185
+ }
144
186
  //# sourceMappingURL=sellercraft-pack-marketplace-order.js.map
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.551",
3
+ "version": "4.3.553",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -92,7 +92,7 @@
92
92
  "@things-factory/pdf": "^4.3.534",
93
93
  "@things-factory/product-ui": "^4.3.535",
94
94
  "@things-factory/resource-ui": "^4.3.535",
95
- "@things-factory/sales-base": "^4.3.551",
95
+ "@things-factory/sales-base": "^4.3.552",
96
96
  "@things-factory/scene-data-transform": "^4.3.534",
97
97
  "@things-factory/scene-excel": "^4.3.534",
98
98
  "@things-factory/scene-firebase": "^4.3.534",
@@ -109,7 +109,7 @@
109
109
  "@things-factory/system-ui": "^4.3.535",
110
110
  "@things-factory/transport-base": "^4.3.535",
111
111
  "@things-factory/warehouse-base": "^4.3.551",
112
- "@things-factory/worksheet-base": "^4.3.551",
112
+ "@things-factory/worksheet-base": "^4.3.553",
113
113
  "cron-parser": "^4.7.0",
114
114
  "koa2-swagger-ui": "^5.0.2",
115
115
  "swagger-jsdoc": "^5.0.0",
@@ -122,5 +122,5 @@
122
122
  "resolutions": {
123
123
  "core-js": "^3.16.0"
124
124
  },
125
- "gitHead": "0c07b711097eae74c8d75c938c9d9580d2fdf4ab"
125
+ "gitHead": "e16458e0795f213e33fd9bb94b96bde1b53c1e3b"
126
126
  }
package/server/graphql/resolvers/synchronization/powrup-pack-order.ts CHANGED
@@ -31,6 +31,7 @@ export const powrupPackOrderResolver = {
31
31
  .innerJoinAndSelect('rg.domain', 'domain')
32
32
  .innerJoinAndSelect('rg.bizplace', 'bizplace')
33
33
  .innerJoinAndSelect('rg.creator', 'creator')
34
+ .innerJoinAndSelect('rg.creator', 'updater')
34
35
  .innerJoinAndSelect('rg.orderProducts', 'op')
35
36
  .innerJoinAndSelect('op.product', 'prd')
36
37
  .innerJoinAndSelect('op.productDetail', 'pd')
@@ -114,36 +115,39 @@ export const powrupPackOrderResolver = {
114
115
  domain: releaseGood.domain,
115
116
  bizplace: releaseGood.bizplace,
116
117
  creator: releaseGood.creator,
117
- updater: releaseGood.updater
118
+ updater: releaseGood.updater,
119
+ originalPackResponse: JSON.stringify(pkg)
118
120
  }
119
121
 
120
122
  let savedOrderPackage: OrderPackage = await tx2.getRepository(OrderPackage).save(orderPackage)
121
123
 
122
- const orderPackageItems: OrderPackageItem[] = items.map(itm => {
123
- const { refCode, qty } = itm
124
- if (!refCode) {
125
- throw new Error(`universalIdentifier missing`)
126
- }
127
- const matchedOrderProduct: OrderProduct = orderProducts.find(
128
- op => op.productDetail.refCode == refCode
129
- )
130
-
131
- return {
132
- name: OrderNoGenerator.orderPackageItem(),
133
- orderProduct: matchedOrderProduct,
134
- status: ORDER_STATUS.PROCESSING,
135
- releaseQty: qty,
136
- orderPackage: savedOrderPackage,
137
- domain: releaseGood.domain,
138
- bizplace: releaseGood.bizplace,
139
- creator: releaseGood.creator,
140
- updater: releaseGood.updater,
141
- productDetail: matchedOrderProduct?.productDetail
142
- }
143
- })
124
+ const orderPackageItems: OrderPackageItem[] = await createOrderPackageItems(
125
+ orderProducts,
126
+ savedOrderPackage,
127
+ items,
128
+ releaseGood,
129
+ false
130
+ )
144
131
 
145
132
  await tx2.getRepository(OrderPackageItem).save(orderPackageItems)
146
133
  }
134
+
135
+ const unassignedOrderProducts: OrderProduct[] = orderProducts.filter(op => {
136
+ return (
137
+ op.releaseQty > 0 ||
138
+ !packages.some(pkg => pkg.items.some(itm => itm.refCode === op.productDetail.refCode))
139
+ )
140
+ })
141
+
142
+ if (unassignedOrderProducts.length > 0) {
143
+ let unassignedPackageItems: OrderPackageItem[] = await assignUnassignedOrderItems(
144
+ tx2,
145
+ releaseGood,
146
+ unassignedOrderProducts
147
+ )
148
+
149
+ await tx2.getRepository(OrderPackageItem).save(unassignedPackageItems)
150
+ }
147
151
  }
148
152
  } catch (e) {
149
153
  performance.mark(`end:${releaseGood.refOrderId}`)
@@ -172,3 +176,83 @@ export const powrupPackOrderResolver = {
172
176
  }
173
177
  }
174
178
  }
179
+
180
+ async function createOrderPackageItems(
181
+ orderProducts: OrderProduct[],
182
+ orderPackage: OrderPackage,
183
+ items: any[],
184
+ releaseGood: ReleaseGood,
185
+ unassignedItems?: Boolean
186
+ ) {
187
+ return items
188
+ .map(itm => {
189
+ const { refCode, qty, productDetail, releaseQty } = itm
190
+ if (!refCode && !unassignedItems) {
191
+ throw new Error(`universalIdentifier missing`)
192
+ }
193
+ const idx = orderProducts.findIndex(
194
+ op => op.productDetail?.refCode == refCode || op.productDetail?.refCode == productDetail?.refCode
195
+ )
196
+
197
+ const matchedOrderProduct: OrderProduct = idx !== -1 ? { ...orderProducts[idx] } : undefined
198
+
199
+ const matchedOrderPackageItem: OrderPackageItem = orderPackage?.orderPackageItems?.find(
200
+ itm => itm.orderProductId == matchedOrderProduct?.id
201
+ )
202
+
203
+ if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
204
+ return null
205
+ }
206
+
207
+ const commonProperties = {
208
+ orderProduct: matchedOrderProduct,
209
+ status: ORDER_STATUS.PROCESSING,
210
+ orderPackage: orderPackage,
211
+ domain: releaseGood.domain,
212
+ bizplace: releaseGood.bizplace,
213
+ creator: releaseGood.creator,
214
+ updater: releaseGood.updater,
215
+ productDetail: matchedOrderProduct.productDetail
216
+ }
217
+
218
+ // If an existing order package item is found, update its release quantity
219
+ if (matchedOrderPackageItem) {
220
+ return {
221
+ ...commonProperties,
222
+ id: matchedOrderPackageItem.id,
223
+ name: matchedOrderPackageItem.name,
224
+ releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0)
225
+ }
226
+ }
227
+
228
+ // Update release quantity of the matched order product
229
+ orderProducts[idx].releaseQty = (orderProducts[idx].releaseQty || 0) - (qty || 0)
230
+
231
+ // Return a new order package item if no existing item was found
232
+ return {
233
+ ...commonProperties,
234
+ name: OrderNoGenerator.orderPackageItem(),
235
+ releaseQty: releaseQty
236
+ ? releaseQty
237
+ : qty > matchedOrderProduct.releaseQty
238
+ ? matchedOrderProduct.releaseQty
239
+ : qty
240
+ }
241
+ })
242
+ .filter(item => item != null)
243
+ }
244
+
245
+ async function assignUnassignedOrderItems(tx2, releaseGood: ReleaseGood, unassignedItems: any) {
246
+ const orderPackages: OrderPackage[] = await tx2.getRepository(OrderPackage).find({
247
+ where: { releaseGood: releaseGood.id },
248
+ relations: ['orderPackageItems']
249
+ })
250
+
251
+ let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
252
+ return currentOrderPackage?.orderPackageItems.length < minOrderPackage?.orderPackageItems.length
253
+ ? currentOrderPackage
254
+ : minOrderPackage
255
+ }, orderPackages[0])
256
+
257
+ return await createOrderPackageItems(unassignedItems, selectedOrderPackage, unassignedItems, releaseGood, true)
258
+ }
package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts CHANGED
@@ -36,6 +36,7 @@ export const sellercraftPackMarketplaceOrderResolver = {
36
36
  .createQueryBuilder('rg')
37
37
  .innerJoinAndSelect('rg.domain', 'domain')
38
38
  .innerJoinAndSelect('rg.creator', 'creator')
39
+ .innerJoinAndSelect('rg.updater', 'updater')
39
40
  .innerJoinAndSelect('rg.orderProducts', 'op')
40
41
  .innerJoinAndSelect('op.product', 'prd')
41
42
  .leftJoinAndSelect('op.productDetail', 'pd')
@@ -79,7 +80,9 @@ export const sellercraftPackMarketplaceOrderResolver = {
79
80
 
80
81
  await getConnection().transaction(async tx2 => {
81
82
  try {
82
- const orderProducts: OrderProduct[] = releaseGood.orderProducts
83
+ //sourceData contains the original order products created through api
84
+ const sourceData: any = JSON.parse(releaseGood?.sourceData)
85
+ const orderProducts: OrderProduct[] = sourceData.orderProducts
83
86
  let sellercraftOPs: any[] = []
84
87
 
85
88
  sellercraftOPs = orderProducts.map(orderProduct => {
@@ -134,31 +137,38 @@ export const sellercraftPackMarketplaceOrderResolver = {
134
137
  domain: releaseGood.domain,
135
138
  bizplace,
136
139
  creator: releaseGood.creator,
137
- updater: releaseGood.updater
140
+ updater: releaseGood.updater,
141
+ originalPackResponse: JSON.stringify(pkg)
138
142
  }
139
143
 
140
144
  let savedOrderPackage: OrderPackage = await tx2.getRepository(OrderPackage).save(orderPackage)
141
145
 
142
- const orderPackageItems: OrderPackageItem[] = items.map(itm => {
143
- const { sku, qty } = itm
144
- const matchedOrderProduct: OrderProduct = orderProducts.find(op => op.product.sku == sku)
145
-
146
- return {
147
- name: OrderNoGenerator.orderPackageItem(),
148
- orderProduct: matchedOrderProduct,
149
- status: ORDER_STATUS.PROCESSING,
150
- releaseQty: qty,
151
- orderPackage: savedOrderPackage,
152
- domain: releaseGood.domain,
153
- bizplace,
154
- creator: releaseGood.creator,
155
- updater: releaseGood.updater,
156
- productDetail: matchedOrderProduct?.productDetail
157
- }
158
- })
146
+ const orderPackageItems: OrderPackageItem[] = await createOrderPackageItems(
147
+ releaseGood.orderProducts,
148
+ savedOrderPackage,
149
+ items,
150
+ { ...releaseGood, bizplace }
151
+ )
159
152
 
160
153
  await tx2.getRepository(OrderPackageItem).save(orderPackageItems)
161
154
  }
155
+
156
+ const unassignedOrderProducts: OrderProduct[] = releaseGood.orderProducts.filter(op => {
157
+ return (
158
+ op.releaseQty > 0 ||
159
+ !packages.some(pkg => pkg.items.some(itm => itm.sku === op.product.sku))
160
+ )
161
+ })
162
+
163
+ if (unassignedOrderProducts.length > 0) {
164
+ let unassignedPackageItems: OrderPackageItem[] = await assignUnassignedOrderItems(
165
+ tx2,
166
+ { ...releaseGood, bizplace },
167
+ unassignedOrderProducts
168
+ )
169
+
170
+ await tx2.getRepository(OrderPackageItem).save(unassignedPackageItems)
171
+ }
162
172
  }
163
173
  } catch (e) {
164
174
  logger.error(`sellercraftPackMarketplaceOrder: ${e}`)
@@ -180,3 +190,79 @@ export const sellercraftPackMarketplaceOrderResolver = {
180
190
  }
181
191
  }
182
192
  }
193
+
194
+ async function createOrderPackageItems(
195
+ orderProducts: OrderProduct[],
196
+ orderPackage: OrderPackage,
197
+ items: any[],
198
+ releaseGood: ReleaseGood
199
+ ) {
200
+ return items
201
+ .map(itm => {
202
+ const { sku, qty, product, releaseQty } = itm
203
+ const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == product?.sku)
204
+
205
+ const matchedOrderProduct = idx !== -1 ? { ...orderProducts[idx] } : undefined
206
+
207
+ const matchedOrderPackageItem: OrderPackageItem = orderPackage?.orderPackageItems?.find(
208
+ itm => itm.orderProductId === matchedOrderProduct?.id
209
+ )
210
+
211
+ if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
212
+ return null
213
+ }
214
+
215
+ const commonProperties = {
216
+ orderProduct: matchedOrderProduct,
217
+ status: ORDER_STATUS.PROCESSING,
218
+ orderPackage: orderPackage,
219
+ domain: releaseGood.domain,
220
+ bizplace: releaseGood.bizplace,
221
+ creator: releaseGood.creator,
222
+ updater: releaseGood.updater,
223
+ productDetail: matchedOrderProduct.productDetail
224
+ }
225
+
226
+ // If an existing order package item is found, update its release quantity
227
+ if (matchedOrderPackageItem) {
228
+ return {
229
+ ...commonProperties,
230
+ id: matchedOrderPackageItem.id,
231
+ name: matchedOrderPackageItem.name,
232
+ releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0)
233
+ }
234
+ }
235
+
236
+ // Update release quantity of the matched order product
237
+
238
+ releaseGood.orderProducts[idx].releaseQty =
239
+ (releaseGood.orderProducts[idx].releaseQty || 0) - (qty || releaseQty || 0)
240
+
241
+ // Return a new order package item if no existing item was found
242
+ return {
243
+ ...commonProperties,
244
+ name: OrderNoGenerator.orderPackageItem(),
245
+ releaseQty: releaseQty ? releaseQty : (qty > matchedOrderProduct.releaseQty ? matchedOrderProduct.releaseQty : qty )
246
+ }
247
+ })
248
+ .filter(item => item != null)
249
+ }
250
+
251
+ async function assignUnassignedOrderItems(tx2, releaseGood: ReleaseGood, unassignedOrderProducts: OrderProduct[]) {
252
+ const orderPackages: OrderPackage[] = await tx2.getRepository(OrderPackage).find({
253
+ where: { releaseGood: releaseGood.id },
254
+ relations: ['orderPackageItems']
255
+ })
256
+
257
+ let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
258
+ return currentOrderPackage?.orderPackageItems.length < minOrderPackage?.orderPackageItems.length
259
+ ? currentOrderPackage
260
+ : minOrderPackage
261
+ }, orderPackages[0])
262
+ return await createOrderPackageItems(
263
+ unassignedOrderProducts,
264
+ selectedOrderPackage,
265
+ unassignedOrderProducts,
266
+ releaseGood
267
+ )
268
+ }