@medusajs/medusa 1.2.2-dev.56 → 1.3.1-alpha.72

package/dist/api/routes/admin/discounts/get-discount-by-code.js

@@ -1,4 +1,13 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,7 +45,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminGetDiscountsDiscountCodeParams = void 0;
+var class_validator_1 = require("class-validator");
 var _1 = require(".");
+var get_query_config_1 = require("../../../../utils/get-query-config");
+var validator_1 = require("../../../../utils/validator");
 /**
  * @oas [get] /discounts/code/{code}
  * operationId: "GetDiscountsDiscountCode"
@@ -58,18 +71,39 @@ var _1 = require(".");
  *               $ref: "#/components/schemas/discount"
  */
 exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var code, discountService, discount;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var code, validated, config, discountService, discount;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 code = req.params.code;
-                discountService = req.scope.resolve("discountService");
-                return [4 /*yield*/, discountService.retrieveByCode(code, _1.defaultAdminDiscountsRelations)];
+                return [4 /*yield*/, (0, validator_1.validator)(AdminGetDiscountsDiscountCodeParams, req.query)];
             case 1:
-                discount = _a.sent();
+                validated = _c.sent();
+                config = (0, get_query_config_1.getRetrieveConfig)(_1.defaultAdminDiscountsFields, _1.defaultAdminDiscountsRelations, (_a = validated === null || validated === void 0 ? void 0 : validated.fields) === null || _a === void 0 ? void 0 : _a.split(","), (_b = validated === null || validated === void 0 ? void 0 : validated.expand) === null || _b === void 0 ? void 0 : _b.split(","));
+                discountService = req.scope.resolve("discountService");
+                return [4 /*yield*/, discountService.retrieveByCode(code, config)];
+            case 2:
+                discount = _c.sent();
                 res.status(200).json({ discount: discount });
                 return [2 /*return*/];
         }
     });
 }); });
+var AdminGetDiscountsDiscountCodeParams = /** @class */ (function () {
+    function AdminGetDiscountsDiscountCodeParams() {
+    }
+    __decorate([
+        (0, class_validator_1.IsOptional)(),
+        (0, class_validator_1.IsString)(),
+        __metadata("design:type", String)
+    ], AdminGetDiscountsDiscountCodeParams.prototype, "expand", void 0);
+    __decorate([
+        (0, class_validator_1.IsOptional)(),
+        (0, class_validator_1.IsString)(),
+        __metadata("design:type", String)
+    ], AdminGetDiscountsDiscountCodeParams.prototype, "fields", void 0);
+    return AdminGetDiscountsDiscountCodeParams;
+}());
+exports.AdminGetDiscountsDiscountCodeParams = AdminGetDiscountsDiscountCodeParams;
 //# sourceMappingURL=get-discount-by-code.js.map

package/dist/api/routes/admin/discounts/get-discount-by-code.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-discount-by-code.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/get-discount-by-code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAAkD;AAElD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACpB,IAAI,GAAK,GAAG,CAAC,MAAM,KAAf,CAAe;gBAErB,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAC5D,qBAAM,eAAe,CAAC,cAAc,CACnD,IAAI,EACJ,iCAA8B,CAC/B,EAAA;;gBAHK,QAAQ,GAAG,SAGhB;gBAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAA;;;;KACnC,EAAA"}
+{"version":3,"file":"get-discount-by-code.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/get-discount-by-code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsD;AACtD,sBAA+E;AAG/E,uEAAsE;AACtE,yDAAuD;AACvD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;;gBACpB,IAAI,GAAK,GAAG,CAAC,MAAM,KAAf,CAAe;gBAET,qBAAM,IAAA,qBAAS,EAC/B,mCAAmC,EACnC,GAAG,CAAC,KAAK,CACV,EAAA;;gBAHK,SAAS,GAAG,SAGjB;gBAEK,MAAM,GAAG,IAAA,oCAAiB,EAC9B,8BAA2B,EAC3B,iCAA8B,EAC9B,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAuB,EACnD,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAC,CAC9B,CAAA;gBAEK,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAC5D,qBAAM,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;gBAA7D,QAAQ,GAAG,SAAkD;gBAEnE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAA;;;;KACnC,EAAA;AAED;IAAA;IAQA,CAAC;IALC;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,0BAAQ,GAAE;;uEACI;IAIf;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,0BAAQ,GAAE;;uEACI;IACjB,0CAAC;CAAA,AARD,IAQC;AARY,kFAAmC"}

