@medusajs/pricing 0.1.13-snapshot-20240531102054 → 0.1.13-snapshot-20240701122250

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import { moduleDefinition } from "./module-definition";
+import { ModuleExports } from "@medusajs/types";
+export declare const moduleDefinition: ModuleExports;
 export default moduleDefinition;
-export * from "./models";
-export * from "./services";
 export * from "./types";

package/dist/index.js

@@ -14,8 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const module_definition_1 = require("./module-definition");
-exports.default = module_definition_1.moduleDefinition;
-__exportStar(require("./models"), exports);
-__exportStar(require("./services"), exports);
+exports.moduleDefinition = void 0;
+const _services_1 = require("./services");
+const service = _services_1.PricingModuleService;
+exports.moduleDefinition = {
+    service,
+};
+exports.default = exports.moduleDefinition;
 __exportStar(require("./types"), exports);

package/dist/joiner-config.d.ts

@@ -1,10 +1,3 @@
-import { ModuleJoinerConfig } from "@medusajs/types";
 import { MapToConfig } from "@medusajs/utils";
-export declare const LinkableKeys: {
-    price_set_id: string;
-    price_list_id: string;
-    price_id: string;
-    rule_type_id: string;
-};
+export declare const joinerConfig: Omit<import("@medusajs/types").ModuleJoinerConfig, "serviceName" | "primaryKeys" | "alias" | "linkableKeys"> & Required<Pick<import("@medusajs/types").ModuleJoinerConfig, "serviceName" | "primaryKeys" | "alias" | "linkableKeys">>;
 export declare const entityNameToLinkableKeysMap: MapToConfig;
-export declare const joinerConfig: ModuleJoinerConfig;

package/dist/joiner-config.js

@@ -1,56 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinerConfig = exports.entityNameToLinkableKeysMap = exports.LinkableKeys = void 0;
-const modules_sdk_1 = require("@medusajs/modules-sdk");
+exports.entityNameToLinkableKeysMap = exports.joinerConfig = void 0;
+const utils_1 = require("@medusajs/utils");
 const _models_1 = require("./models");
