@things-factory/product-base 3.7.7 → 3.7.14
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.
- package/dist-server/entities/product-detail.js +3 -0
- package/dist-server/entities/product-detail.js.map +1 -1
- package/dist-server/graphql/resolvers/product-detail/product-detail-query.js +7 -3
- package/dist-server/graphql/resolvers/product-detail/product-detail-query.js.map +1 -1
- package/dist-server/graphql/types/product-detail/product-detail.js +1 -0
- package/dist-server/graphql/types/product-detail/product-detail.js.map +1 -1
- package/package.json +2 -2
- package/server/entities/product-detail.ts +3 -0
- package/server/graphql/resolvers/product-detail/product-detail-query.ts +9 -3
- package/server/graphql/types/product-detail/product-detail.ts +1 -0
|
@@ -332,6 +332,9 @@ ProductDetail = ProductDetail_1 = __decorate([
|
|
|
332
332
|
(0, typeorm_1.Entity)(),
|
|
333
333
|
(0, typeorm_1.Index)('ix_product_detail_0', (productDetail) => [productDetail.domain, productDetail.gtin, productDetail.product], { unique: true }),
|
|
334
334
|
(0, typeorm_1.Index)('ix_product_detail_1', (productDetail) => [productDetail.product]),
|
|
335
|
+
(0, typeorm_1.Index)('ix_product_detail_2', (productDetail) => [productDetail.domain, productDetail.refCode], {
|
|
336
|
+
unique: true
|
|
337
|
+
}),
|
|
335
338
|
__metadata("design:paramtypes", [Object, Object])
|
|
336
339
|
], ProductDetail);
|
|
337
340
|
exports.ProductDetail = ProductDetail;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../server/entities/product-detail.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,yBAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmDI;
|
|
1
|
+
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../server/entities/product-detail.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,10 @@ exports.Query = {
|
|
|
12
12
|
const customerDomainId = await tx.getRepository(shell_1.Domain).findOne(customerCompanyDomainId);
|
|
13
13
|
if (!customerDomainId)
|
|
14
14
|
throw new Error('Unable to find company domain');
|
|
15
|
-
const foundProductDetail = await repository.findOne({
|
|
15
|
+
const foundProductDetail = await repository.findOne({
|
|
16
|
+
where: { domain: customerDomainId, gtin },
|
|
17
|
+
relations: ['product']
|
|
18
|
+
});
|
|
16
19
|
if (!foundProductDetail)
|
|
17
20
|
throw new Error('No product candidate found');
|
|
18
21
|
return foundProductDetail;
|
|
@@ -25,11 +28,12 @@ exports.Query = {
|
|
|
25
28
|
const bizplaceFilter = params.filters.find(x => x.name == 'bizplace_id');
|
|
26
29
|
const productFilter = params.filters.find(x => x.name == 'product');
|
|
27
30
|
const createArrivalNotice = params.filters.find(x => x.name == 'create_arrival_notice');
|
|
28
|
-
const productInfoFilterColumns = ['sku', 'name', 'description', 'type'];
|
|
31
|
+
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand'];
|
|
29
32
|
params.filters = params.filters.filter(x => x.name != 'product_info' &&
|
|
30
33
|
x.name != 'bizplace_id' &&
|
|
31
34
|
x.name != 'product' &&
|
|
32
35
|
x.name != 'sku' &&
|
|
36
|
+
x.name != 'brand' &&
|
|
33
37
|
x.name != 'name' &&
|
|
34
38
|
x.name != 'description' &&
|
|
35
39
|
x.name != 'type' &&
|
|
@@ -87,7 +91,7 @@ exports.Query = {
|
|
|
87
91
|
}));
|
|
88
92
|
}
|
|
89
93
|
if (createArrivalNotice === null || createArrivalNotice === void 0 ? void 0 : createArrivalNotice.value) {
|
|
90
|
-
qb.andWhere('Product.isRequireSerialNumberScanning = false OR (Product.isRequireSerialNumberScanning = true AND ProductDetail.isDefault = true)');
|
|
94
|
+
qb.andWhere('(Product.isRequireSerialNumberScanning = false OR (Product.isRequireSerialNumberScanning = true AND ProductDetail.isDefault = true))');
|
|
91
95
|
}
|
|
92
96
|
let [items, total] = await qb.getManyAndCount();
|
|
93
97
|
items = items.map(item => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-detail-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-detail/product-detail-query.ts"],"names":[],"mappings":";;;AAAA,uDAAuG;AACvG,iDAAqF;AACrF,qCAAqE;AACrE,gDAAwE;AAE3D,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE,OAAY;QACzE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC5B,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAA;QAExD,MAAM,gBAAgB,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;QAChG,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAEvE,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"product-detail-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-detail/product-detail-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-detail/product-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-detail/product-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4D/B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/product-base",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.14",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@things-factory/biz-base": "^3.7.5"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "b8736fcc7bbaa2102e70b4f4ab1c409743e2eb6c"
|
|
30
30
|
}
|
|
@@ -74,6 +74,9 @@ import { Product, ProductDetailBizplaceSetting } from './'
|
|
|
74
74
|
{ unique: true }
|
|
75
75
|
)
|
|
76
76
|
@Index('ix_product_detail_1', (productDetail: ProductDetail) => [productDetail.product])
|
|
77
|
+
@Index('ix_product_detail_2', (productDetail: ProductDetail) => [productDetail.domain, productDetail.refCode], {
|
|
78
|
+
unique: true
|
|
79
|
+
})
|
|
77
80
|
export class ProductDetail {
|
|
78
81
|
constructor(productDetail, extrasOnly = false) {
|
|
79
82
|
if (productDetail) {
|
|
@@ -11,7 +11,10 @@ export const Query = {
|
|
|
11
11
|
const customerDomainId: Domain = await tx.getRepository(Domain).findOne(customerCompanyDomainId)
|
|
12
12
|
if (!customerDomainId) throw new Error('Unable to find company domain')
|
|
13
13
|
|
|
14
|
-
const foundProductDetail = await repository.findOne({
|
|
14
|
+
const foundProductDetail = await repository.findOne({
|
|
15
|
+
where: { domain: customerDomainId, gtin },
|
|
16
|
+
relations: ['product']
|
|
17
|
+
})
|
|
15
18
|
if (!foundProductDetail) throw new Error('No product candidate found')
|
|
16
19
|
|
|
17
20
|
return foundProductDetail
|
|
@@ -29,13 +32,14 @@ export const Query = {
|
|
|
29
32
|
const bizplaceFilter = params.filters.find(x => x.name == 'bizplace_id')
|
|
30
33
|
const productFilter = params.filters.find(x => x.name == 'product')
|
|
31
34
|
const createArrivalNotice = params.filters.find(x => x.name == 'create_arrival_notice')
|
|
32
|
-
const productInfoFilterColumns = ['sku', 'name', 'description', 'type']
|
|
35
|
+
const productInfoFilterColumns = ['sku', 'name', 'description', 'type', 'brand']
|
|
33
36
|
params.filters = params.filters.filter(
|
|
34
37
|
x =>
|
|
35
38
|
x.name != 'product_info' &&
|
|
36
39
|
x.name != 'bizplace_id' &&
|
|
37
40
|
x.name != 'product' &&
|
|
38
41
|
x.name != 'sku' &&
|
|
42
|
+
x.name != 'brand' &&
|
|
39
43
|
x.name != 'name' &&
|
|
40
44
|
x.name != 'description' &&
|
|
41
45
|
x.name != 'type' &&
|
|
@@ -114,7 +118,9 @@ export const Query = {
|
|
|
114
118
|
}
|
|
115
119
|
|
|
116
120
|
if (createArrivalNotice?.value) {
|
|
117
|
-
qb.andWhere(
|
|
121
|
+
qb.andWhere(
|
|
122
|
+
'(Product.isRequireSerialNumberScanning = false OR (Product.isRequireSerialNumberScanning = true AND ProductDetail.isDefault = true))'
|
|
123
|
+
)
|
|
118
124
|
}
|
|
119
125
|
|
|
120
126
|
let [items, total] = await qb.getManyAndCount()
|