package/dist/api/routes/admin/discounts/get-discount.d.ts

@@ -7,6 +7,9 @@ declare const _default: (req: any, res: any) => Promise<void>;
  * x-authenticated: true
  * parameters:
  *   - (path) id=* {string} The id of the Discount
+ * query:
+ *  - (query) expand {string} Comma separated list of relations to include in the results.
+ *  - (query) fields {string} Comma separated list of fields to include in the results.
  * tags:
  *   - Discount
  * responses:
@@ -20,3 +23,7 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *               $ref: "#/components/schemas/discount"
  */
 export default _default;
+export declare class AdminGetDiscountParams {
+    expand?: string;
+    fields?: string;
+}

package/dist/api/routes/admin/discounts/get-discount.js

@@ -1,4 +1,13 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,7 +45,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminGetDiscountParams = void 0;
+var class_validator_1 = require("class-validator");
 var _1 = require(".");
+var get_query_config_1 = require("../../../../utils/get-query-config");
+var validator_1 = require("../../../../utils/validator");
 /**
  * @oas [get] /discounts/{id}
  * operationId: "GetDiscountsDiscount"
@@ -45,6 +58,9 @@ var _1 = require(".");
  * x-authenticated: true
  * parameters:
  *   - (path) id=* {string} The id of the Discount
+ * query:
+ *  - (query) expand {string} Comma separated list of relations to include in the results.
+ *  - (query) fields {string} Comma separated list of fields to include in the results.
  * tags:
  *   - Discount
  * responses:
@@ -58,21 +74,39 @@ var _1 = require(".");
  *               $ref: "#/components/schemas/discount"
  */
 exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var discount_id, discountService, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var discount_id, validated, config, discountService, data;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 discount_id = req.params.discount_id;
-                discountService = req.scope.resolve("discountService");
-                return [4 /*yield*/, discountService.retrieve(discount_id, {
-                        select: _1.defaultAdminDiscountsFields,
-                        relations: _1.defaultAdminDiscountsRelations,
-                    })];
+                return [4 /*yield*/, (0, validator_1.validator)(AdminGetDiscountParams, req.query)];
             case 1:
-                data = _a.sent();
+                validated = _c.sent();
+                config = (0, get_query_config_1.getRetrieveConfig)(_1.defaultAdminDiscountsFields, _1.defaultAdminDiscountsRelations, (_a = validated === null || validated === void 0 ? void 0 : validated.fields) === null || _a === void 0 ? void 0 : _a.split(","), (_b = validated === null || validated === void 0 ? void 0 : validated.expand) === null || _b === void 0 ? void 0 : _b.split(","));
+                discountService = req.scope.resolve("discountService");
+                return [4 /*yield*/, discountService.retrieve(discount_id, config)];
+            case 2:
+                data = _c.sent();
                 res.status(200).json({ discount: data });
                 return [2 /*return*/];
         }
     });
 }); });
+var AdminGetDiscountParams = /** @class */ (function () {
+    function AdminGetDiscountParams() {
+    }
+    __decorate([
+        (0, class_validator_1.IsOptional)(),
+        (0, class_validator_1.IsString)(),
+        __metadata("design:type", String)
+    ], AdminGetDiscountParams.prototype, "expand", void 0);
+    __decorate([
+        (0, class_validator_1.IsOptional)(),
+        (0, class_validator_1.IsString)(),
+        __metadata("design:type", String)
+    ], AdminGetDiscountParams.prototype, "fields", void 0);
+    return AdminGetDiscountParams;
+}());
+exports.AdminGetDiscountParams = AdminGetDiscountParams;
 //# sourceMappingURL=get-discount.js.map

