@medusajs/pricing 0.2.0-snapshot-20240409114424 → 0.2.0-snapshot-20240423083106

package/dist/joiner-config.d.ts

@@ -4,6 +4,7 @@ export declare const LinkableKeys: {
     price_set_id: string;
     price_list_id: string;
     price_id: string;
+    rule_type_id: string;
 };
 export declare const entityNameToLinkableKeysMap: MapToConfig;
 export declare const joinerConfig: ModuleJoinerConfig;

package/dist/joiner-config.js

@@ -11,6 +11,7 @@ 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]) => {
@@ -39,5 +40,17 @@ exports.joinerConfig = {
                 methodSuffix: "PriceLists",
             },
         },
+        {
+            name: ["price", "prices"],
+            args: {
+                methodSuffix: "Prices",
+            },
+        },
+        {
+            name: ["rule_type", "rule_types"],
+            args: {
+                methodSuffix: "RuleTypes",
+            },
+        },
     ],
 };

package/dist/migrations/Migration20230929122253.js

@@ -6,7 +6,7 @@ class Migration20230929122253 extends migrations_1.Migration {
     async up() {
         this.addSql('create table if not exists "money_amount" ("id" text not null, "currency_code" text not null, "amount" numeric not null, "min_quantity" numeric null, "max_quantity" numeric null, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "money_amount_pkey" primary key ("id"));');
         this.addSql('create table "price_set" ("id" text not null, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "price_set_pkey" primary key ("id"));');
-        this.addSql('create table "price" ("id" text not null, "title" text, "price_set_id" text not null, "money_amount_id" text not null, "rules_count" integer not null default 0, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "price_pkey" primary key ("id"));');
+        this.addSql('create table "price" ("id" text not null, "title" text, "price_set_id" text not null, "money_amount_id" text not null, "raw_amount" jsonb not null, "rules_count" integer not null default 0, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "price_pkey" primary key ("id"));');
         this.addSql('alter table "price" add constraint "price_money_amount_id_unique" unique ("money_amount_id");');
         this.addSql('create table "rule_type" ("id" text not null, "name" text not null, "rule_attribute" text not null, "default_priority" integer not null default 0, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "rule_type_pkey" primary key ("id"));');
         this.addSql('create table "price_set_rule_type" ("id" text not null, "price_set_id" text not null, "rule_type_id" text not null, "created_at" timestamptz not null default now(), "updated_at" timestamptz not null default now(), "deleted_at" timestamptz null, constraint "price_set_rule_type_pkey" primary key ("id"));');

package/dist/models/price.d.ts

@@ -1,4 +1,5 @@
 import { DAL } from "@medusajs/types";
+import { BigNumber } from "@medusajs/utils";
 import { Collection, OptionalProps } from "@mikro-orm/core";
 import PriceList from "./price-list";
 import PriceRule from "./price-rule";
@@ -9,7 +10,8 @@ export default class Price {
     id: string;
     title: string | null;
     currency_code: string;
-    amount: number;
+    amount: BigNumber | number;
+    raw_amount: Record<string, unknown>;
     min_quantity: number | null;
     max_quantity: number | null;
     price_set_id: string;

package/dist/models/price.js

@@ -74,9 +74,13 @@ __decorate([
     __metadata("design:type", String)
 ], Price.prototype, "currency_code", void 0);
 __decorate([
-    (0, core_1.Property)({ columnType: "numeric", serializer: Number }),
-    __metadata("design:type", Number)
+    (0, utils_1.MikroOrmBigNumberProperty)(),
+    __metadata("design:type", Object)
 ], Price.prototype, "amount", void 0);
+__decorate([
+    (0, core_1.Property)({ columnType: "jsonb" }),
+    __metadata("design:type", Object)
+], Price.prototype, "raw_amount", void 0);
 __decorate([
     (0, core_1.Property)({ columnType: "numeric", nullable: true }),
     __metadata("design:type", Object)

package/dist/services/pricing-module.d.ts

@@ -1,4 +1,4 @@
-import { AddPricesDTO, Context, DAL, InternalModuleDeclaration, ModuleJoinerConfig, ModulesSdkTypes, PriceSetDTO, PricingContext, PricingFilters, PricingRepositoryService, PricingTypes, RuleTypeDTO, UpsertPriceSetDTO } from "@medusajs/types";
+import { AddPricesDTO, Context, CreatePriceRuleDTO, DAL, InternalModuleDeclaration, ModuleJoinerConfig, ModulesSdkTypes, PriceSetDTO, PricingContext, PricingFilters, PricingRepositoryService, PricingTypes, RuleTypeDTO, UpsertPriceSetDTO } from "@medusajs/types";
 import { ModulesSdkUtils } from "@medusajs/utils";
 import { Price, PriceList, PriceListRule, PriceListRuleValue, PriceRule, PriceSet, PriceSetRuleType, RuleType } from "../models";
 import { PriceListService, RuleTypeService } from ".";
@@ -57,6 +57,7 @@ export default class PricingModuleService<TPriceSet extends PriceSet = PriceSet,
     upsert(data: UpsertPriceSetDTO, sharedContext?: Context): Promise<PriceSetDTO>;
     update(id: string, data: PricingTypes.UpdatePriceSetDTO, sharedContext?: Context): Promise<PriceSetDTO>;
     update(selector: PricingTypes.FilterablePriceSetProps, data: PricingTypes.UpdatePriceSetDTO, sharedContext?: Context): Promise<PriceSetDTO[]>;
+    private normalizeUpdateData;
     protected update_(data: UpdatePriceSetInput[], sharedContext?: Context): Promise<PriceSet[]>;
     addRules(data: PricingTypes.AddRulesDTO, sharedContext?: Context): Promise<PricingTypes.PriceSetDTO>;
     addRules(data: PricingTypes.AddRulesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceSetDTO[]>;
@@ -68,9 +69,9 @@ export default class PricingModuleService<TPriceSet extends PriceSet = PriceSet,
     createPriceListRules(data: PricingTypes.CreatePriceListRuleDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListRuleDTO[]>;
     createPriceListRules_(data: PricingTypes.CreatePriceListRuleDTO[], sharedContext?: Context): Promise<TPriceListRule[]>;
     updatePriceListRules(data: PricingTypes.UpdatePriceListRuleDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListRuleDTO[]>;
-    updatePriceListPrices(data: PricingTypes.UpdatePriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
+    updatePriceListPrices(data: PricingTypes.UpdatePriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceDTO[]>;
     removePrices(ids: string[], sharedContext?: Context): Promise<void>;
-    addPriceListPrices(data: PricingTypes.AddPriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
+    addPriceListPrices(data: PricingTypes.AddPriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceDTO[]>;
     setPriceListRules(data: PricingTypes.SetPriceListRulesDTO, sharedContext?: Context): Promise<PricingTypes.PriceListDTO>;
     removePriceListRules(data: PricingTypes.RemovePriceListRulesDTO, sharedContext?: Context): Promise<PricingTypes.PriceListDTO>;
     protected create_(data: PricingTypes.CreatePriceSetDTO[], sharedContext?: Context): Promise<TPriceSet[]>;
@@ -78,9 +79,9 @@ export default class PricingModuleService<TPriceSet extends PriceSet = PriceSet,
     protected addPrices_(input: AddPricesDTO[], sharedContext?: Context): Promise<void>;
     protected createPriceLists_(data: PricingTypes.CreatePriceListDTO[], sharedContext?: Context): Promise<TPriceList[]>;
     protected updatePriceLists_(data: PricingTypes.UpdatePriceListDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
-    protected updatePriceListPrices_(data: PricingTypes.UpdatePriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
+    protected updatePriceListPrices_(data: PricingTypes.UpdatePriceListPricesDTO[], sharedContext?: Context): Promise<TPrice[]>;
     protected removePrices_(ids: string[], sharedContext?: Context): Promise<void>;
-    protected addPriceListPrices_(data: PricingTypes.AddPriceListPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
+    protected addPriceListPrices_(data: PricingTypes.AddPriceListPricesDTO[], sharedContext?: Context): Promise<TPrice[]>;
     protected setPriceListRules_(data: PricingTypes.SetPriceListRulesDTO[], sharedContext?: Context): Promise<TPriceList[]>;
     protected removePriceListRules_(data: PricingTypes.RemovePriceListRulesDTO[], sharedContext?: Context): Promise<TPriceList[]>;
 }

package/dist/services/pricing-module.js

@@ -17,8 +17,8 @@ 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_set_1 = require("../models/price-set");
 const price_list_1 = require("../models/price-list");
+const price_set_1 = require("../models/price-set");
 const generateMethodForModels = [
     _models_1.PriceList,
     _models_1.PriceListRule,
@@ -134,11 +134,63 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         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());
+        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,
+                        value,
+                    };
+                });
+                const hasRulesInput = (0, utils_1.isPresent)(price.rules);
+                delete price.rules;
+                return {
+                    ...price,
+                    price_set_id: priceSet.id,
+                    price_rules: hasRulesInput ? rules : undefined,
+                    rules_count: hasRulesInput ? rules.length : undefined,
+                };
+            });
+            return {
+                ...priceSet,
+                prices,
+            };
+        });
+    }
     async update_(data, sharedContext = {}) {
         // TODO: We are not handling rule types, rules, etc. here, add support after data models are finalized
         // 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
-        return this.priceSetService_.upsertWithReplace(data, { relations: ["prices"] }, sharedContext);
+        const normalizedData = await this.normalizeUpdateData(data, sharedContext);
+        const prices = normalizedData.flatMap((priceSet) => priceSet.prices || []);
+        const upsertedPrices = await this.priceService_.upsertWithReplace(prices, {
+            relations: ["price_rules"],
+        }, sharedContext);
+        const priceSetsToUpsert = normalizedData.map((priceSet) => {
+            const { prices, ...rest } = priceSet;
+            return {
+                ...rest,
+                prices: upsertedPrices
+                    .filter((p) => p.price_set_id === priceSet.id)
+                    .map((price) => {
+                    // @ts-ignore
+                    delete price.price_rules;
+                    return price;
+                }),
+            };
+        });
+        return await this.priceSetService_.upsertWithReplace(priceSetsToUpsert, { relations: ["prices"] }, sharedContext);
     }
     async addRules(data, sharedContext = {}) {
         const inputs = Array.isArray(data) ? data : [data];
@@ -194,13 +246,15 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         });
     }
     async updatePriceListPrices(data, sharedContext = {}) {
-        return await this.updatePriceListPrices_(data, sharedContext);
+        const prices = await this.updatePriceListPrices_(data, sharedContext);
+        return await this.baseRepository_.serialize(prices);
     }
     async removePrices(ids, sharedContext = {}) {
         await this.removePrices_(ids, sharedContext);
     }
     async addPriceListPrices(data, sharedContext = {}) {
-        return await this.addPriceListPrices_(data, sharedContext);
+        const prices = await this.addPriceListPrices_(data, sharedContext);
+        return await this.baseRepository_.serialize(prices);
     }
     async setPriceListRules(data, sharedContext = {}) {
         const [priceList] = await this.setPriceListRules_([data], sharedContext);
@@ -510,40 +564,37 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         }
         const priceLists = await this.listPriceLists({ id: priceListIds }, { take: null }, sharedContext);
         const priceListMap = new Map(priceLists.map((p) => [p.id, p]));
+        const pricesToUpdate = [];
+        const priceRuleIdsToDelete = [];
+        const priceRulesToCreate = [];
         for (const { price_list_id: priceListId, prices } 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 priceRuleIdsToDelete = [];
-            const priceRulesToCreate = [];
-            const pricesToUpdate = [];
             for (const priceData of prices) {
-                const { rules, price_set_id, ...rest } = priceData;
+                const { rules = {}, price_set_id, ...rest } = priceData;
                 const price = priceMap.get(rest.id);
                 const priceRules = price.price_rules;
-                if (!(0, utils_1.isDefined)(rules)) {
-                    continue;
-                }
+                priceRulesToCreate.push(...Object.entries(rules).map(([ruleAttribute, ruleValue]) => ({
+                    price_set_id,
+                    rule_type_id: ruleTypeMap.get(ruleAttribute).id,
+                    value: ruleValue,
+                    price_id: price.id,
+                })));
                 pricesToUpdate.push({
                     ...rest,
                     rules_count: Object.keys(rules).length,
-                    price_rules: Object.entries(rules).map(([ruleAttribute, ruleValue]) => ({
-                        price_set_id,
-                        rule_type_id: ruleTypeMap.get(ruleAttribute).id,
-                        value: ruleValue,
-                        price_id: price.id,
-                    })),
                 });
                 priceRuleIdsToDelete.push(...priceRules.map((pr) => pr.id));
             }
-            await (0, utils_1.promiseAll)([
-                this.priceRuleService_.delete(priceRuleIdsToDelete),
-                this.priceRuleService_.create(priceRulesToCreate),
-                this.priceService_.update(pricesToUpdate),
-            ]);
         }
-        return priceLists;
+        const [_deletedPriceRule, _createdPriceRule, updatedPrices] = await (0, utils_1.promiseAll)([
+            this.priceRuleService_.delete(priceRuleIdsToDelete),
+            this.priceRuleService_.create(priceRulesToCreate),
+            this.priceService_.update(pricesToUpdate),
+        ]);
+        return updatedPrices;
     }
     async removePrices_(ids, sharedContext = {}) {
         await this.priceService_.delete(ids, sharedContext);
@@ -612,8 +663,7 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
             });
             pricesToCreate.push(...priceListPricesToCreate);
         }
-        await this.priceService_.create(pricesToCreate, sharedContext);
-        return priceLists;
+        return await this.priceService_.create(pricesToCreate, sharedContext);
     }
     async setPriceListRules_(data, sharedContext = {}) {
         // TODO: re think this method

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/pricing",
-  "version": "0.2.0-snapshot-20240409114424",
+  "version": "0.2.0-snapshot-20240423083106",
   "description": "Medusa Pricing module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "@mikro-orm/cli": "5.9.7",
     "cross-env": "^5.2.1",
     "jest": "^29.6.3",
-    "medusa-test-utils": "1.1.44-snapshot-20240409114424",
+    "medusa-test-utils": "1.1.44-snapshot-20240423083106",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
@@ -48,9 +48,9 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@medusajs/modules-sdk": "1.12.11-snapshot-20240409114424",
-    "@medusajs/types": "1.12.0-snapshot-20240409114424",
-    "@medusajs/utils": "1.12.0-snapshot-20240409114424",
+    "@medusajs/modules-sdk": "1.12.11-snapshot-20240423083106",
+    "@medusajs/types": "1.12.0-snapshot-20240423083106",
+    "@medusajs/utils": "1.12.0-snapshot-20240423083106",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",