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

package/dist/services/pricing-module.js

@@ -17,33 +17,25 @@ const utils_1 = require("@medusajs/utils");
 const _models_1 = require("../models");
 const _utils_1 = require("../utils");
 const joiner_config_1 = require("../joiner-config");
-const price_list_1 = require("../models/price-list");
-const price_set_1 = require("../models/price-set");
-const generateMethodForModels = [
-    _models_1.PriceList,
-    _models_1.PriceListRule,
-    _models_1.PriceListRuleValue,
-    _models_1.PriceRule,
-    _models_1.Price,
-    _models_1.PriceSetRuleType,
-    _models_1.RuleType,
-];
-class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleServiceFactory(_models_1.PriceSet, generateMethodForModels, joiner_config_1.entityNameToLinkableKeysMap) {
-    constructor({ baseRepository, pricingRepository, ruleTypeService, priceSetService, priceRuleService, priceSetRuleTypeService, priceService, priceListService, priceListRuleService, priceListRuleValueService, }, moduleDeclaration) {
+const generateMethodForModels = {
+    PriceSet: _models_1.PriceSet,
+    PriceList: _models_1.PriceList,
+    PriceListRule: _models_1.PriceListRule,
+    PriceRule: _models_1.PriceRule,
+    Price: _models_1.Price,
+};
+class PricingModuleService extends utils_1.ModulesSdkUtils.MedusaService(generateMethodForModels, joiner_config_1.entityNameToLinkableKeysMap) {
+    constructor({ baseRepository, pricingRepository, priceSetService, priceRuleService, priceService, priceListService, priceListRuleService, }, moduleDeclaration) {
         // @ts-ignore
         super(...arguments);
         this.moduleDeclaration = moduleDeclaration;
         this.baseRepository_ = baseRepository;
         this.pricingRepository_ = pricingRepository;
-        this.ruleTypeService_ = ruleTypeService;
         this.priceSetService_ = priceSetService;
-        this.ruleTypeService_ = ruleTypeService;
         this.priceRuleService_ = priceRuleService;
-        this.priceSetRuleTypeService_ = priceSetRuleTypeService;
         this.priceService_ = priceService;
         this.priceListService_ = priceListService;
         this.priceListRuleService_ = priceListRuleService;
-        this.priceListRuleValueService_ = priceListRuleValueService;
     }
     __joinerConfig() {
         return joiner_config_1.joinerConfig;
@@ -60,39 +52,43 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         config.relations?.splice(fieldIdx, 1);
         return pricingContext;
     }
-    async list(filters = {}, config = {}, sharedContext = {}) {
+    // @ts-expect-error
+    async listPriceSets(filters = {}, config = {}, sharedContext = {}) {
         const pricingContext = this.setupCalculatedPriceConfig_(filters, config);
-        const priceSets = await super.list(filters, config, sharedContext);
-        if (pricingContext && priceSets.length) {
-            const priceSetIds = [];
-            const priceSetMap = new Map();
-            for (const priceSet of priceSets) {
-                priceSetIds.push(priceSet.id);
-                priceSetMap.set(priceSet.id, priceSet);
-            }
-            const calculatedPrices = await this.calculatePrices({ id: priceSets.map((p) => p.id) }, { context: pricingContext }, sharedContext);
-            for (const calculatedPrice of calculatedPrices) {
-                const priceSet = priceSetMap.get(calculatedPrice.id);
-                priceSet.calculated_price = calculatedPrice;
-            }
+        const priceSets = await super.listPriceSets(filters, config, sharedContext);
+        if (!pricingContext || !priceSets.length) {
+            return priceSets;
+        }
+        const priceSetIds = [];
+        const priceSetMap = new Map();
+        for (const priceSet of priceSets) {
+            priceSetIds.push(priceSet.id);
+            priceSetMap.set(priceSet.id, priceSet);
+        }
+        const calculatedPrices = await this.calculatePrices({ id: priceSetIds }, { context: pricingContext }, sharedContext);
+        for (const calculatedPrice of calculatedPrices) {
+            const priceSet = priceSetMap.get(calculatedPrice.id);
+            priceSet.calculated_price = calculatedPrice;
         }
         return priceSets;
     }
-    async listAndCount(filters = {}, config = {}, sharedContext = {}) {
+    // @ts-expect-error
+    async listAndCountPriceSets(filters = {}, config = {}, sharedContext = {}) {
         const pricingContext = this.setupCalculatedPriceConfig_(filters, config);
-        const [priceSets, count] = await super.listAndCount(filters, config, sharedContext);
-        if (pricingContext && priceSets.length) {
-            const priceSetIds = [];
-            const priceSetMap = new Map();
-            for (const priceSet of priceSets) {
-                priceSetIds.push(priceSet.id);
-                priceSetMap.set(priceSet.id, priceSet);
-            }
-            const calculatedPrices = await this.calculatePrices({ id: priceSets.map((p) => p.id) }, { context: pricingContext }, sharedContext);
-            for (const calculatedPrice of calculatedPrices) {
-                const priceSet = priceSetMap.get(calculatedPrice.id);
-                priceSet.calculated_price = calculatedPrice;
-            }
+        const [priceSets, count] = await super.listAndCountPriceSets(filters, config, sharedContext);
+        if (!pricingContext || !priceSets.length) {
+            return [priceSets, count];
+        }
+        const priceSetIds = [];
+        const priceSetMap = new Map();
+        for (const priceSet of priceSets) {
+            priceSetIds.push(priceSet.id);
+            priceSetMap.set(priceSet.id, priceSet);
+        }
+        const calculatedPrices = await this.calculatePrices({ id: priceSetIds }, { context: pricingContext }, sharedContext);
+        for (const calculatedPrice of calculatedPrices) {
+            const priceSet = priceSetMap.get(calculatedPrice.id);
+            priceSet.calculated_price = calculatedPrice;
         }
         return [priceSets, count];
     }
@@ -139,17 +135,12 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         });
         return JSON.parse(JSON.stringify(calculatedPrices));
     }
-    async create(data, sharedContext = {}) {
+    async createPriceSets(data, sharedContext = {}) {
         const input = Array.isArray(data) ? data : [data];
-        const priceSets = await this.create_(input, sharedContext);
+        const priceSets = await this.createPriceSets_(input, sharedContext);
         // TODO: Remove the need to refetch the data here
-        const dbPriceSets = await this.list({ id: priceSets.map((p) => p.id) }, {
-            relations: [
-                "rule_types",
-                "prices",
-                "price_rules",
-                "prices.price_rules",
-            ],
+        const dbPriceSets = await this.listPriceSets({ id: priceSets.map((p) => p.id) }, {
+            relations: ["prices", "prices.price_rules"],
         }, sharedContext);
         // Ensure the output to be in the same order as the input
         const results = priceSets.map((priceSet) => {
@@ -157,21 +148,21 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         });
         return await this.baseRepository_.serialize(Array.isArray(data) ? results : results[0]);
     }
-    async upsert(data, sharedContext = {}) {
+    async upsertPriceSets(data, sharedContext = {}) {
         const input = Array.isArray(data) ? data : [data];
         const forUpdate = input.filter((priceSet) => !!priceSet.id);
         const forCreate = input.filter((priceSet) => !priceSet.id);
         const operations = [];
         if (forCreate.length) {
-            operations.push(this.create_(forCreate, sharedContext));
+            operations.push(this.createPriceSets_(forCreate, sharedContext));
         }
         if (forUpdate.length) {
-            operations.push(this.update_(forUpdate, sharedContext));
+            operations.push(this.updatePriceSets_(forUpdate, sharedContext));
         }
         const result = (await (0, utils_1.promiseAll)(operations)).flat();
         return await this.baseRepository_.serialize(Array.isArray(data) ? result : result[0]);
     }
-    async update(idOrSelector, data, sharedContext = {}) {
+    async updatePriceSets(idOrSelector, data, sharedContext = {}) {
         let normalizedInput = [];
         if ((0, utils_1.isString)(idOrSelector)) {
             // Check if the ID exists, it will throw if not.
@@ -185,26 +176,16 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
                 ...data,
             }));
         }
-        const updateResult = await this.update_(normalizedInput, sharedContext);
+        const updateResult = await this.updatePriceSets_(normalizedInput, sharedContext);
         const priceSets = await this.baseRepository_.serialize(updateResult);
         return (0, utils_1.isString)(idOrSelector) ? priceSets[0] : priceSets;
     }
-    async normalizeUpdateData(data, sharedContext) {
-        const ruleAttributes = data
-            .map((d) => d.prices?.map((p) => Object.keys(p.rules ?? [])) ?? [])
-            .flat(Infinity)
-            .filter(Boolean);
-        const ruleTypes = await this.ruleTypeService_.list({ rule_attribute: ruleAttributes }, { take: null }, sharedContext);
-        const ruleTypeMap = ruleTypes.reduce((acc, curr) => {
-            acc.set(curr.rule_attribute, curr);
-            return acc;
-        }, new Map());
+    async normalizeUpdateData(data) {
         return data.map((priceSet) => {
             const prices = priceSet.prices?.map((price) => {
                 const rules = Object.entries(price.rules ?? {}).map(([attribute, value]) => {
                     return {
-                        price_set_id: priceSet.id,
-                        rule_type_id: ruleTypeMap.get(attribute).id,
+                        attribute,
                         value,
                     };
                 });
@@ -223,15 +204,12 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
             };
         });
     }
-    async update_(data, sharedContext = {}) {
-        // TODO: We are not handling rule types, rules, etc. here, add support after data models are finalized
+    async updatePriceSets_(data, sharedContext = {}) {
         // TODO: Since money IDs are rarely passed, this will delete all previous data and insert new entries.
         // We can make the `insert` inside upsertWithReplace do an `upsert` instead to avoid this
-        const normalizedData = await this.normalizeUpdateData(data, sharedContext);
+        const normalizedData = await this.normalizeUpdateData(data);
         const prices = normalizedData.flatMap((priceSet) => priceSet.prices || []);
-        const { entities: upsertedPrices } = await this.priceService_.upsertWithReplace(prices, {
-            relations: ["price_rules"],
-        }, sharedContext);
+        const { entities: upsertedPrices } = await this.priceService_.upsertWithReplace(prices, { relations: ["price_rules"] }, sharedContext);
         const priceSetsToUpsert = normalizedData.map((priceSet) => {
             const { prices, ...rest } = priceSet;
             return {
@@ -248,40 +226,21 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         const { entities: priceSets } = await this.priceSetService_.upsertWithReplace(priceSetsToUpsert, { relations: ["prices"] }, sharedContext);
         return priceSets;
     }
-    async addRules(data, sharedContext = {}) {
-        const inputs = Array.isArray(data) ? data : [data];
-        const priceSets = await this.addRules_(inputs, sharedContext);
-        const dbPriceSets = await this.list({ id: priceSets.map(({ id }) => id) }, { relations: ["rule_types"] });
-        const orderedPriceSets = priceSets.map((priceSet) => {
-            return dbPriceSets.find((p) => p.id === priceSet.id);
-        });
-        return Array.isArray(data) ? orderedPriceSets : orderedPriceSets[0];
-    }
     async addPrices(data, sharedContext = {}) {
         const input = Array.isArray(data) ? data : [data];
         await this.addPrices_(input, sharedContext);
-        const dbPrices = await this.list({ id: input.map((d) => d.priceSetId) }, { relations: ["prices"] }, sharedContext);
+        const dbPrices = await this.listPriceSets({ id: input.map((d) => d.priceSetId) }, { relations: ["prices"] }, sharedContext);
         const orderedPriceSets = input.map((inputItem) => {
             return dbPrices.find((p) => p.id === inputItem.priceSetId);
         });
         return Array.isArray(data) ? orderedPriceSets : orderedPriceSets[0];
     }
-    async removeRules(data, sharedContext = {}) {
-        const priceSets = await this.priceSetService_.list({ id: data.map((d) => d.id) }, {}, sharedContext);
-        const priceSetIds = priceSets.map((ps) => ps.id);
-        const ruleTypes = await this.ruleTypeService_.list({
-            rule_attribute: data.map((d) => d.rules || []).flat(),
-        }, { take: null }, sharedContext);
-        const ruleTypeIds = ruleTypes.map((rt) => rt.id);
-        const priceSetRuleTypes = await this.priceSetRuleTypeService_.list({ price_set_id: priceSetIds, rule_type_id: ruleTypeIds }, { take: null }, sharedContext);
-        const priceRules = await this.priceRuleService_.list({ price_set_id: priceSetIds, rule_type_id: ruleTypeIds }, { select: ["price"], take: null }, sharedContext);
-        await this.priceSetRuleTypeService_.delete(priceSetRuleTypes.map((psrt) => psrt.id), sharedContext);
-        await this.priceService_.delete(priceRules.map((pr) => pr.price.id), sharedContext);
-    }
+    // @ts-ignore
     async createPriceLists(data, sharedContext = {}) {
         const priceLists = await this.createPriceLists_(data, sharedContext);
         return await this.baseRepository_.serialize(priceLists);
     }
+    // @ts-ignore
     async updatePriceLists(data, sharedContext = {}) {
         const priceLists = await this.updatePriceLists_(data, sharedContext);
         return await this.baseRepository_.serialize(priceLists);
@@ -305,69 +264,36 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         const [priceList] = await this.removePriceListRules_([data], sharedContext);
         return await this.baseRepository_.serialize(priceList);
     }
-    async create_(data, sharedContext = {}) {
+    async createPriceSets_(data, sharedContext = {}) {
         const input = Array.isArray(data) ? data : [data];
-        const ruleAttributes = (0, utils_1.deduplicate)(data.map((d) => d.rules?.map((r) => r.rule_attribute) ?? []).flat());
-        const ruleTypes = await this.ruleTypeService_.list({ rule_attribute: ruleAttributes }, { take: null }, sharedContext);
-        const ruleTypeMap = ruleTypes.reduce((acc, curr) => {
-            acc.set(curr.rule_attribute, curr);
-            return acc;
-        }, new Map());
-        const invalidRuleAttributes = ruleAttributes.filter((r) => !ruleTypeMap.has(r));
-        if (invalidRuleAttributes.length > 0) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Rule types don't exist for: ${invalidRuleAttributes.join(", ")}`);
-        }
-        const invalidMoneyAmountRule = data
-            .map((d) => d.prices?.map((ma) => Object.keys(ma?.rules ?? {})).flat() ?? [])
-            .flat()
-            .filter((r) => !ruleTypeMap.has(r));
-        if (invalidMoneyAmountRule.length > 0) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Rule types don't exist for money amounts with rule attribute: ${invalidMoneyAmountRule.join(", ")}`);
-        }
-        const ruleSetRuleTypeToCreateMap = new Map();
         const toCreate = input.map((inputData) => {
-            const id = (0, utils_1.generateEntityId)(inputData.id, price_set_1.PriceSetIdPrefix);
-            const { prices, rules = [], ...rest } = inputData;
-            let pricesData = [];
-            rules.forEach((rule) => {
-                const priceSetRuleType = {
-                    rule_type_id: ruleTypeMap.get(rule.rule_attribute).id,
-                    price_set_id: id,
-                };
-                ruleSetRuleTypeToCreateMap.set(JSON.stringify(priceSetRuleType), priceSetRuleType);
-            });
-            if (inputData.prices) {
-                pricesData = inputData.prices.map((price) => {
-                    let { rules: priceRules = {}, ...rest } = price;
-                    const cleanRules = priceRules ? (0, utils_1.removeNullish)(priceRules) : {};
-                    const numberOfRules = Object.keys(cleanRules).length;
-                    const rulesDataMap = new Map();
-                    Object.entries(priceRules).map(([attribute, value]) => {
-                        const rule = {
-                            price_set_id: id,
-                            rule_type_id: ruleTypeMap.get(attribute).id,
-                            value,
-                        };
-                        rulesDataMap.set(JSON.stringify(rule), rule);
-                        const priceSetRuleType = {
-                            rule_type_id: ruleTypeMap.get(attribute).id,
-                            price_set_id: id,
-                        };
-                        ruleSetRuleTypeToCreateMap.set(JSON.stringify(priceSetRuleType), priceSetRuleType);
-                    });
-                    return {
-                        ...rest,
-                        title: "", // TODO: accept title
-                        rules_count: numberOfRules,
-                        price_rules: Array.from(rulesDataMap.values()),
+            const entry = {
+                ...inputData,
+            };
+            if (!inputData.prices) {
+                return entry;
+            }
+            const pricesData = inputData.prices.map((price) => {
+                let { rules: priceRules = {}, ...rest } = price;
+                const cleanRules = priceRules ? (0, utils_1.removeNullish)(priceRules) : {};
+                const rules = Object.entries(cleanRules);
+                const numberOfRules = rules.length;
+                const rulesDataMap = new Map();
+                rules.map(([attribute, value]) => {
+                    const rule = {
+                        attribute,
+                        value,
                     };
+                    rulesDataMap.set(JSON.stringify(rule), rule);
                 });
-            }
-            return {
-                ...rest,
-                id,
-                prices: pricesData,
-            };
+                return {
+                    ...rest,
+                    rules_count: numberOfRules,
+                    price_rules: Array.from(rulesDataMap.values()),
+                };
+            });
+            entry.prices = pricesData;
+            return entry;
         });
         // Bulk create price sets
         const createdPriceSets = await this.priceSetService_.create(toCreate, sharedContext);
@@ -403,85 +329,27 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
             data: eventsData.priceRules,
             sharedContext,
         });
-        if (ruleSetRuleTypeToCreateMap.size) {
-            await this.priceSetRuleTypeService_.create(Array.from(ruleSetRuleTypeToCreateMap.values()), sharedContext);
-        }
         return createdPriceSets;
     }
-    async addRules_(inputs, sharedContext = {}) {
-        const priceSets = await this.priceSetService_.list({ id: inputs.map((d) => d.priceSetId) }, { relations: ["rule_types"] }, sharedContext);
-        const priceSetRuleTypeMap = new Map(priceSets.map((priceSet) => [
-            priceSet.id,
-            new Map([...priceSet.rule_types].map((rt) => [rt.rule_attribute, rt])),
-        ]));
-        const priceSetMap = new Map(priceSets.map((p) => [p.id, p]));
-        const invalidPriceSetInputs = inputs.filter((d) => !priceSetMap.has(d.priceSetId));
-        if (invalidPriceSetInputs.length) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `PriceSets with ids: ${invalidPriceSetInputs
-                .map((d) => d.priceSetId)
-                .join(", ")} was not found`);
-        }
-        const ruleTypes = await this.ruleTypeService_.list({
-            rule_attribute: inputs
-                .map((data) => data.rules.map((r) => r.attribute))
-                .flat(),
-        }, { take: null }, sharedContext);
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
-        const invalidRuleAttributeInputs = inputs
-            .map((d) => d.rules.map((r) => r.attribute))
-            .flat()
-            .filter((r) => !ruleTypeMap.has(r));
-        if (invalidRuleAttributeInputs.length) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Rule types don't exist for attributes: ${[
-                ...new Set(invalidRuleAttributeInputs),
-            ].join(", ")}`);
-        }
-        const priceSetRuleTypesCreate = [];
-        inputs.forEach((data) => {
-            for (const rule of data.rules) {
-                if (priceSetRuleTypeMap.get(data.priceSetId).has(rule.attribute)) {
-                    continue;
-                }
-                priceSetRuleTypesCreate.push({
-                    rule_type_id: ruleTypeMap.get(rule.attribute).id,
-                    price_set_id: priceSetMap.get(data.priceSetId).id,
-                });
-            }
-        });
-        await this.priceSetRuleTypeService_.create(priceSetRuleTypesCreate, sharedContext);
-        return priceSets;
-    }
     async addPrices_(input, sharedContext = {}) {
-        const priceSets = await this.list({ id: input.map((d) => d.priceSetId) }, { relations: ["rule_types"] }, sharedContext);
+        const priceSets = await this.listPriceSets({ id: input.map((d) => d.priceSetId) }, {}, sharedContext);
         const priceSetMap = new Map(priceSets.map((p) => [p.id, p]));
-        const ruleTypeMap = new Map(priceSets.map((priceSet) => [
-            priceSet.id,
-            new Map(priceSet.rule_types?.map((rt) => [rt.rule_attribute, rt]) ?? []),
-        ]));
-        input.forEach(({ priceSetId, prices }) => {
+        input.forEach(({ priceSetId }) => {
             const priceSet = priceSetMap.get(priceSetId);
             if (!priceSet) {
                 throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Price set with id: ${priceSetId} not found`);
             }
-            const ruleAttributes = prices
-                .map((d) => (d.rules ? Object.keys(d.rules) : []))
-                .flat();
-            const invalidRuleAttributes = ruleAttributes.filter((r) => !ruleTypeMap.get(priceSetId).has(r));
-            if (invalidRuleAttributes.length > 0) {
-                throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Rule types don't exist for: ${invalidRuleAttributes.join(", ")}`);
-            }
         });
         const pricesToCreate = input.flatMap(({ priceSetId, prices }) => prices.map((price) => {
             const numberOfRules = Object.entries(price?.rules ?? {}).length;
             const priceRules = Object.entries(price.rules ?? {}).map(([attribute, value]) => ({
-                rule_type_id: ruleTypeMap.get(priceSetId).get(attribute).id,
                 price_set_id: priceSetId,
+                attribute: attribute,
                 value,
             }));
             return {
                 ...price,
                 price_set_id: priceSetId,
-                title: "test", // TODO: accept title
                 rules_count: numberOfRules,
                 price_rules: priceRules,
             };
@@ -518,56 +386,52 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         return prices;
     }
     async createPriceLists_(data, sharedContext = {}) {
-        const ruleTypeAttributes = [];
-        for (const priceListData of data) {
-            const { prices = [], rules: priceListRules = {} } = priceListData;
-            ruleTypeAttributes.push(...Object.keys(priceListRules));
-            for (const price of prices) {
-                const { rules: priceListPriceRules = {} } = price;
-                ruleTypeAttributes.push(...Object.keys(priceListPriceRules));
-            }
-        }
-        const ruleTypes = await this.listRuleTypes({ rule_attribute: ruleTypeAttributes }, { take: null }, sharedContext);
-        const invalidRuleTypes = (0, utils_1.arrayDifference)((0, utils_1.deduplicate)(ruleTypeAttributes), ruleTypes.map((ruleType) => ruleType.rule_attribute));
-        if (invalidRuleTypes.length) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Cannot find RuleTypes with rule_attribute - ${invalidRuleTypes.join(", ")}`);
-        }
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
-        const priceListsToCreate = data.map((priceListData) => {
-            const id = (0, utils_1.generateEntityId)(priceListData.id, price_list_1.PriceListIdPrefix);
-            const { prices = [], rules = {}, ...rest } = priceListData;
-            (0, _utils_1.validatePriceListDates)(priceListData);
-            const priceListRules = Object.entries(rules).map(([attribute, value]) => {
-                const ruleType = ruleTypeMap.get(attribute);
-                return {
-                    price_list_id: id,
-                    rule_type_id: ruleType.id,
-                    price_list_rule_values: value.map((v) => ({ value: v })),
-                };
-            });
-            const pricesData = prices.map((price) => {
-                const priceRules = Object.entries(price.rules ?? {}).map(([ruleAttribute, ruleValue]) => {
+        const normalized = this.normalizePriceListDate(data);
+        const priceListsToCreate = normalized.map((priceListData) => {
+            const entry = {
+                ...priceListData,
+                rules: undefined,
+            };
+            if (priceListData.prices) {
+                const pricesData = priceListData.prices.map((price) => {
+                    let { rules: priceRules = {}, ...rest } = price;
+                    const cleanRules = priceRules ? (0, utils_1.removeNullish)(priceRules) : {};
+                    const rules = Object.entries(cleanRules);
+                    const numberOfRules = rules.length;
+                    const rulesDataMap = new Map();
+                    rules.map(([attribute, value]) => {
+                        const rule = {
+                            attribute,
+                            value,
+                        };
+                        rulesDataMap.set(JSON.stringify(rule), rule);
+                    });
                     return {
-                        price_set_id: price.price_set_id,
-                        rule_type_id: ruleTypeMap.get(ruleAttribute)?.id,
-                        value: ruleValue,
+                        ...rest,
+                        rules_count: numberOfRules,
+                        price_rules: Array.from(rulesDataMap.values()),
                     };
                 });
-                return {
-                    price_list_id: id,
-                    title: "test",
-                    rules_count: Object.keys(price.rules ?? {}).length,
-                    price_rules: priceRules,
-                    ...price,
-                };
-            });
-            return {
-                id,
-                ...rest,
-                rules_count: Object.keys(rules).length,
-                price_list_rules: priceListRules,
-                prices: pricesData,
-            };
+                entry.prices = pricesData;
+            }
+            if (priceListData.rules) {
+                const cleanRules = priceListData.rules
+                    ? (0, utils_1.removeNullish)(priceListData.rules)
+                    : {};
+                const rules = Object.entries(cleanRules);
+                const numberOfRules = rules.length;
+                const rulesDataMap = new Map();
+                rules.map(([attribute, value]) => {
+                    const rule = {
+                        attribute,
+                        value,
+                    };
+                    rulesDataMap.set(JSON.stringify(rule), rule);
+                });
+                entry.price_list_rules = Array.from(rulesDataMap.values());
+                entry.rules_count = numberOfRules;
+            }
+            return entry;
         });
         const priceLists = await this.priceListService_.create(priceListsToCreate, sharedContext);
         /**
@@ -621,96 +485,52 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         return priceLists;
     }
     async updatePriceLists_(data, sharedContext = {}) {
-        const updatedPriceLists = [];
-        const ruleAttributes = [];
-        const priceListIds = [];
-        for (const priceListData of data) {
-            if (typeof priceListData.rules === "object") {
-                ruleAttributes.push(...Object.keys(priceListData.rules));
-                priceListIds.push(priceListData.id);
-            }
-        }
-        const existingPriceLists = await this.listPriceLists({ id: priceListIds }, { relations: ["price_list_rules"] }, sharedContext);
-        const priceListRuleIds = existingPriceLists
-            .map((pl) => (pl.price_list_rules || []).map((plr) => plr.id))
-            .flat();
-        const existingPriceListRules = await this.listPriceListRules({ id: priceListRuleIds }, {}, sharedContext);
-        if (existingPriceListRules.length) {
-            await this.deletePriceListRules(existingPriceListRules.map((plr) => plr.id), sharedContext);
+        const existingPriceLists = await this.priceListService_.list({ id: data.map((d) => d.id) }, {}, sharedContext);
+        if (existingPriceLists.length !== data.length) {
+            const diff = (0, utils_1.arrayDifference)(data.map((d) => d.id), existingPriceLists.map((p) => p.id));
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Price lists with ids: '${diff.join(", ")}' not found`);
         }
-        const ruleTypes = await this.listRuleTypes({ rule_attribute: ruleAttributes }, { take: null }, sharedContext);
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
-        for (const priceListData of data) {
-            const { rules, ...priceListOnlyData } = priceListData;
-            const updatePriceListData = {
-                ...priceListOnlyData,
+        const normalizedData = this.normalizePriceListDate(data).map((priceList) => {
+            const entry = {
+                ...priceList,
+                rules: undefined,
+                price_list_rules: undefined,
             };
-            (0, _utils_1.validatePriceListDates)(updatePriceListData);
-            if (typeof rules === "object") {
-                updatePriceListData.rules_count = Object.keys(rules).length;
-            }
-            const [updatedPriceList] = (await this.priceListService_.update([updatePriceListData], sharedContext));
-            updatedPriceLists.push(updatedPriceList);
-            for (const [ruleAttribute, ruleValues = []] of Object.entries(rules || {})) {
-                let ruleType = ruleTypeMap.get(ruleAttribute);
-                if (!ruleType) {
-                    ;
-                    [ruleType] = await this.createRuleTypes([{ name: ruleAttribute, rule_attribute: ruleAttribute }], sharedContext);
-                    ruleTypeMap.set(ruleAttribute, ruleType);
-                }
-                const [priceListRule] = await this.priceListRuleService_.create([
-                    {
-                        price_list_id: updatedPriceList.id,
-                        rule_type_id: ruleType?.id,
-                    },
-                ], sharedContext);
-                for (const ruleValue of ruleValues) {
-                    await this.priceListRuleValueService_.create([{ price_list_rule_id: priceListRule.id, value: ruleValue }], sharedContext);
-                }
+            if (typeof priceList.rules === "object") {
+                const cleanRules = priceList.rules
+                    ? (0, utils_1.removeNullish)(priceList.rules)
+                    : {};
+                const rules = Object.entries(cleanRules);
+                const numberOfRules = rules.length;
+                const rulesDataMap = new Map();
+                rules.map(([attribute, value]) => {
+                    const rule = {
+                        attribute,
+                        value,
+                    };
+                    rulesDataMap.set(JSON.stringify(rule), rule);
+                });
+                entry.price_list_rules = Array.from(rulesDataMap.values());
+                entry.rules_count = numberOfRules;
             }
-        }
-        return updatedPriceLists;
+            return entry;
+        });
+        const { entities } = await this.priceListService_.upsertWithReplace(normalizedData, {
+            relations: ["price_list_rules"],
+        });
+        return entities;
     }
     async updatePriceListPrices_(data, sharedContext = {}) {
-        const ruleTypeAttributes = [];
         const priceListIds = [];
         const priceIds = [];
-        const priceSetIds = data
-            .map((d) => d.prices.map((price) => price.price_set_id))
-            .flat();
         for (const priceListData of data) {
             priceListIds.push(priceListData.price_list_id);
             for (const price of priceListData.prices) {
                 priceIds.push(price.id);
-                ruleTypeAttributes.push(...Object.keys(price.rules || {}));
             }
         }
         const prices = await this.listPrices({ id: priceIds }, { take: null, relations: ["price_rules"] }, sharedContext);
         const priceMap = new Map(prices.map((price) => [price.id, price]));
-        const ruleTypes = await this.listRuleTypes({ rule_attribute: ruleTypeAttributes }, { take: null }, sharedContext);
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
-        const priceSets = await this.list({ id: priceSetIds }, { relations: ["rule_types"] }, sharedContext);
-        const priceSetRuleTypeMap = priceSets.reduce((acc, curr) => {
-            const priceSetRuleAttributeSet = acc.get(curr.id) || new Set();
-            for (const rt of curr.rule_types ?? []) {
-                priceSetRuleAttributeSet.add(rt.rule_attribute);
-            }
-            acc.set(curr.id, priceSetRuleAttributeSet);
-            return acc;
-        }, new Map());
-        const ruleTypeErrors = [];
-        for (const priceListData of data) {
-            for (const price of priceListData.prices) {
-                for (const ruleAttribute of Object.keys(price.rules ?? {})) {
-                    if (!priceSetRuleTypeMap.get(price.price_set_id)?.has(ruleAttribute)) {
-                        ruleTypeErrors.push(`rule_attribute "${ruleAttribute}" in price set ${price.price_set_id}`);
-                    }
-                }
-            }
-        }
-        if (ruleTypeErrors.length) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Invalid rule type configuration: Price set rules doesn't exist for ${ruleTypeErrors.join(", ")}`);
-        }
         const priceLists = await this.listPriceLists({ id: priceListIds }, { take: null }, sharedContext);
         const priceListMap = new Map(priceLists.map((p) => [p.id, p]));
         const pricesToUpdate = [];
@@ -727,7 +547,7 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
                 const priceRules = price.price_rules;
                 priceRulesToCreate.push(...Object.entries(rules).map(([ruleAttribute, ruleValue]) => ({
                     price_set_id,
-                    rule_type_id: ruleTypeMap.get(ruleAttribute).id,
+                    attribute: ruleAttribute,
                     value: ruleValue,
                     price_id: price.id,
                 })));
@@ -749,40 +569,10 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         await this.priceService_.delete(ids, sharedContext);
     }
     async addPriceListPrices_(data, sharedContext = {}) {
-        const ruleTypeAttributes = [];
         const priceListIds = [];
-        const priceSetIds = [];
         for (const priceListData of data) {
             priceListIds.push(priceListData.price_list_id);
-            for (const price of priceListData.prices) {
-                ruleTypeAttributes.push(...Object.keys(price.rules || {}));
-                priceSetIds.push(price.price_set_id);
-            }
         }
-        const ruleTypes = await this.listRuleTypes({ rule_attribute: ruleTypeAttributes }, { take: null }, sharedContext);
-        const priceSets = await this.list({ id: priceSetIds }, { relations: ["rule_types"] }, sharedContext);
-        const priceSetRuleTypeMap = priceSets.reduce((acc, curr) => {
-            const priceSetRuleAttributeSet = acc.get(curr.id) || new Set();
-            for (const rt of curr.rule_types ?? []) {
-                priceSetRuleAttributeSet.add(rt.rule_attribute);
-            }
-            acc.set(curr.id, priceSetRuleAttributeSet);
-            return acc;
-        }, new Map());
-        const ruleTypeErrors = [];
-        for (const priceListData of data) {
-            for (const price of priceListData.prices) {
-                for (const rule_attribute of Object.keys(price.rules ?? {})) {
-                    if (!priceSetRuleTypeMap.get(price.price_set_id)?.has(rule_attribute)) {
-                        ruleTypeErrors.push(`rule_attribute "${rule_attribute}" in price set ${price.price_set_id}`);
-                    }
-                }
-            }
-        }
-        if (ruleTypeErrors.length) {
-            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Invalid rule type configuration: Price set rules doesn't exist for ${ruleTypeErrors.join(", ")}`);
-        }
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
         const priceLists = await this.listPriceLists({ id: priceListIds }, {}, sharedContext);
         const priceListMap = new Map(priceLists.map((p) => [p.id, p]));
         const pricesToCreate = [];
@@ -796,8 +586,8 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
                 const noOfRules = Object.keys(priceRules).length;
                 const priceRulesToCreate = Object.entries(priceRules).map(([ruleAttribute, ruleValue]) => {
                     return {
-                        price_set_id: priceData.price_set_id,
-                        rule_type_id: ruleTypeMap.get(ruleAttribute)?.id,
+                        price_list_id: priceData.price_set_id,
+                        attribute: ruleAttribute,
                         value: ruleValue,
                     };
                 });
@@ -839,102 +629,116 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
     }
     async setPriceListRules_(data, sharedContext = {}) {
         // TODO: re think this method
-        const priceLists = await this.priceListService_.list({ id: data.map((d) => d.price_list_id) }, { relations: ["price_list_rules", "price_list_rules.rule_type"] }, sharedContext);
-        const priceListMap = new Map(priceLists.map((p) => [p.id, p]));
-        const ruleTypes = await this.listRuleTypes({ rule_attribute: data.map((d) => Object.keys(d.rules)).flat() }, { take: null });
-        const ruleTypeMap = new Map(ruleTypes.map((rt) => [rt.rule_attribute, rt]));
-        const ruleIdsToUpdate = [];
-        const rulesToCreate = [];
-        const priceRuleValues = new Map();
-        for (const { price_list_id: priceListId, rules } of data) {
-            const priceList = priceListMap.get(priceListId);
-            if (!priceList) {
-                throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Price list with id: ${priceListId} not found`);
+        const priceLists = await this.priceListService_.list({ id: data.map((d) => d.price_list_id) }, {
+            relations: ["price_list_rules"],
+        }, sharedContext);
+        const rulesMap = new Map();
+        data.forEach((rule) => {
+            if (!rulesMap.has(rule.price_list_id)) {
+                rulesMap.set(rule.price_list_id, []);
             }
-            const priceListRulesMap = new Map(priceList.price_list_rules.map((p) => [p.rule_type.rule_attribute, p]));
-            const priceListRuleValues = new Map();
-            Object.entries(rules).map(async ([key, value]) => {
-                const ruleType = ruleTypeMap.get(key);
-                if (!ruleType) {
-                    throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Rule type with attribute: ${key} not found`);
-                }
-                const rule = priceListRulesMap.get(key);
-                priceListRuleValues.set(ruleType.id, Array.isArray(value) ? value : [value]);
-                if (!rule) {
-                    rulesToCreate.push({
-                        rule_type_id: ruleType.id,
-                        price_list_id: priceListId,
-                    });
-                }
-                else {
-                    ruleIdsToUpdate.push(rule.id);
-                }
+            Object.entries(rule.rules).forEach(([key, value]) => {
+                rulesMap.get(rule.price_list_id).push([key, value]);
             });
-            priceRuleValues.set(priceListId, priceListRuleValues);
-        }
-        const [createdRules, priceListValuesToDelete] = await (0, utils_1.promiseAll)([
-            this.priceListRuleService_.create(rulesToCreate),
-            this.priceListRuleValueService_.list({ price_list_rule_id: ruleIdsToUpdate }, { take: null }),
-        ]);
-        const priceListRuleValuesToCreate = [];
-        for (const { id, price_list_id, rule_type_id } of createdRules) {
-            const ruleValues = priceRuleValues.get(price_list_id);
-            if (!ruleValues) {
-                continue;
-            }
-            const values = ruleValues.get(rule_type_id);
-            if (!values) {
-                continue;
+        });
+        const priceListsUpsert = priceLists
+            .map((priceList) => {
+            const allRules = new Map(priceList.price_list_rules
+                .toArray()
+                .map((r) => [r.attribute, r.value]));
+            const rules = rulesMap.get(priceList.id);
+            if (!rules?.length) {
+                return;
             }
-            values.forEach((v) => {
-                priceListRuleValuesToCreate.push({
-                    price_list_rule_id: id,
-                    value: v,
-                });
+            rules.forEach(([key, value]) => {
+                allRules.set(key, value);
             });
-        }
-        await (0, utils_1.promiseAll)([
-            this.priceListRuleValueService_.delete(priceListValuesToDelete.map((p) => p.id), sharedContext),
-            this.priceListRuleValueService_.create(priceListRuleValuesToCreate, sharedContext),
-        ]);
-        return priceLists;
+            return {
+                ...priceList,
+                rules_count: allRules.size,
+                price_list_rules: Array.from(allRules).map(([attribute, value]) => ({
+                    attribute,
+                    value,
+                })),
+            };
+        })
+            .filter(Boolean);
+        const { entities } = await this.priceListService_.upsertWithReplace(priceListsUpsert, { relations: ["price_list_rules"] }, sharedContext);
+        return entities;
     }
     async removePriceListRules_(data, sharedContext = {}) {
-        const priceLists = await this.priceListService_.list({ id: data.map((d) => d.price_list_id) }, { relations: ["price_list_rules", "price_list_rules.rule_type"] }, sharedContext);
-        const priceListMap = new Map(priceLists.map((p) => [p.id, p]));
-        const idsToDelete = [];
-        for (const { price_list_id: priceListId, rules } of data) {
-            const priceList = priceListMap.get(priceListId);
-            if (!priceList) {
-                throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Price list with id: ${priceListId} not found`);
+        // TODO: re think this method
+        const priceLists = await this.priceListService_.list({ id: data.map((d) => d.price_list_id) }, {
+            relations: ["price_list_rules"],
+        }, sharedContext);
+        const rulesMap = new Map();
+        data.forEach((rule) => {
+            if (!rulesMap.has(rule.price_list_id)) {
+                rulesMap.set(rule.price_list_id, []);
             }
-            const priceListRulesMap = new Map(priceList.price_list_rules.map((p) => [p.rule_type.rule_attribute, p]));
-            rules.map(async (rule_attribute) => {
-                const rule = priceListRulesMap.get(rule_attribute);
-                if (rule) {
-                    idsToDelete.push(rule.id);
-                }
+            rule.rules.forEach((key) => {
+                rulesMap.get(rule.price_list_id).push([key, undefined]);
             });
-        }
-        await this.priceListRuleService_.delete(idsToDelete);
-        return priceLists;
+        });
+        const priceListsUpsert = priceLists
+            .map((priceList) => {
+            const allRules = new Map(priceList.price_list_rules
+                .toArray()
+                .map((r) => [r.attribute, r.value]));
+            const rules = rulesMap.get(priceList.id);
+            if (!rules?.length) {
+                return;
+            }
+            rules.forEach(([key, value]) => {
+                allRules.set(key, value);
+            });
+            return {
+                ...priceList,
+                rules_count: allRules.size,
+                price_list_rules: Array.from(allRules)
+                    .map(([attribute, value]) => ({
+                    attribute,
+                    value,
+                }))
+                    .filter((r) => !!r.value),
+            };
+        })
+            .filter(Boolean);
+        const { entities } = await this.priceListService_.upsertWithReplace(priceListsUpsert, { relations: ["price_list_rules"] }, sharedContext);
+        return entities;
+    }
+    normalizePriceListDate(data) {
+        return data.map((priceListData) => {
+            (0, _utils_1.validatePriceListDates)(priceListData);
+            if (!!priceListData.starts_at) {
+                priceListData.starts_at = (0, utils_1.GetIsoStringFromDate)(priceListData.starts_at);
+            }
+            if (!!priceListData.ends_at) {
+                priceListData.ends_at = (0, utils_1.GetIsoStringFromDate)(priceListData.ends_at);
+            }
+            return priceListData;
+        });
     }
 }
 exports.default = PricingModuleService;
 __decorate([
-    (0, utils_1.InjectManager)("baseRepository_"),
+    (0, utils_1.InjectManager)("baseRepository_")
+    // @ts-expect-error
+    ,
     __param(2, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "list", null);
+], PricingModuleService.prototype, "listPriceSets", null);
 __decorate([
-    (0, utils_1.InjectManager)("baseRepository_"),
+    (0, utils_1.InjectManager)("baseRepository_")
+    // @ts-expect-error
+    ,
     __param(2, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "listAndCount", null);
+], PricingModuleService.prototype, "listAndCountPriceSets", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     __param(2, (0, utils_1.MedusaContext)()),
@@ -949,35 +753,28 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "create", null);
+], PricingModuleService.prototype, "createPriceSets", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     __param(1, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "upsert", null);
+], PricingModuleService.prototype, "upsertPriceSets", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     __param(2, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "update", null);
+], PricingModuleService.prototype, "updatePriceSets", null);
 __decorate([
     (0, utils_1.InjectTransactionManager)("baseRepository_"),
     __param(1, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "update_", null);
-__decorate([
-    (0, utils_1.InjectManager)("baseRepository_"),
-    __param(1, (0, utils_1.MedusaContext)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "addRules", null);
+], PricingModuleService.prototype, "updatePriceSets_", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     (0, utils_1.EmitEvents)(),
@@ -986,23 +783,20 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], PricingModuleService.prototype, "addPrices", null);
-__decorate([
-    (0, utils_1.InjectTransactionManager)("baseRepository_"),
-    __param(1, (0, utils_1.MedusaContext)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, Object]),
-    __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "removeRules", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
-    (0, utils_1.EmitEvents)(),
+    (0, utils_1.EmitEvents)()
+    // @ts-ignore
+    ,
     __param(1, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array, Object]),
     __metadata("design:returntype", Promise)
 ], PricingModuleService.prototype, "createPriceLists", null);
 __decorate([
-    (0, utils_1.InjectTransactionManager)("baseRepository_"),
+    (0, utils_1.InjectTransactionManager)("baseRepository_")
+    // @ts-ignore
+    ,
     __param(1, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array, Object]),
@@ -1050,14 +844,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "create_", null);
-__decorate([
-    (0, utils_1.InjectTransactionManager)("baseRepository_"),
-    __param(1, (0, utils_1.MedusaContext)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, Object]),
-    __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "addRules_", null);
+], PricingModuleService.prototype, "createPriceSets_", null);
 __decorate([
     (0, utils_1.InjectTransactionManager)("baseRepository_"),
     __param(1, (0, utils_1.MedusaContext)()),