package/dist/api/routes/admin/discounts/get-discount.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-discount.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/get-discount.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAA+E;AAE/E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACpB,WAAW,GAAK,GAAG,CAAC,MAAM,YAAf,CAAe;gBAE5B,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAChE,qBAAM,eAAe,CAAC,QAAQ,CAAC,WAAW,EAAE;wBACvD,MAAM,EAAE,8BAA2B;wBACnC,SAAS,EAAE,iCAA8B;qBAC1C,CAAC,EAAA;;gBAHI,IAAI,GAAG,SAGX;gBAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;;;KACzC,EAAA"}
+{"version":3,"file":"get-discount.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/get-discount.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsD;AACtD,sBAA+E;AAG/E,uEAAsE;AACtE,yDAAuD;AACvD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;;gBACpB,WAAW,GAAK,GAAG,CAAC,MAAM,YAAf,CAAe;gBAEhB,qBAAM,IAAA,qBAAS,EAAC,sBAAsB,EAAE,GAAG,CAAC,KAAK,CAAC,EAAA;;gBAA9D,SAAS,GAAG,SAAkD;gBAE9D,MAAM,GAAG,IAAA,oCAAiB,EAC9B,8BAA2B,EAC3B,iCAA8B,EAC9B,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAuB,EACnD,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAC,CAC9B,CAAA;gBAEK,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAChE,qBAAM,eAAe,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,EAAA;;gBAA1D,IAAI,GAAG,SAAmD;gBAEhE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;;;KACzC,EAAA;AAED;IAAA;IAQA,CAAC;IALC;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,0BAAQ,GAAE;;0DACI;IAIf;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,0BAAQ,GAAE;;0DACI;IACjB,6BAAC;CAAA,AARD,IAQC;AARY,wDAAsB"}

package/dist/api/routes/admin/discounts/index.d.ts

@@ -1,26 +1,34 @@
 import "reflect-metadata";
 import { Discount } from "../../../..";
+import { DiscountCondition } from "../../../../models";
 import { DeleteResponse, PaginatedResponse } from "../../../../types/common";
 declare const _default: (app: any) => any;
 export default _default;
-export declare const defaultAdminDiscountsFields: string[];
+export declare const defaultAdminDiscountsFields: (keyof Discount)[];
 export declare const defaultAdminDiscountsRelations: string[];
+export declare const defaultAdminDiscountConditionFields: (keyof DiscountCondition)[];
+export declare const defaultAdminDiscountConditionRelations: string[];
 export declare type AdminDiscountsRes = {
     discount: Discount;
 };
+export declare type AdminDiscountConditionsRes = {
+    discount_condition: DiscountCondition;
+};
 export declare type AdminDiscountsDeleteRes = DeleteResponse;
 export declare type AdminDiscountsListRes = PaginatedResponse & {
     discounts: Discount[];
 };
 export * from "./add-region";
-export * from "./add-valid-product";
+export * from "./create-condition";
 export * from "./create-discount";
 export * from "./create-dynamic-code";
+export * from "./delete-condition";
 export * from "./delete-discount";
 export * from "./delete-dynamic-code";
+export * from "./get-condition";
 export * from "./get-discount";
 export * from "./get-discount-by-code";
 export * from "./list-discounts";
 export * from "./remove-region";
-export * from "./remove-valid-product";
+export * from "./update-condition";
 export * from "./update-discount";

package/dist/api/routes/admin/discounts/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultAdminDiscountsRelations = exports.defaultAdminDiscountsFields = void 0;
+exports.defaultAdminDiscountConditionRelations = exports.defaultAdminDiscountConditionFields = exports.defaultAdminDiscountsRelations = exports.defaultAdminDiscountsFields = void 0;
 var express_1 = require("express");
 require("reflect-metadata");
 var middlewares_1 = __importDefault(require("../../../middlewares"));