-const schema_1 = __importDefault(require("./schema"));
-exports.LinkableKeys = {
-    price_set_id: _models_1.PriceSet.name,
-    price_list_id: _models_1.PriceList.name,
-    price_id: _models_1.Price.name,
-    rule_type_id: _models_1.RuleType.name,
-};
-const entityLinkableKeysMap = {};
-Object.entries(exports.LinkableKeys).forEach(([key, value]) => {
-    entityLinkableKeysMap[value] ??= [];
-    entityLinkableKeysMap[value].push({
-        mapTo: key,
-        valueFrom: key.split("_").pop(),
-    });
+exports.joinerConfig = (0, utils_1.defineJoinerConfig)(utils_1.Modules.PRICING, {
+    entityQueryingConfig: [_models_1.PriceSet, _models_1.PriceList, _models_1.Price],
+    linkableKeys: {
+        price_set_id: _models_1.PriceSet.name,
+        price_list_id: _models_1.PriceList.name,
+        price_id: _models_1.Price.name,
+    },
 });
-exports.entityNameToLinkableKeysMap = entityLinkableKeysMap;
-exports.joinerConfig = {
-    serviceName: modules_sdk_1.Modules.PRICING,
-    primaryKeys: ["id"],
-    linkableKeys: exports.LinkableKeys,
-    schema: schema_1.default,
-    alias: [
-        {
-            name: ["price_set", "price_sets"],
-            args: {
-                entity: "PriceSet",
-            },
-        },
-        {
-            name: ["price_list", "price_lists"],
-            args: {
-                methodSuffix: "PriceLists",
-            },
-        },
-        {
-            name: ["price", "prices"],
-            args: {
-                methodSuffix: "Prices",
-            },
-        },
-        {
-            name: ["rule_type", "rule_types"],
-            args: {
-                methodSuffix: "RuleTypes",
-            },
-        },
-    ],
-};
+exports.entityNameToLinkableKeysMap = (0, utils_1.buildEntitiesNameToLinkableKeysMap)(exports.joinerConfig.linkableKeys);

package/dist/migrations/Migration20240626133555.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from "@mikro-orm/migrations";
+export declare class Migration20240626133555 extends Migration {
+    up(): Promise<void>;
+}

package/dist/migrations/Migration20240626133555.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Migration20240626133555 = void 0;
+const migrations_1 = require("@mikro-orm/migrations");
+class Migration20240626133555 extends migrations_1.Migration {
+    async up() {
+        this.addSql('alter table if exists "price_list_rule" add column if not exists "value" jsonb;');
+        // TODO: Added on 28.06.2024, Drop defaults after a while.
+        this.addSql('alter table if exists "price_list_rule" add column if not exists "attribute" text not null DEFAULT \'\';');
+        this.addSql('alter table if exists "price_rule" add column if not exists "attribute" text not null DEFAULT \'\';');
+        /* DATA MIGRATION */
+        this.addSql("update price_rule set attribute = (SELECT rule_attribute FROM rule_type WHERE rule_type.id = price_rule.rule_type_id);");
+        this.addSql("update price_list_rule set value = (SELECT array_to_json(ARRAY(SELECT value FROM price_list_rule_value WHERE price_list_rule_value.price_list_rule_id = price_list_rule.id))::jsonb);");
+        this.addSql("update price_list_rule set attribute = (SELECT rule_attribute FROM rule_type WHERE rule_type.id = price_list_rule.rule_type_id);");
+        /* DATA MIGRATION END */
+        this.addSql('alter table if exists "price_set_rule_type" drop constraint if exists "price_set_rule_type_rule_type_id_foreign";');
+        this.addSql('alter table if exists "price_rule" drop constraint if exists "price_rule_rule_type_id_foreign";');
+        this.addSql('alter table if exists "price_list_rule" drop constraint if exists "price_list_rule_rule_type_id_foreign";');
+        this.addSql('alter table if exists "price_rule" drop constraint if exists "price_rule_price_set_id_foreign";');
+        this.addSql('drop index if exists "IDX_price_list_rule_rule_type_id_unique";');
+        this.addSql('drop index if exists "IDX_price_rule_price_set_id";');
+        this.addSql('drop index if exists "IDX_price_rule_rule_type_id";');
+        this.addSql('drop index if exists "IDX_price_rule_price_id_unique";');
+        this.addSql('CREATE UNIQUE INDEX IF NOT EXISTS "IDX_price_rule_price_id_attribute_unique" ON "price_rule" (price_id, attribute) WHERE deleted_at IS NULL;');
+        this.addSql('alter table if exists "price_rule" drop column if exists "price_set_id";');
+        this.addSql('alter table if exists "price_rule" drop column if exists "rule_type_id";');
+        this.addSql('alter table if exists "price_list_rule" drop column if exists "rule_type_id";');
+        this.addSql('drop table if exists "rule_type" cascade;');
+        this.addSql('drop table if exists "price_set_rule_type" cascade;');
+        this.addSql('drop table if exists "price_list_rule_value" cascade;');
+    }
+}
+exports.Migration20240626133555 = Migration20240626133555;

package/dist/models/index.d.ts

@@ -1,8 +1,5 @@
 export { default as Price } from "./price";
 export { default as PriceList } from "./price-list";
 export { default as PriceListRule } from "./price-list-rule";
-export { default as PriceListRuleValue } from "./price-list-rule-value";
 export { default as PriceRule } from "./price-rule";
 export { default as PriceSet } from "./price-set";
-export { default as PriceSetRuleType } from "./price-set-rule-type";
-export { default as RuleType } from "./rule-type";

package/dist/models/index.js

@@ -3,20 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuleType = exports.PriceSetRuleType = exports.PriceSet = exports.PriceRule = exports.PriceListRuleValue = exports.PriceListRule = exports.PriceList = exports.Price = void 0;
+exports.PriceSet = exports.PriceRule = exports.PriceListRule = exports.PriceList = exports.Price = void 0;
 var price_1 = require("./price");
 Object.defineProperty(exports, "Price", { enumerable: true, get: function () { return __importDefault(price_1).default; } });
 var price_list_1 = require("./price-list");
 Object.defineProperty(exports, "PriceList", { enumerable: true, get: function () { return __importDefault(price_list_1).default; } });
 var price_list_rule_1 = require("./price-list-rule");
 Object.defineProperty(exports, "PriceListRule", { enumerable: true, get: function () { return __importDefault(price_list_rule_1).default; } });
-var price_list_rule_value_1 = require("./price-list-rule-value");
-Object.defineProperty(exports, "PriceListRuleValue", { enumerable: true, get: function () { return __importDefault(price_list_rule_value_1).default; } });
 var price_rule_1 = require("./price-rule");
 Object.defineProperty(exports, "PriceRule", { enumerable: true, get: function () { return __importDefault(price_rule_1).default; } });
 var price_set_1 = require("./price-set");
 Object.defineProperty(exports, "PriceSet", { enumerable: true, get: function () { return __importDefault(price_set_1).default; } });
-var price_set_rule_type_1 = require("./price-set-rule-type");
-Object.defineProperty(exports, "PriceSetRuleType", { enumerable: true, get: function () { return __importDefault(price_set_rule_type_1).default; } });
-var rule_type_1 = require("./rule-type");
-Object.defineProperty(exports, "RuleType", { enumerable: true, get: function () { return __importDefault(rule_type_1).default; } });

package/dist/models/price-list-rule.d.ts

@@ -1,17 +1,14 @@
 import { DAL } from "@medusajs/types";
-import { Collection, OptionalProps } from "@mikro-orm/core";
+import { OptionalProps, Rel } from "@mikro-orm/core";
 import PriceList from "./price-list";
-import PriceListRuleValue from "./price-list-rule-value";
-import RuleType from "./rule-type";
 type OptionalFields = DAL.SoftDeletableEntityDateColumns;
 export default class PriceListRule {
     [OptionalProps]: OptionalFields;
     id: string;
-    rule_type_id: string;
-    rule_type: RuleType;
-    price_list_rule_values: Collection<PriceListRuleValue, object>;
+    attribute: string;
+    value: string | string[] | null;
     price_list_id: string;
-    price_list: PriceList;
+    price_list: Rel<PriceList>;
     created_at: Date;
     updated_at: Date;
     deleted_at: Date | null;

package/dist/models/price-list-rule.js

@@ -15,20 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@medusajs/utils");
 const core_1 = require("@mikro-orm/core");
 const price_list_1 = __importDefault(require("./price-list"));
-const price_list_rule_value_1 = __importDefault(require("./price-list-rule-value"));
-const rule_type_1 = __importDefault(require("./rule-type"));
 const tableName = "price_list_rule";
 const PriceListRuleDeletedAtIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
     columns: "deleted_at",
     where: "deleted_at IS NOT NULL",
 });
-const PriceListRuleRuleTypeIdIndex = (0, utils_1.createPsqlIndexStatementHelper)({
-    tableName: tableName,
-    columns: "rule_type_id",
-    where: "deleted_at IS NULL",
-    unique: true,
-});
 const PriceListRulePriceListIdIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
     columns: "price_list_id",
@@ -36,18 +28,16 @@ const PriceListRulePriceListIdIndex = (0, utils_1.createPsqlIndexStatementHelper
 });
 let PriceListRule = class PriceListRule {
     constructor() {
-        this.price_list_rule_values = new core_1.Collection(this);
+        this.value = null;
         this.deleted_at = null;
     }
     beforeCreate() {
         this.id = (0, utils_1.generateEntityId)(this.id, "plrule");
         this.price_list_id ??= this.price_list?.id;
-        this.rule_type_id ??= this.rule_type?.id;
     }
     onInit() {
         this.id = (0, utils_1.generateEntityId)(this.id, "plrule");
         this.price_list_id ??= this.price_list?.id;
-        this.rule_type_id ??= this.rule_type?.id;
     }
 };
 __decorate([
@@ -55,24 +45,13 @@ __decorate([
     __metadata("design:type", String)
 ], PriceListRule.prototype, "id", void 0);
 __decorate([
-    PriceListRuleRuleTypeIdIndex.MikroORMIndex(),
-    (0, core_1.ManyToOne)(() => rule_type_1.default, {
-        columnType: "text",
-        mapToPk: true,
-        fieldName: "rule_type_id",
-    }),
+    (0, core_1.Property)({ columnType: "text" }),
     __metadata("design:type", String)
-], PriceListRule.prototype, "rule_type_id", void 0);
-__decorate([
-    (0, core_1.ManyToOne)(() => rule_type_1.default, { persist: false }),
-    __metadata("design:type", rule_type_1.default)
-], PriceListRule.prototype, "rule_type", void 0);
+], PriceListRule.prototype, "attribute", void 0);
 __decorate([
-    (0, core_1.OneToMany)(() => price_list_rule_value_1.default, (plrv) => plrv.price_list_rule, {
-        cascade: [core_1.Cascade.PERSIST, "soft-remove"],
-    }),
+    (0, core_1.Property)({ columnType: "jsonb", nullable: true }),
     __metadata("design:type", Object)
-], PriceListRule.prototype, "price_list_rule_values", void 0);
+], PriceListRule.prototype, "value", void 0);
 __decorate([
     PriceListRulePriceListIdIndex.MikroORMIndex(),
     (0, core_1.ManyToOne)(() => price_list_1.default, {
@@ -85,7 +64,7 @@ __decorate([
 ], PriceListRule.prototype, "price_list_id", void 0);
 __decorate([
     (0, core_1.ManyToOne)(() => price_list_1.default, { persist: false }),
-    __metadata("design:type", price_list_1.default)
+    __metadata("design:type", Object)
 ], PriceListRule.prototype, "price_list", void 0);
 __decorate([
     (0, core_1.Property)({

package/dist/models/price-list.d.ts

@@ -3,7 +3,6 @@ import { PriceListStatus, PriceListType } from "@medusajs/utils";
 import { Collection, OptionalProps } from "@mikro-orm/core";
 import Price from "./price";
 import PriceListRule from "./price-list-rule";
-import RuleType from "./rule-type";
 type OptionalFields = "starts_at" | "ends_at" | DAL.SoftDeletableEntityDateColumns;
 export declare const PriceListIdPrefix = "plist";
 export default class PriceList {
@@ -17,7 +16,6 @@ export default class PriceList {
     ends_at: Date | null;
     prices: Collection<Price, object>;
     price_list_rules: Collection<PriceListRule, object>;
-    rule_types: Collection<RuleType, object>;
     rules_count: number;
     created_at: Date;
     updated_at: Date;

package/dist/models/price-list.js

@@ -17,7 +17,6 @@ const utils_1 = require("@medusajs/utils");
 const core_1 = require("@mikro-orm/core");
 const price_1 = __importDefault(require("./price"));
 const price_list_rule_1 = __importDefault(require("./price-list-rule"));
-const rule_type_1 = __importDefault(require("./rule-type"));
 const tableName = "price_list";
 const PriceListDeletedAtIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
@@ -31,7 +30,6 @@ let PriceList = class PriceList {
         this.ends_at = null;
         this.prices = new core_1.Collection(this);
         this.price_list_rules = new core_1.Collection(this);
-        this.rule_types = new core_1.Collection(this);
         this.rules_count = 0;
         this.deleted_at = null;
     }
@@ -90,13 +88,6 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], PriceList.prototype, "price_list_rules", void 0);
-__decorate([
-    (0, core_1.ManyToMany)({
-        entity: () => rule_type_1.default,
-        pivotEntity: () => price_list_rule_1.default,
-    }),
-    __metadata("design:type", Object)
-], PriceList.prototype, "rule_types", void 0);
 __decorate([
     (0, core_1.Property)({ columnType: "integer", default: 0 }),
     __metadata("design:type", Number)

package/dist/models/price-rule.d.ts

@@ -1,20 +1,15 @@
 import { DAL } from "@medusajs/types";
-import { OptionalProps } from "@mikro-orm/core";
+import { OptionalProps, Rel } from "@mikro-orm/core";
 import Price from "./price";
-import PriceSet from "./price-set";
-import RuleType from "./rule-type";
 type OptionalFields = DAL.SoftDeletableEntityDateColumns;
 export default class PriceRule {
     [OptionalProps]?: OptionalFields;
     id: string;
-    price_set_id: string;
-    price_set: PriceSet;
-    rule_type_id: string;
-    rule_type: RuleType;
+    attribute: string;
     value: string;
     priority: number;
     price_id: string;
-    price: Price;
+    price: Rel<Price>;
     created_at: Date;
     updated_at: Date;
     deleted_at: Date | null;

package/dist/models/price-rule.js

@@ -15,27 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@medusajs/utils");
 const core_1 = require("@mikro-orm/core");
 const price_1 = __importDefault(require("./price"));
-const price_set_1 = __importDefault(require("./price-set"));
-const rule_type_1 = __importDefault(require("./rule-type"));
 const tableName = "price_rule";
 const PriceRuleDeletedAtIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
     columns: "deleted_at",
     where: "deleted_at IS NOT NULL",
 });
-const PriceRulePriceSetIdIndex = (0, utils_1.createPsqlIndexStatementHelper)({
-    tableName: tableName,
-    columns: "price_set_id",
-    where: "deleted_at IS NULL",
-});
-const PriceRuleRuleTypeIdIndex = (0, utils_1.createPsqlIndexStatementHelper)({
-    tableName: tableName,
-    columns: "rule_type_id",
-    where: "deleted_at IS NULL",
-});
 const PriceRulePriceIdIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
-    columns: ["price_id", "rule_type_id"],
+    columns: ["price_id", "attribute"],
     where: "deleted_at IS NULL",
     unique: true,
 });
@@ -46,14 +34,10 @@ let PriceRule = class PriceRule {
     }
     beforeCreate() {
         this.id = (0, utils_1.generateEntityId)(this.id, "prule");
-        this.rule_type_id ??= this.rule_type?.id;
-        this.price_set_id ??= this.price_set?.id;
         this.price_id ??= this.price?.id;
     }
     onInit() {
         this.id = (0, utils_1.generateEntityId)(this.id, "prule");
-        this.rule_type_id ??= this.rule_type?.id;
-        this.price_set_id ??= this.price_set?.id;
         this.price_id ??= this.price?.id;
     }
 };
@@ -62,32 +46,9 @@ __decorate([
     __metadata("design:type", String)
 ], PriceRule.prototype, "id", void 0);
 __decorate([
-    PriceRulePriceSetIdIndex.MikroORMIndex(),
-    (0, core_1.ManyToOne)(() => price_set_1.default, {
-        columnType: "text",
-        mapToPk: true,
-        fieldName: "price_set_id",
-        onDelete: "cascade",
-    }),
-    __metadata("design:type", String)
-], PriceRule.prototype, "price_set_id", void 0);
-__decorate([
-    (0, core_1.ManyToOne)(() => price_set_1.default, { persist: false }),
-    __metadata("design:type", price_set_1.default)
-], PriceRule.prototype, "price_set", void 0);
-__decorate([
-    PriceRuleRuleTypeIdIndex.MikroORMIndex(),
-    (0, core_1.ManyToOne)(() => rule_type_1.default, {
-        columnType: "text",
-        mapToPk: true,
-        fieldName: "rule_type_id",
-    }),
+    (0, core_1.Property)({ columnType: "text" }),
     __metadata("design:type", String)
-], PriceRule.prototype, "rule_type_id", void 0);
-__decorate([
-    (0, core_1.ManyToOne)(() => rule_type_1.default, { persist: false }),
-    __metadata("design:type", rule_type_1.default)
-], PriceRule.prototype, "rule_type", void 0);
+], PriceRule.prototype, "attribute", void 0);
 __decorate([
     (0, core_1.Property)({ columnType: "text" }),
     __metadata("design:type", String)
@@ -108,7 +69,7 @@ __decorate([
 ], PriceRule.prototype, "price_id", void 0);
 __decorate([
     (0, core_1.ManyToOne)(() => price_1.default, { persist: false }),
-    __metadata("design:type", price_1.default)
+    __metadata("design:type", Object)
 ], PriceRule.prototype, "price", void 0);
 __decorate([
     (0, core_1.Property)({

package/dist/models/price-set.d.ts

@@ -1,13 +1,9 @@
 import { Collection } from "@mikro-orm/core";
 import Price from "./price";
-import PriceRule from "./price-rule";
-import RuleType from "./rule-type";
 export declare const PriceSetIdPrefix = "pset";
 export default class PriceSet {
     id: string;
     prices: Collection<Price, object>;
-    price_rules: Collection<PriceRule, object>;
-    rule_types: Collection<RuleType, object>;
     created_at: Date;
     updated_at: Date;
     deleted_at: Date | null;

package/dist/models/price-set.js

@@ -16,9 +16,6 @@ exports.PriceSetIdPrefix = void 0;
 const utils_1 = require("@medusajs/utils");
 const core_1 = require("@mikro-orm/core");
 const price_1 = __importDefault(require("./price"));
-const price_rule_1 = __importDefault(require("./price-rule"));
-const price_set_rule_type_1 = __importDefault(require("./price-set-rule-type"));
-const rule_type_1 = __importDefault(require("./rule-type"));
 const tableName = "price_set";
 const PriceSetDeletedAtIndex = (0, utils_1.createPsqlIndexStatementHelper)({
     tableName: tableName,
@@ -29,8 +26,6 @@ exports.PriceSetIdPrefix = "pset";
 let PriceSet = class PriceSet {
     constructor() {
         this.prices = new core_1.Collection(this);
-        this.price_rules = new core_1.Collection(this);
-        this.rule_types = new core_1.Collection(this);
         this.deleted_at = null;
     }
     onCreate() {
@@ -50,20 +45,6 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], PriceSet.prototype, "prices", void 0);
-__decorate([
-    (0, core_1.OneToMany)(() => price_rule_1.default, (pr) => pr.price_set, {
-        cascade: [core_1.Cascade.PERSIST, "soft-remove"],
-    }),
-    __metadata("design:type", Object)
-], PriceSet.prototype, "price_rules", void 0);
-__decorate([
-    (0, core_1.ManyToMany)({
-        entity: () => rule_type_1.default,
-        pivotEntity: () => price_set_rule_type_1.default,
-        cascade: ["soft-remove"],
-    }),
-    __metadata("design:type", Object)
-], PriceSet.prototype, "rule_types", void 0);
 __decorate([
     (0, core_1.Property)({
         onCreate: () => new Date(),

package/dist/models/price.d.ts

@@ -1,6 +1,6 @@
 import { DAL } from "@medusajs/types";
 import { BigNumber } from "@medusajs/utils";
-import { Collection, OptionalProps } from "@mikro-orm/core";
+import { Collection, OptionalProps, Rel } from "@mikro-orm/core";
 import PriceList from "./price-list";
 import PriceRule from "./price-rule";
 import PriceSet from "./price-set";
@@ -15,11 +15,11 @@ export default class Price {
     min_quantity: number | null;
     max_quantity: number | null;
     price_set_id: string;
-    price_set?: PriceSet;
+    price_set?: Rel<PriceSet>;
     rules_count: number;
     price_rules: Collection<PriceRule, object>;
     price_list_id: string | null;
-    price_list: PriceList | null;
+    price_list: Rel<PriceList> | null;
     created_at: Date;
     updated_at: Date;
     deleted_at: Date | null;

package/dist/models/price.js

@@ -101,7 +101,7 @@ __decorate([
 ], Price.prototype, "price_set_id", void 0);
 __decorate([
     (0, core_1.ManyToOne)(() => price_set_1.default, { persist: false }),
-    __metadata("design:type", price_set_1.default)
+    __metadata("design:type", Object)
 ], Price.prototype, "price_set", void 0);
 __decorate([
     (0, core_1.Property)({ columnType: "integer", default: 0 }),

package/dist/repositories/pricing.js

@@ -37,44 +37,42 @@ class PricingRepository extends utils_1.MikroOrmBase {
             price: "price",
         })
             .select({
-            id: "price1.id",
-            amount: "price1.amount",
-            min_quantity: "price1.min_quantity",
-            max_quantity: "price1.max_quantity",
-            currency_code: "price1.currency_code",
-            price_set_id: "price1.price_set_id",
-            rules_count: "price1.rules_count",
-            price_list_id: "price1.price_list_id",
+            id: "price.id",
+            amount: "price.amount",
+            min_quantity: "price.min_quantity",
+            max_quantity: "price.max_quantity",
+            currency_code: "price.currency_code",
+            price_set_id: "price.price_set_id",
+            rules_count: "price.rules_count",
+            price_list_id: "price.price_list_id",
             pl_rules_count: "pl.rules_count",
             pl_type: "pl.type",
-            has_price_list: knex.raw("case when price1.price_list_id IS NULL then False else True end"),
+            has_price_list: knex.raw("case when price.price_list_id IS NULL then False else True end"),
+        })
+            .leftJoin("price_rule as pr", "pr.price_id", "price.id")
+            .leftJoin("price_list as pl", function () {
+            this.on("pl.id", "price.price_list_id").andOn("pl.status", knex.raw("?", [utils_1.PriceListStatus.ACTIVE]));
         })
-            .leftJoin("price as price1", "price1.id", "price1.id")
-            .leftJoin("price_rule as pr", "pr.price_id", "price1.id")
-            .leftJoin("price_list as pl", "pl.id", "price1.price_list_id")
             .leftJoin("price_list_rule as plr", "plr.price_list_id", "pl.id")
-            .leftJoin("price_list_rule_value as plrv", "plrv.price_list_rule_id", "plr.id")
-            .leftJoin("rule_type as plrt", "plrt.id", "plr.rule_type_id")
-            .leftJoin("rule_type as rt", "rt.id", "pr.rule_type_id")
             .orderBy([
             { column: "rules_count", order: "desc" },
             { column: "pl.rules_count", order: "desc" },
         ])
-            .groupBy("price1.id", "pl.id")
-            .having(knex.raw("count(DISTINCT rt.rule_attribute) = price1.rules_count AND price1.price_list_id IS NULL"))
-            .orHaving(knex.raw("count(DISTINCT plrt.rule_attribute) = pl.rules_count AND price1.price_list_id IS NOT NULL"));
+            .groupBy("price.id", "pl.id")
+            .having(knex.raw("count(DISTINCT pr.attribute) = price.rules_count AND price.price_list_id IS NULL"))
+            .orHaving(knex.raw("count(DISTINCT plr.attribute) = pl.rules_count AND price.price_list_id IS NOT NULL"));
         priceSubQueryKnex.orWhere((q) => {
             for (const [key, value] of Object.entries(context)) {
                 q.orWhere({
-                    "rt.rule_attribute": key,
+                    "pr.attribute": key,
                     "pr.value": value,
                 });
             }
-            q.orWhere("price1.rules_count", "=", 0);
-            q.whereNull("price1.price_list_id");
+            q.orWhere("price.rules_count", "=", 0);
+            q.whereNull("price.price_list_id");
         });
         priceSubQueryKnex.orWhere((q) => {
-            q.whereNotNull("price1.price_list_id")
+            q.whereNotNull("price.price_list_id")
                 .andWhere(function () {
                 this.whereNull("pl.starts_at").orWhere("pl.starts_at", "<=", date);
             })
@@ -85,9 +83,9 @@ class PricingRepository extends utils_1.MikroOrmBase {
                 this.andWhere(function () {
                     for (const [key, value] of Object.entries(context)) {
                         this.orWhere({
-                            "plrt.rule_attribute": key,
+                            "plr.attribute": key,
                         });
-                        this.whereIn("plrv.value", [value]);
+                        this.where("plr.value", "@>", JSON.stringify(Array.isArray(value) ? value : [value]));
                     }
                     this.orWhere("pl.rules_count", "=", 0);
                 });
@@ -95,13 +93,13 @@ class PricingRepository extends utils_1.MikroOrmBase {
                     this.andWhere(function () {
                         for (const [key, value] of Object.entries(context)) {
                             this.orWhere({
-                                "rt.rule_attribute": key,
+                                "pr.attribute": key,
                                 "pr.value": value,
                             });
                         }
-                        this.andWhere("price1.rules_count", ">", 0);
+                        this.andWhere("price.rules_count", ">", 0);
                     });
-                    this.orWhere("price1.rules_count", "=", 0);
+                    this.orWhere("price.rules_count", "=", 0);
                 });
             });
         });
@@ -115,7 +113,6 @@ class PricingRepository extends utils_1.MikroOrmBase {
             min_quantity: "price.min_quantity",
             max_quantity: "price.max_quantity",
             currency_code: "price.currency_code",
-            default_priority: "rt.default_priority",
             rules_count: "price.rules_count",
             pl_rules_count: "price.pl_rules_count",
             price_list_type: "price.pl_type",
@@ -123,14 +120,12 @@ class PricingRepository extends utils_1.MikroOrmBase {
         })
             .join(priceSubQueryKnex.as("price"), "price.price_set_id", "ps.id")
             .leftJoin("price_rule as pr", "pr.price_id", "price.id")
-            .leftJoin("rule_type as rt", "rt.id", "pr.rule_type_id")
             .whereIn("ps.id", pricingFilters.id)
             .andWhere("price.currency_code", "=", currencyCode)
             .orderBy([
             { column: "price.has_price_list", order: "asc" },
             { column: "amount", order: "asc" },
             { column: "rules_count", order: "desc" },
-            { column: "default_priority", order: "desc" },
         ]);
         if (quantity) {
             priceSetQueryKnex.where("price.min_quantity", "<=", quantity);

package/dist/services/index.d.ts

@@ -1,3 +1 @@
-export { default as PriceListService } from "./price-list";
 export { default as PricingModuleService } from "./pricing-module";
-export { default as RuleTypeService } from "./rule-type";