@things-factory/product-base 3.6.1 → 3.6.13
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-bundle.js +4 -0
- package/dist-server/entities/product-bundle.js.map +1 -1
- package/dist-server/entities/product-detail.js +1 -1
- package/dist-server/entities/product-detail.js.map +1 -1
- package/dist-server/entities/product.js +2 -2
- package/dist-server/entities/product.js.map +1 -1
- package/dist-server/graphql/resolvers/product/create-product.js +6 -3
- package/dist-server/graphql/resolvers/product/create-product.js.map +1 -1
- package/dist-server/graphql/resolvers/product/validate-product.js +5 -6
- package/dist-server/graphql/resolvers/product/validate-product.js.map +1 -1
- package/dist-server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.js +2 -2
- package/dist-server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.js.map +1 -1
- package/dist-server/graphql/resolvers/product-bundle-setting/product-bundle-sets.js +3 -11
- package/dist-server/graphql/resolvers/product-bundle-setting/product-bundle-sets.js.map +1 -1
- package/dist-server/graphql/types/product/index.js +1 -1
- package/dist-server/graphql/types/product-bundle/product-bundle-patch.js +1 -0
- package/dist-server/graphql/types/product-bundle/product-bundle-patch.js.map +1 -1
- package/dist-server/graphql/types/product-bundle/product-bundle.js +1 -0
- package/dist-server/graphql/types/product-bundle/product-bundle.js.map +1 -1
- package/package.json +3 -3
- package/server/entities/product-bundle.ts +3 -0
- package/server/entities/product-detail.ts +4 -2
- package/server/entities/product.ts +7 -5
- package/server/graphql/resolvers/product/create-product.ts +5 -1
- package/server/graphql/resolvers/product/validate-product.ts +15 -13
- package/server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.ts +2 -2
- package/server/graphql/resolvers/product-bundle-setting/product-bundle-sets.ts +5 -12
- package/server/graphql/types/product/index.ts +1 -1
- package/server/graphql/types/product-bundle/product-bundle-patch.ts +1 -0
- package/server/graphql/types/product-bundle/product-bundle.ts +1 -0
|
@@ -40,6 +40,10 @@ __decorate([
|
|
|
40
40
|
(0, typeorm_1.Column)(),
|
|
41
41
|
__metadata("design:type", String)
|
|
42
42
|
], ProductBundle.prototype, "sku", void 0);
|
|
43
|
+
__decorate([
|
|
44
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
45
|
+
__metadata("design:type", String)
|
|
46
|
+
], ProductBundle.prototype, "refCode", void 0);
|
|
43
47
|
__decorate([
|
|
44
48
|
(0, typeorm_1.Column)(),
|
|
45
49
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-bundle.js","sourceRoot":"","sources":["../../server/entities/product-bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,uDAAmD;AACnD,iDAA8C;AAE9C,yBAAyC;AAMzC,IAAa,aAAa,GAA1B,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"product-bundle.js","sourceRoot":"","sources":["../../server/entities/product-bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,uDAAmD;AACnD,iDAA8C;AAE9C,yBAAyC;AAMzC,IAAa,aAAa,GAA1B,MAAa,aAAa;CAsDzB,CAAA;AApDC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;yCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;6CAAA;AAKd;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,EAAE;QAC3B,QAAQ,EAAE,KAAK;KAChB,CAAC;kDACQ,mBAAQ,oBAAR,mBAAQ;+CAAA;AAGlB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAoB,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC;;4DACvD;AAG7C;IADC,IAAA,gBAAM,GAAE;;0CACE;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACZ;AAGf;IADC,IAAA,gBAAM,GAAE;;2CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACf;AAGZ;IADC,IAAA,gBAAM,GAAE;;6CACK;AAGd;IADC,IAAA,gBAAM,GAAE;;kDACU;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;kDACnB;AAGnB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AArDF,aAAa;IAJzB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;QACxG,MAAM,EAAE,IAAI;KACb,CAAC;GACW,aAAa,CAsDzB;AAtDY,sCAAa"}
|
|
@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var ProductDetail_1, _a, _b, _c;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.ProductDetail = void 0;
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
14
15
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
15
16
|
const shell_1 = require("@things-factory/shell");
|
|
16
|
-
const typeorm_1 = require("typeorm");
|
|
17
17
|
const _1 = require("./");
|
|
18
18
|
/**
|
|
19
19
|
* @prop {string} id - Primary Key.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../server/entities/product-detail.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;
|
|
1
|
+
{"version":3,"file":"product-detail.js","sourceRoot":"","sources":["../../server/entities/product-detail.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var Product_1, _a, _b, _c, _d;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.Product = void 0;
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
14
15
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
15
16
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
16
17
|
const shell_1 = require("@things-factory/shell");
|
|
17
|
-
const typeorm_1 = require("typeorm");
|
|
18
18
|
const _1 = require("./");
|
|
19
19
|
let Product = Product_1 = class Product {
|
|
20
20
|
};
|
|
@@ -67,7 +67,7 @@ __decorate([
|
|
|
67
67
|
__metadata("design:type", String)
|
|
68
68
|
], Product.prototype, "type", void 0);
|
|
69
69
|
__decorate([
|
|
70
|
-
(0, typeorm_1.Column)(),
|
|
70
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
71
71
|
__metadata("design:type", String)
|
|
72
72
|
], Product.prototype, "packingType", void 0);
|
|
73
73
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product.js","sourceRoot":"","sources":["../../server/entities/product.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,uDAAmD;AACnD,iDAA8C;
|
|
1
|
+
{"version":3,"file":"product.js","sourceRoot":"","sources":["../../server/entities/product.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createProduct = exports.createProductResolver = void 0;
|
|
4
|
-
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
6
|
const entities_1 = require("../../../entities");
|
|
7
7
|
const update_multiple_product_detail_1 = require("../product-detail/update-multiple-product-detail");
|
|
8
8
|
const validate_product_1 = require("./validate-product");
|
|
@@ -12,7 +12,7 @@ exports.createProductResolver = {
|
|
|
12
12
|
}
|
|
13
13
|
};
|
|
14
14
|
async function createProduct(product, context) {
|
|
15
|
-
var _a, _b;
|
|
15
|
+
var _a, _b, _c;
|
|
16
16
|
try {
|
|
17
17
|
const { domain, user, tx } = context.state;
|
|
18
18
|
const productRepo = tx.getRepository(entities_1.Product) || (0, typeorm_1.getRepository)(entities_1.Product);
|
|
@@ -21,10 +21,13 @@ async function createProduct(product, context) {
|
|
|
21
21
|
if ((_a = product.bizplace) === null || _a === void 0 ? void 0 : _a.id) {
|
|
22
22
|
bizplace = await bizplaceRepo.findOne(product.bizplace.id);
|
|
23
23
|
}
|
|
24
|
+
else if ((_b = context.state) === null || _b === void 0 ? void 0 : _b.bizplace) {
|
|
25
|
+
bizplace = context.state.bizplace;
|
|
26
|
+
}
|
|
24
27
|
else {
|
|
25
28
|
bizplace = await bizplaceRepo.findOne({ where: { domain } });
|
|
26
29
|
}
|
|
27
|
-
if ((
|
|
30
|
+
if ((_c = product === null || product === void 0 ? void 0 : product.productRef) === null || _c === void 0 ? void 0 : _c.id) {
|
|
28
31
|
product.productRef = await productRepo.findOne(product.productRef.id);
|
|
29
32
|
}
|
|
30
33
|
if (!(product === null || product === void 0 ? void 0 : product.id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product/create-product.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"create-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product/create-product.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAGlE,uDAAmD;AAGnD,gDAA0D;AAC1D,qGAA8F;AAC9F,yDAAoD;AAEvC,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACnD,OAAO,MAAM,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,aAAa,CAAC,OAAY,EAAE,OAAY;;IAC5D,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,WAAW,GAAwB,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,IAAI,IAAA,uBAAa,EAAC,kBAAO,CAAC,CAAA;QAC5F,MAAM,YAAY,GAAyB,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,IAAI,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAA;QAEhG,IAAI,QAAkB,CAAA;QACtB,IAAI,MAAA,OAAO,CAAC,QAAQ,0CAAE,EAAE,EAAE;YACxB,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;SAC3D;aAAM,IAAI,MAAA,OAAO,CAAC,KAAK,0CAAE,QAAQ,EAAE;YAClC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAA;SAClC;aAAM;YACL,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;SAC7D;QAED,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAE,EAAE,EAAE;YAC3B,OAAO,CAAC,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;SACtE;QAED,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAA;YAAE,OAAO,OAAO,CAAC,EAAE,CAAA;QAEnC,MAAM,IAAA,kCAAe,kCAEd,OAAO,KACV,QAAQ;YACR,MAAM,KAER,OAAO,CACR,CAAA;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAA;SAClC;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAA;SACxC;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,iCAChC,OAAO,KACV,QAAQ;YACR,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,IAAI,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC3C,IAAI,CAAC,cAAc,EAAE;YACnB,cAAc,GAAG,CAAC,IAAI,wBAAa,iCAAM,OAAO,KAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAG,CAAC,CAAA;YACtF,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE;gBACpE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAA;aACrC;SACF;QAED,MAAM,IAAA,4DAA2B,EAAC,MAAM,CAAC,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;QAErE,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AA7DD,sCA6DC"}
|
|
@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.validateProduct = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
7
8
|
const typeorm_1 = require("typeorm");
|
|
8
9
|
const entities_1 = require("../../../entities");
|
|
9
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
10
10
|
async function validateProduct(product, context) {
|
|
11
11
|
const { tx } = context.state;
|
|
12
12
|
let errors = [];
|
|
@@ -19,15 +19,14 @@ async function validateProduct(product, context) {
|
|
|
19
19
|
if (lodash_1.default.isEmpty(product.type) || '') {
|
|
20
20
|
errors.push('Product type is required');
|
|
21
21
|
}
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
if (await tx.getRepository(entities_1.Product).count({ where: {
|
|
22
|
+
if ((await tx.getRepository(entities_1.Product).count({
|
|
23
|
+
where: {
|
|
26
24
|
sku: product.sku,
|
|
27
25
|
bizplace: product.bizplace,
|
|
28
26
|
domain: product.domain,
|
|
29
27
|
id: (product === null || product === void 0 ? void 0 : product.id) == null ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.Not)(product.id)
|
|
30
|
-
}
|
|
28
|
+
}
|
|
29
|
+
})) > 0) {
|
|
31
30
|
errors.push('Duplicated SKU found.');
|
|
32
31
|
}
|
|
33
32
|
if (errors.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product/validate-product.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"validate-product.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product/validate-product.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAsB;AACtB,qCAAoD;AAKpD,gDAA2C;AAEpC,KAAK,UAAU,eAAe,CAAC,OAAgB,EAAE,OAAY;IAClE,MAAM,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;IAE/E,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;KACvC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;KACxC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;KACxC;IAED,IACE,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,KAAK,CAAC;QACrC,KAAK,EAAE;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,EAAE,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,IAAI,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,CAAC,CAAC,CAAC,IAAA,aAAG,EAAC,OAAO,CAAC,EAAE,CAAC;SAC1D;KACF,CAAC,CAAC,GAAG,CAAC,EACP;QACA,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;KACrC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;KACnC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAjCD,0CAiCC"}
|
|
@@ -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.
|
|
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
|
|
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":";;;AAAA,qCAAqE;AAGrE,uDAAuE;AACvE,iDAAqF;AAErF,kDAA0D;AAC1D,gDAAiD;AAEpC,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,EAAE,GAAsC,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAE/F,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"my-bizplace-product-bundles.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/product-bundle/my-bizplace-product-bundles.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AAGrE,uDAAuE;AACvE,iDAAqF;AAErF,kDAA0D;AAC1D,gDAAiD;AAEpC,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,EAAE,GAAsC,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAE/F,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAC9E,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;QAC3D,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAElE,mEAAmE;QACnE,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,iCAAqB,CAAC,OAAO,EAAE,CAAC,CAAA;QAEnG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE;YACjE,MAAM,eAAe,GAAa,MAAM,IAAA,6BAAkB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACxE,IAAI,QAAQ,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YACrF,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;SAC7F;QAED,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACtC,IAAI,mBAAmB,EAAE;YACvB,EAAE,CAAC,QAAQ,CACT,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACjB,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACpC,MAAM,SAAS,GAAG,IAAA,sBAAc,EAC9B,EAAE,CAAC,KAAK,EACR,MAAM,EACN,mBAAmB,CAAC,QAAQ,EAC5B,mBAAmB,CAAC,KAAK,EACzB,mBAAmB,CAAC,QAAQ,EAC5B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,MAAM,CACvC,CAAA;oBAED,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;gBACrD,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;SACF;QAED,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE;aAC5B,iBAAiB,CAAC,qCAAqC,EAAE,sBAAsB,CAAC;aAChF,iBAAiB,CAAC,8BAA8B,EAAE,SAAS,CAAC;aAC5D,iBAAiB,CAAC,oCAAoC,EAAE,eAAe,CAAC;aACxE,iBAAiB,CAAC,wBAAwB,EAAE,UAAU,CAAC;aACvD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,eAAe,EAAE,CAAA;QAEpB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
@@ -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.
|
|
15
|
-
const productInfoFilter = params.filters.
|
|
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',
|
|
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":";;;AAAA,qCAAqE;AAErE,uDAAmD;AACnD,iDAAqF;AAErF,gDAA2C;AAE9B,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAA;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAA;QAErC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAA;QACrG,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,
|
|
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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"}
|
|
@@ -23,7 +23,7 @@ exports.ProductResolver = (0, graphql_tag_1.default) `
|
|
|
23
23
|
extend type Mutation {
|
|
24
24
|
createProduct(product: NewProduct!): Product @privilege(category: "order", privilege: "mutation") @transaction
|
|
25
25
|
|
|
26
|
-
createProducts(products: [NewProduct]!): Product @privilege(category: "order", privilege: "mutation") @transaction
|
|
26
|
+
createProducts(products: [NewProduct]!): [Product] @privilege(category: "order", privilege: "mutation") @transaction
|
|
27
27
|
|
|
28
28
|
updateProduct(id: String!, patch: ProductPatch!): Product
|
|
29
29
|
@privilege(category: "order", privilege: "mutation")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-bundle-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-bundle/product-bundle-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"product-bundle-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-bundle/product-bundle-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;CAYpC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-bundle.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-bundle/product-bundle.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"product-bundle.js","sourceRoot":"","sources":["../../../../server/graphql/types/product-bundle/product-bundle.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;CAiB/B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/product-base",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.13",
|
|
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.
|
|
27
|
+
"@things-factory/biz-base": "^3.6.13"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "ea358da2f9aa7d1dc27422f863c9ccf4aeb457a8"
|
|
30
30
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
1
|
import {
|
|
4
2
|
Column,
|
|
5
3
|
CreateDateColumn,
|
|
@@ -10,6 +8,10 @@ import {
|
|
|
10
8
|
PrimaryGeneratedColumn,
|
|
11
9
|
UpdateDateColumn
|
|
12
10
|
} from 'typeorm'
|
|
11
|
+
|
|
12
|
+
import { User } from '@things-factory/auth-base'
|
|
13
|
+
import { Domain } from '@things-factory/shell'
|
|
14
|
+
|
|
13
15
|
import { Product, ProductDetailBizplaceSetting } from './'
|
|
14
16
|
|
|
15
17
|
/**
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Bizplace } from '@things-factory/biz-base'
|
|
3
|
-
import { Domain } from '@things-factory/shell'
|
|
4
1
|
import {
|
|
5
2
|
Column,
|
|
6
3
|
CreateDateColumn,
|
|
@@ -11,7 +8,12 @@ import {
|
|
|
11
8
|
PrimaryGeneratedColumn,
|
|
12
9
|
UpdateDateColumn
|
|
13
10
|
} from 'typeorm'
|
|
14
|
-
|
|
11
|
+
|
|
12
|
+
import { User } from '@things-factory/auth-base'
|
|
13
|
+
import { Bizplace } from '@things-factory/biz-base'
|
|
14
|
+
import { Domain } from '@things-factory/shell'
|
|
15
|
+
|
|
16
|
+
import { ProductDetail, ProductSet } from './'
|
|
15
17
|
|
|
16
18
|
@Entity()
|
|
17
19
|
@Index(
|
|
@@ -60,7 +62,7 @@ export class Product {
|
|
|
60
62
|
type: string
|
|
61
63
|
|
|
62
64
|
//// To be removed ////
|
|
63
|
-
@Column()
|
|
65
|
+
@Column({ nullable: true })
|
|
64
66
|
packingType: string
|
|
65
67
|
|
|
66
68
|
@Column({ nullable: true })
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { EntityManager, getRepository, Repository } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
4
|
import { Bizplace } from '@things-factory/biz-base'
|
|
3
5
|
import { Domain } from '@things-factory/shell'
|
|
4
|
-
|
|
6
|
+
|
|
5
7
|
import { Product, ProductDetail } from '../../../entities'
|
|
6
8
|
import { updateMultipleProductDetail } from '../product-detail/update-multiple-product-detail'
|
|
7
9
|
import { validateProduct } from './validate-product'
|
|
@@ -22,6 +24,8 @@ export async function createProduct(product: any, context: any) {
|
|
|
22
24
|
let bizplace: Bizplace
|
|
23
25
|
if (product.bizplace?.id) {
|
|
24
26
|
bizplace = await bizplaceRepo.findOne(product.bizplace.id)
|
|
27
|
+
} else if (context.state?.bizplace) {
|
|
28
|
+
bizplace = context.state.bizplace
|
|
25
29
|
} else {
|
|
26
30
|
bizplace = await bizplaceRepo.findOne({ where: { domain } })
|
|
27
31
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import _ from 'lodash'
|
|
2
|
+
import { EntityManager, IsNull, Not } from 'typeorm'
|
|
3
|
+
|
|
1
4
|
import { User } from '@things-factory/auth-base'
|
|
2
5
|
import { Domain } from '@things-factory/shell'
|
|
3
|
-
|
|
4
|
-
import { EntityManager, getRepository, Repository, Not, IsNull } from 'typeorm'
|
|
6
|
+
|
|
5
7
|
import { Product } from '../../../entities'
|
|
6
|
-
import _ from 'lodash'
|
|
7
8
|
|
|
8
9
|
export async function validateProduct(product: Product, context: any) {
|
|
9
10
|
const { tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
|
|
@@ -19,20 +20,21 @@ export async function validateProduct(product: Product, context: any) {
|
|
|
19
20
|
if (_.isEmpty(product.type) || '') {
|
|
20
21
|
errors.push('Product type is required')
|
|
21
22
|
}
|
|
22
|
-
if (_.isEmpty(product.packingType) || '') {
|
|
23
|
-
errors.push('Packing type is required')
|
|
24
|
-
}
|
|
25
23
|
|
|
26
|
-
if
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
24
|
+
if (
|
|
25
|
+
(await tx.getRepository(Product).count({
|
|
26
|
+
where: {
|
|
27
|
+
sku: product.sku,
|
|
28
|
+
bizplace: product.bizplace,
|
|
29
|
+
domain: product.domain,
|
|
30
|
+
id: product?.id == null ? Not(IsNull()) : Not(product.id)
|
|
31
|
+
}
|
|
32
|
+
})) > 0
|
|
33
|
+
) {
|
|
32
34
|
errors.push('Duplicated SKU found.')
|
|
33
35
|
}
|
|
34
36
|
|
|
35
|
-
if(errors.length > 0){
|
|
37
|
+
if (errors.length > 0) {
|
|
36
38
|
throw new Error(errors.join(', '))
|
|
37
39
|
}
|
|
38
40
|
|
|
@@ -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.
|
|
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
|
|
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.
|
|
16
|
-
const productInfoFilter = params.filters.
|
|
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
|
-
|
|
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
|
|
@@ -9,7 +9,7 @@ export const ProductResolver = gql`
|
|
|
9
9
|
extend type Mutation {
|
|
10
10
|
createProduct(product: NewProduct!): Product @privilege(category: "order", privilege: "mutation") @transaction
|
|
11
11
|
|
|
12
|
-
createProducts(products: [NewProduct]!): Product @privilege(category: "order", privilege: "mutation") @transaction
|
|
12
|
+
createProducts(products: [NewProduct]!): [Product] @privilege(category: "order", privilege: "mutation") @transaction
|
|
13
13
|
|
|
14
14
|
updateProduct(id: String!, patch: ProductPatch!): Product
|
|
15
15
|
@privilege(category: "order", privilege: "mutation")
|