@@ -29,12 +29,14 @@ exports.default = (function (app) {
     // Dynamic codes
     route.post("/:discount_id/dynamic-codes", middlewares_1.default.wrap(require("./create-dynamic-code").default));
     route.delete("/:discount_id/dynamic-codes/:code", middlewares_1.default.wrap(require("./delete-dynamic-code").default));
-    // Discount valid variants management
-    route.post("/:discount_id/products/:product_id", middlewares_1.default.wrap(require("./add-valid-product").default));
-    route.delete("/:discount_id/products/:product_id", middlewares_1.default.wrap(require("./remove-valid-product").default));
     // Discount region management
     route.post("/:discount_id/regions/:region_id", middlewares_1.default.wrap(require("./add-region").default));
     route.delete("/:discount_id/regions/:region_id", middlewares_1.default.wrap(require("./remove-region").default));
+    // Discount condition management
+    route.get("/:discount_id/conditions/:condition_id", middlewares_1.default.wrap(require("./get-condition").default));
+    route.post("/:discount_id/conditions/:condition_id", middlewares_1.default.wrap(require("./update-condition").default));
+    route.post("/:discount_id/conditions", middlewares_1.default.wrap(require("./create-condition").default));
+    route.delete("/:discount_id/conditions/:condition_id", middlewares_1.default.wrap(require("./delete-condition").default));
     return app;
 });
 exports.defaultAdminDiscountsFields = [
@@ -58,18 +60,22 @@ exports.defaultAdminDiscountsRelations = [
     "rule",
     "parent_discount",
     "regions",
-    "rule.valid_for",
+    "rule.conditions",
 ];
+exports.defaultAdminDiscountConditionFields = ["id", "type", "operator", "discount_rule_id", "created_at", "updated_at"];
+exports.defaultAdminDiscountConditionRelations = ["discount_rule"];
 __exportStar(require("./add-region"), exports);
-__exportStar(require("./add-valid-product"), exports);
+__exportStar(require("./create-condition"), exports);
 __exportStar(require("./create-discount"), exports);
 __exportStar(require("./create-dynamic-code"), exports);
+__exportStar(require("./delete-condition"), exports);
 __exportStar(require("./delete-discount"), exports);
 __exportStar(require("./delete-dynamic-code"), exports);
+__exportStar(require("./get-condition"), exports);
 __exportStar(require("./get-discount"), exports);
 __exportStar(require("./get-discount-by-code"), exports);
 __exportStar(require("./list-discounts"), exports);
 __exportStar(require("./remove-region"), exports);
-__exportStar(require("./remove-valid-product"), exports);
+__exportStar(require("./update-condition"), exports);
 __exportStar(require("./update-discount"), exports);
 //# sourceMappingURL=index.js.map

package/dist/api/routes/admin/discounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mCAAgC;AAChC,4BAAyB;AAGzB,qEAA8C;AAE9C,IAAM,KAAK,GAAG,IAAA,gBAAM,GAAE,CAAA;AAEtB,mBAAe,UAAC,GAAG;IACjB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IAE5B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACrE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAEvE,KAAK,CAAC,GAAG,CACP,eAAe,EACf,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CACpD,CAAA;IACD,KAAK,CAAC,GAAG,CACP,aAAa,EACb,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,CAC5D,CAAA;IACD,KAAK,CAAC,IAAI,CACR,eAAe,EACf,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CACvD,CAAA;IACD,KAAK,CAAC,MAAM,CACV,eAAe,EACf,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CACvD,CAAA;IAED,gBAAgB;IAChB,KAAK,CAAC,IAAI,CACR,6BAA6B,EAC7B,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAC3D,CAAA;IACD,KAAK,CAAC,MAAM,CACV,mCAAmC,EACnC,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,CAC3D,CAAA;IAED,qCAAqC;IACrC,KAAK,CAAC,IAAI,CACR,oCAAoC,EACpC,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CACzD,CAAA;IACD,KAAK,CAAC,MAAM,CACV,oCAAoC,EACpC,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC,CAC5D,CAAA;IAED,6BAA6B;IAC7B,KAAK,CAAC,IAAI,CACR,kCAAkC,EAClC,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAClD,CAAA;IACD,KAAK,CAAC,MAAM,CACV,kCAAkC,EAClC,qBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CACrD,CAAA;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,EAAA;AAEY,QAAA,2BAA2B,GAAG;IACzC,IAAI;IACJ,MAAM;IACN,YAAY;IACZ,aAAa;IACb,SAAS;IACT,oBAAoB;IACpB,aAAa;IACb,aAAa;IACb,WAAW;IACX,SAAS;IACT,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,gBAAgB;CACjB,CAAA;AAEY,QAAA,8BAA8B,GAAG;IAC5C,MAAM;IACN,iBAAiB;IACjB,SAAS;IACT,gBAAgB;CACjB,CAAA;AAYD,+CAA4B;AAC5B,sDAAmC;AACnC,oDAAiC;AACjC,wDAAqC;AACrC,oDAAiC;AACjC,wDAAqC;AACrC,iDAA8B;AAC9B,yDAAsC;AACtC,mDAAgC;AAChC,kDAA+B;AAC/B,yDAAsC;AACtC,oDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/index.ts"],"names":[],"mappings":"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"}

package/dist/api/routes/admin/discounts/list-discounts.d.ts

@@ -1,4 +1,4 @@
-import { AllocationType, DiscountRuleType } from "../../../../models/discount-rule";
+import { AdminGetDiscountsDiscountRuleParams } from "../../../../types/discount";
 declare const _default: (req: any, res: any) => Promise<void>;
 /**
  * @oas [get] /discounts
@@ -26,15 +26,11 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *               $ref: "#/components/schemas/discount"
  */
 export default _default;
-declare class AdminGetDiscountsDiscountRuleParams {
-    type: DiscountRuleType;
-    allocation: AllocationType;
-}
 export declare class AdminGetDiscountsParams {
+    rule?: AdminGetDiscountsDiscountRuleParams;
     q?: string;
     is_dynamic?: boolean;
     is_disabled?: boolean;
-    rule?: AdminGetDiscountsDiscountRuleParams;
     limit: number;
     offset: number;
     expand?: string;

package/dist/api/routes/admin/discounts/list-discounts.js

@@ -85,7 +85,7 @@ var class_transformer_1 = require("class-transformer");
 var class_validator_1 = require("class-validator");
 var lodash_1 = __importStar(require("lodash"));
 var _1 = require(".");
-var discount_rule_1 = require("../../../../models/discount-rule");
+var discount_1 = require("../../../../types/discount");
 var validator_1 = require("../../../../utils/validator");
 /**
  * @oas [get] /discounts
@@ -113,16 +113,18 @@ var validator_1 = require("../../../../utils/validator");
  *               $ref: "#/components/schemas/discount"
  */
 exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var validated, discountService, listConfig, filterableFields, _a, discounts, count;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var validated, discountService, relations, listConfig, filterableFields, _a, discounts, count;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0: return [4 /*yield*/, (0, validator_1.validator)(AdminGetDiscountsParams, req.query)];
             case 1:
-                validated = _b.sent();
+                validated = _d.sent();
                 discountService = req.scope.resolve("discountService");
+                relations = (_c = (_b = validated.expand) === null || _b === void 0 ? void 0 : _b.split(",")) !== null && _c !== void 0 ? _c : _1.defaultAdminDiscountsRelations;
                 listConfig = {
                     select: _1.defaultAdminDiscountsFields,
-                    relations: _1.defaultAdminDiscountsRelations,
+                    relations: relations,
                     skip: validated.offset,
                     take: validated.limit,
                     order: { created_at: "DESC" },
@@ -130,7 +132,7 @@ exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0
                 filterableFields = lodash_1.default.omit(validated, ["limit", "offset", "expand"]);
                 return [4 /*yield*/, discountService.listAndCount((0, lodash_1.pickBy)(filterableFields, function (val) { return typeof val !== "undefined"; }), listConfig)];
             case 2:
-                _a = __read.apply(void 0, [_b.sent(), 2]), discounts = _a[0], count = _a[1];
+                _a = __read.apply(void 0, [_d.sent(), 2]), discounts = _a[0], count = _a[1];
                 res.status(200).json({
                     discounts: discounts,
                     count: count,
@@ -141,26 +143,17 @@ exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0
         }
     });
 }); });
