@things-factory/product-base 3.6.4 → 3.6.19

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.
@@ -10,7 +10,7 @@ exports.myBizplaceProductBundles = {
10
10
  async myBizplaceProductBundles(_, params, context) {
11
11
  const { domain, user } = context.state;
12
12
  const qb = (0, typeorm_1.getRepository)(entities_1.ProductBundle).createQueryBuilder();
13
- const productBundleFilter = params.filters.filter(x => x.name == 'product_info')[0];
13
+ const productBundleFilter = params.filters.find(x => x.name == 'product_info');
14
14
  const productFilterColumns = ['sku', 'name', 'description'];
15
15
  let filters = params.filters.filter(x => x.name != 'product_info');
16
16
  // add status filter to prevent user to see DELETED product bundles
@@ -21,7 +21,7 @@ exports.myBizplaceProductBundles = {
21
21
  params.filters = [...filters, { name: 'bizplace_id', operator: 'in', value: [bizplace.id] }];
22
22
  }
23
23
  (0, shell_1.buildQuery)(qb, params, context, false);
24
- if (productBundleFilter && productBundleFilter.length > 0) {
24
+ if (productBundleFilter) {
25
25
  qb.andWhere(new typeorm_1.Brackets(qb2 => {
26
26
  productFilterColumns.forEach(filter => {
27
27
  const condition = (0, shell_1.buildCondition)(qb.alias, filter, productBundleFilter.operator, productBundleFilter.value, productBundleFilter.relation, Object.keys(qb.getParameters()).length);
@@ -1 +1 @@
1
- {"version":3,"file":"my-bizplace-product-bundles.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"my-bizplace-product-bundles.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.ts"],"names":[],"mappings":"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"}
@@ -11,8 +11,8 @@ exports.productBundleSets = {
11
11
  const page = params.pagination.page;
12
12
  const limit = params.pagination.limit;
13
13
  const filters = params.filters.filter(x => x.name !== 'product_info' && x.name !== 'productBundleId');
14
- const productBundleId = params.filters.filter(x => x.name === 'productBundleId')[0];
15
- const productInfoFilter = params.filters.filter(x => x.name === 'product_info')[0];
14
+ const productBundleId = params.filters.find(x => x.name === 'productBundleId');
15
+ const productInfoFilter = params.filters.find(x => x.name === 'product_info');
16
16
  const productInfoColumns = ['sku', 'name', 'description'];
17
17
  params.filters = [...filters];
18
18
  params.sortings = [
@@ -30,7 +30,7 @@ exports.productBundleSets = {
30
30
  const qb = (0, typeorm_1.getRepository)(entities_1.Product).createQueryBuilder('prd');
31
31
  (0, shell_1.buildQuery)(qb, params, context);
32
32
  qb.innerJoinAndSelect('product_details', 'prdDet', 'prdDet.product_id = prd.id');
33
- qb.leftJoinAndSelect('product_bundle_settings', 'pbs', 'pbs.product_id = prd.id and pbs.product_detail_id = prdDet.id');
33
+ qb.leftJoinAndSelect('product_bundle_settings', 'pbs', `pbs.product_id = prd.id and pbs.product_detail_id = prdDet.id ${productBundleId && productBundleId.operator === 'noteq' ? 'and pbs.product_detail_id = null' : ''}`);
34
34
  qb.leftJoinAndSelect('pbs.productBundle', 'pb');
35
35
  if (productInfoFilter) {
36
36
  qb.andWhere(new typeorm_1.Brackets(qb2 => {
@@ -45,14 +45,6 @@ exports.productBundleSets = {
45
45
  bundleId: productBundleId.value
46
46
  });
47
47
  }
48
- else if (productBundleId && productBundleId.operator === 'noteq') {
49
- qb.andWhere(new typeorm_1.Brackets(qb2 => {
50
- qb2.orWhere('pb.id != :bundleId::uuid', {
51
- bundleId: productBundleId.value
52
- });
53
- qb2.orWhere('pb.id ISNULL');
54
- }));
55
- }
56
48
  let productBundleSets = await qb
57
49
  .offset((page - 1) * limit)
58
50
  .limit(limit)
@@ -1 +1 @@
1
- {"version":3,"file":"product-bundle-sets.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-bundle-setting/product-bundle-sets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"product-bundle-sets.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-bundle-setting/product-bundle-sets.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/product-base",
3
- "version": "3.6.4",
3
+ "version": "3.6.19",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,7 +24,7 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/biz-base": "^3.6.4"
27
+ "@things-factory/biz-base": "^3.6.19"
28
28
  },
29
- "gitHead": "48b9fe15809b253c674ab386589db01a6bf8b0fc"
29
+ "gitHead": "e8a5ade8e7c470c6e51dca428409c405b7cccf3a"
30
30
  }
@@ -13,7 +13,7 @@ export const myBizplaceProductBundles = {
13
13
 
14
14
  const qb: SelectQueryBuilder<ProductBundle> = getRepository(ProductBundle).createQueryBuilder()
15
15
 
16
- const productBundleFilter = params.filters.filter(x => x.name == 'product_info')[0]
16
+ const productBundleFilter = params.filters.find(x => x.name == 'product_info')
17
17
  const productFilterColumns = ['sku', 'name', 'description']
18
18
  let filters = params.filters.filter(x => x.name != 'product_info')
19
19
 
@@ -27,7 +27,7 @@ export const myBizplaceProductBundles = {
27
27
  }
28
28
 
29
29
  buildQuery(qb, params, context, false)
30
- if (productBundleFilter && productBundleFilter.length > 0) {
30
+ if (productBundleFilter) {
31
31
  qb.andWhere(
32
32
  new Brackets(qb2 => {
33
33
  productFilterColumns.forEach(filter => {
@@ -12,8 +12,8 @@ export const productBundleSets = {
12
12
  const limit = params.pagination.limit
13
13
 
14
14
  const filters = params.filters.filter(x => x.name !== 'product_info' && x.name !== 'productBundleId')
15
- const productBundleId = params.filters.filter(x => x.name === 'productBundleId')[0]
16
- const productInfoFilter = params.filters.filter(x => x.name === 'product_info')[0]
15
+ const productBundleId = params.filters.find(x => x.name === 'productBundleId')
16
+ const productInfoFilter = params.filters.find(x => x.name === 'product_info')
17
17
  const productInfoColumns = ['sku', 'name', 'description']
18
18
  params.filters = [...filters]
19
19
 
@@ -41,7 +41,9 @@ export const productBundleSets = {
41
41
  qb.leftJoinAndSelect(
42
42
  'product_bundle_settings',
43
43
  'pbs',
44
- 'pbs.product_id = prd.id and pbs.product_detail_id = prdDet.id'
44
+ `pbs.product_id = prd.id and pbs.product_detail_id = prdDet.id ${
45
+ productBundleId && productBundleId.operator === 'noteq' ? 'and pbs.product_detail_id = null' : ''
46
+ }`
45
47
  )
46
48
  qb.leftJoinAndSelect('pbs.productBundle', 'pb')
47
49
 
@@ -68,15 +70,6 @@ export const productBundleSets = {
68
70
  qb.andWhere('pb.id = :bundleId::uuid', {
69
71
  bundleId: productBundleId.value
70
72
  })
71
- } else if (productBundleId && productBundleId.operator === 'noteq') {
72
- qb.andWhere(
73
- new Brackets(qb2 => {
74
- qb2.orWhere('pb.id != :bundleId::uuid', {
75
- bundleId: productBundleId.value
76
- })
77
- qb2.orWhere('pb.id ISNULL')
78
- })
79
- )
80
73
  }
81
74
 
82
75
  let productBundleSets = await qb