@things-factory/sales-base 3.8.30 → 3.8.31

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.
@@ -32,26 +32,22 @@ async function confirmReleaseGood(name, context, tx) {
32
32
  const { user, domain } = context.state;
33
33
  let foundReleaseGood = await tx.getRepository(entities_1.ReleaseGood).findOne({
34
34
  where: { name, status: constants_1.ORDER_STATUS.PENDING },
35
- relations: [
36
- 'domain',
37
- 'bizplace',
38
- 'bizplace.domain',
39
- 'bizplace.company',
40
- 'bizplace.company.domain',
41
- 'orderProducts',
42
- 'orderProducts.product',
43
- 'orderProducts.product.productDetails',
44
- 'orderInventories',
45
- 'orderInventories.product',
46
- 'orderVass'
47
- ]
35
+ relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
48
36
  });
49
37
  if (!foundReleaseGood)
50
38
  throw new Error(`Release good order doesn't exists.`);
51
- let foundOIs = foundReleaseGood.orderInventories;
39
+ // query orderInventories separately from releaseGood to reduce resource usage
40
+ let foundOIs = await tx.getRepository(entities_1.OrderInventory).find({
41
+ where: { domain, releaseGood: foundReleaseGood },
42
+ relations: ['product']
43
+ });
44
+ // query orderProducts separately from releaseGood to reduce resource usage
45
+ let foundOPs = await tx.getRepository(entities_1.OrderProduct).find({
46
+ where: { domain, releaseGood: foundReleaseGood },
47
+ relations: ['product', 'product.productDetails']
48
+ });
52
49
  let foundBundleInfo = JSON.parse(foundReleaseGood.bundleInfo);
53
50
  let foundOVs = foundReleaseGood.orderVass;
54
- let foundOPs = foundReleaseGood.orderProducts;
55
51
  let customerBizplace = foundReleaseGood.bizplace;
56
52
  const companyDomain = customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.company.domain;
57
53
  const sellercraft = await tx
@@ -60,7 +56,7 @@ async function confirmReleaseGood(name, context, tx) {
60
56
  if (foundReleaseGood.type == 'b2c') {
61
57
  if (sellercraft) {
62
58
  const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
63
- foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
59
+ foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, foundReleaseGood), { orderProducts: foundOPs }));
64
60
  }
65
61
  else {
66
62
  // find for any existing marketplace store connections
@@ -1 +1 @@
1
- {"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/sales-base",
3
- "version": "3.8.30",
3
+ "version": "3.8.31",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -29,11 +29,11 @@
29
29
  "@things-factory/biz-base": "^3.8.29",
30
30
  "@things-factory/code-base": "^3.8.0",
31
31
  "@things-factory/notification": "^3.8.0",
32
- "@things-factory/product-base": "^3.8.30",
32
+ "@things-factory/product-base": "^3.8.31",
33
33
  "@things-factory/setting-base": "^3.8.0",
34
34
  "@things-factory/shell": "^3.8.0",
35
35
  "@things-factory/transport-base": "^3.8.29",
36
- "@things-factory/warehouse-base": "^3.8.30"
36
+ "@things-factory/warehouse-base": "^3.8.31"
37
37
  },
38
- "gitHead": "bf379e59ba4cc6455dca937abba19c35c6339525"
38
+ "gitHead": "5deb948aa45a0aea4d787b5380667dc0c9d1f889"
39
39
  }
@@ -39,26 +39,25 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
39
39
 
40
40
  let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
41
41
  where: { name, status: ORDER_STATUS.PENDING },
42
- relations: [
43
- 'domain',
44
- 'bizplace',
45
- 'bizplace.domain',
46
- 'bizplace.company',
47
- 'bizplace.company.domain',
48
- 'orderProducts',
49
- 'orderProducts.product',
50
- 'orderProducts.product.productDetails',
51
- 'orderInventories',
52
- 'orderInventories.product',
53
- 'orderVass'
54
- ]
42
+ relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
55
43
  })
56
44
 
57
45
  if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
58
- let foundOIs: OrderInventory[] = foundReleaseGood.orderInventories
46
+
47
+ // query orderInventories separately from releaseGood to reduce resource usage
48
+ let foundOIs: OrderInventory[] = await tx.getRepository(OrderInventory).find({
49
+ where: { domain, releaseGood: foundReleaseGood },
50
+ relations: ['product']
51
+ })
52
+
53
+ // query orderProducts separately from releaseGood to reduce resource usage
54
+ let foundOPs: OrderProduct[] = await tx.getRepository(OrderProduct).find({
55
+ where: { domain, releaseGood: foundReleaseGood },
56
+ relations: ['product', 'product.productDetails']
57
+ })
58
+
59
59
  let foundBundleInfo: any[] = JSON.parse(foundReleaseGood.bundleInfo)
60
60
  let foundOVs: OrderVas[] = foundReleaseGood.orderVass
61
- let foundOPs: OrderProduct[] = foundReleaseGood.orderProducts
62
61
  let customerBizplace: Bizplace = foundReleaseGood.bizplace
63
62
  const companyDomain: Domain = customerBizplace?.company.domain
64
63
  const sellercraft: Sellercraft = await tx
@@ -68,7 +67,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
68
67
  if (foundReleaseGood.type == 'b2c') {
69
68
  if (sellercraft) {
70
69
  const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
71
- foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
70
+ foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
72
71
  } else {
73
72
  // find for any existing marketplace store connections
74
73
  let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({