-var AdminGetDiscountsDiscountRuleParams = /** @class */ (function () {
-    function AdminGetDiscountsDiscountRuleParams() {
-    }
-    __decorate([
-        (0, class_validator_1.IsOptional)(),
-        (0, class_validator_1.IsEnum)(discount_rule_1.DiscountRuleType),
-        __metadata("design:type", String)
-    ], AdminGetDiscountsDiscountRuleParams.prototype, "type", void 0);
-    __decorate([
-        (0, class_validator_1.IsOptional)(),
-        (0, class_validator_1.IsEnum)(discount_rule_1.AllocationType),
-        __metadata("design:type", String)
-    ], AdminGetDiscountsDiscountRuleParams.prototype, "allocation", void 0);
-    return AdminGetDiscountsDiscountRuleParams;
-}());
 var AdminGetDiscountsParams = /** @class */ (function () {
     function AdminGetDiscountsParams() {
         this.limit = 20;
         this.offset = 0;
     }
+    __decorate([
+        (0, class_validator_1.ValidateNested)(),
+        (0, class_validator_1.IsOptional)(),
+        (0, class_transformer_1.Type)(function () { return discount_1.AdminGetDiscountsDiscountRuleParams; }),
+        __metadata("design:type", discount_1.AdminGetDiscountsDiscountRuleParams)
+    ], AdminGetDiscountsParams.prototype, "rule", void 0);
     __decorate([
         (0, class_validator_1.IsString)(),
         (0, class_validator_1.IsOptional)(),
@@ -184,12 +177,6 @@ var AdminGetDiscountsParams = /** @class */ (function () {
         }),
         __metadata("design:type", Boolean)
     ], AdminGetDiscountsParams.prototype, "is_disabled", void 0);
-    __decorate([
-        (0, class_validator_1.ValidateNested)(),
-        (0, class_validator_1.IsOptional)(),
-        (0, class_transformer_1.Type)(function () { return AdminGetDiscountsDiscountRuleParams; }),
-        __metadata("design:type", AdminGetDiscountsDiscountRuleParams)
-    ], AdminGetDiscountsParams.prototype, "rule", void 0);
     __decorate([
         (0, class_validator_1.IsInt)(),
         (0, class_validator_1.IsOptional)(),

package/dist/api/routes/admin/discounts/list-discounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-discounts.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/list-discounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,mDAOwB;AACxB,+CAAkC;AAClC,sBAA+E;AAC/E,kEAGyC;AAGzC,yDAAuD;AACvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;oBACV,qBAAM,IAAA,qBAAS,EAAC,uBAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,EAAA;;gBAA/D,SAAS,GAAG,SAAmD;gBAE/D,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAEvE,UAAU,GAAG;oBACjB,MAAM,EAAE,8BAA2B;oBACnC,SAAS,EAAE,iCAA8B;oBACzC,IAAI,EAAE,SAAS,CAAC,MAAM;oBACtB,IAAI,EAAE,SAAS,CAAC,KAAK;oBACrB,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;iBAC9B,CAAA;gBAEK,gBAAgB,GAAG,gBAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAE9C,qBAAM,eAAe,CAAC,YAAY,CAC3D,IAAA,eAAM,EAAC,gBAAgB,EAAE,UAAC,GAAG,IAAK,OAAA,OAAO,GAAG,KAAK,WAAW,EAA1B,CAA0B,CAAC,EAC7D,UAAU,CACX,EAAA;;gBAHK,KAAA,sBAAqB,SAG1B,KAAA,EAHM,SAAS,QAAA,EAAE,KAAK,QAAA;gBAKvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,SAAS,WAAA;oBACT,KAAK,OAAA;oBACL,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,KAAK,EAAE,SAAS,CAAC,KAAK;iBACvB,CAAC,CAAA;;;;KACH,EAAA;AAED;IAAA;IAQA,CAAC;IALC;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAM,EAAC,gCAAgB,CAAC;;qEACH;IAItB;QAFC,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAM,EAAC,8BAAc,CAAC;;2EACG;IAC5B,0CAAC;CAAA,AARD,IAQC;AAED;IAAA;QAuBE,UAAK,GAAG,EAAE,CAAA;QAKV,WAAM,GAAG,CAAC,CAAA;IAKZ,CAAC;IA9BC;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;sDACH;IAKV;QAHC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;QACZ,IAAA,6BAAS,EAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK,KAAK,MAAM;QAAhB,CAAgB,CAAC;;+DACvB;IAKpB;QAHC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;QACZ,IAAA,6BAAS,EAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK,KAAK,MAAM;QAAhB,CAAgB,CAAC;;gEACtB;IAKrB;QAHC,IAAA,gCAAc,GAAE;QAChB,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,mCAAmC,EAAnC,CAAmC,CAAC;kCACzC,mCAAmC;yDAAA;IAK1C;QAHC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,MAAM,EAAN,CAAM,CAAC;;0DACT;IAKV;QAHC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,MAAM,EAAN,CAAM,CAAC;;2DACT;IAIV;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;2DACE;IACjB,8BAAC;CAAA,AAjCD,IAiCC;AAjCY,0DAAuB"}
+{"version":3,"file":"list-discounts.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/discounts/list-discounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,mDAMwB;AACxB,+CAAkC;AAClC,sBAA+E;AAI/E,uDAAgF;AAChF,yDAAuD;AACvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;oBACV,qBAAM,IAAA,qBAAS,EAAC,uBAAuB,EAAE,GAAG,CAAC,KAAK,CAAC,EAAA;;gBAA/D,SAAS,GAAG,SAAmD;gBAE/D,eAAe,GAAoB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;gBAEvE,SAAS,GACb,MAAA,MAAA,SAAS,CAAC,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,iCAA8B,CAAA;gBAE1D,UAAU,GAAyB;oBACvC,MAAM,EAAE,8BAA2B;oBACnC,SAAS,WAAA;oBACT,IAAI,EAAE,SAAS,CAAC,MAAM;oBACtB,IAAI,EAAE,SAAS,CAAC,KAAK;oBACrB,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;iBAC9B,CAAA;gBAEK,gBAAgB,GAAG,gBAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAE9C,qBAAM,eAAe,CAAC,YAAY,CAC3D,IAAA,eAAM,EAAC,gBAAgB,EAAE,UAAC,GAAG,IAAK,OAAA,OAAO,GAAG,KAAK,WAAW,EAA1B,CAA0B,CAAC,EAC7D,UAAU,CACX,EAAA;;gBAHK,KAAA,sBAAqB,SAG1B,KAAA,EAHM,SAAS,QAAA,EAAE,KAAK,QAAA;gBAKvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,SAAS,WAAA;oBACT,KAAK,OAAA;oBACL,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,KAAK,EAAE,SAAS,CAAC,KAAK;iBACvB,CAAC,CAAA;;;;KACH,EAAA;AAED;IAAA;QAuBE,UAAK,GAAG,EAAE,CAAA;QAKV,WAAM,GAAG,CAAC,CAAA;IAKZ,CAAC;IA7BC;QAHC,IAAA,gCAAc,GAAE;QAChB,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,8CAAmC,EAAnC,CAAmC,CAAC;kCACzC,8CAAmC;yDAAA;IAI1C;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;sDACH;IAKV;QAHC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;QACZ,IAAA,6BAAS,EAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK,KAAK,MAAM;QAAhB,CAAgB,CAAC;;+DACvB;IAKpB;QAHC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;QACZ,IAAA,6BAAS,EAAC,UAAC,EAAS;gBAAP,KAAK,WAAA;YAAO,OAAA,KAAK,KAAK,MAAM;QAAhB,CAAgB,CAAC;;gEACtB;IAKrB;QAHC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,MAAM,EAAN,CAAM,CAAC;;0DACT;IAKV;QAHC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;QACZ,IAAA,wBAAI,EAAC,cAAM,OAAA,MAAM,EAAN,CAAM,CAAC;;2DACT;IAIV;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;2DACE;IACjB,8BAAC;CAAA,AAjCD,IAiCC;AAjCY,0DAAuB"}

package/dist/api/routes/admin/discounts/update-condition.d.ts

@@ -0,0 +1,55 @@
+import { AdminUpsertConditionsReq } from "../../../../types/discount";
+declare const _default: (req: any, res: any) => Promise<void>;
+/**
+ * @oas [post] /discounts/{discount_id}/conditions/{condition_id}
+ * operationId: "PostDiscountsDiscountConditionsCondition"
+ * summary: "Updates a DiscountCondition"
+ * x-authenticated: true
+ * parameters:
+ *   - (path) discount_id=* {string} The id of the Product.
+ *   - (query) expand {string} (Comma separated) Which fields should be expanded in each product of the result.
+ *   - (query) fields {string} (Comma separated) Which fields should be included in each product of the result.
+ * description: "Updates a DiscountCondition"
+ * requestBody:
+ *   content:
+ *     application/json:
+ *       required:
+ *         - id
+ *       schema:
+ *         properties:
+ *           items:
+ *              properties:
+ *                products:
+ *                  type: array
+ *                  description: list of products
+ *                product_types:
+ *                  type: array
+ *                  description: list of product types
+ *                product_collections:
+ *                  type: array
+ *                  description: list of product collections
+ *                product_tags:
+ *                  type: array
+ *                  description: list of product tags
+ *                customer_groups:
+ *                  type: array
+ *                  description: list of customer_groups
+ * tags:
+ *   - Discount
+ * responses:
+ *   200:
+ *     description: OK
+ *     content:
+ *       application/json:
+ *         schema:
+ *           properties:
+ *             discount:
+ *               $ref: "#/components/schemas/discount"
+ */
+export default _default;
+export declare class AdminPostDiscountsDiscountConditionsCondition extends AdminUpsertConditionsReq {
+}
+export declare class AdminPostDiscountsDiscountConditionsConditionParams {
+    expand?: string;
+    fields?: string;
+}