@medusajs/pricing 0.2.0-next-20240425093236 → 0.2.0-next-20240429170320

package/dist/models/price-list.js

@@ -47,10 +47,12 @@ __decorate([
     __metadata("design:type", String)
 ], PriceList.prototype, "id", void 0);
 __decorate([
+    (0, utils_1.Searchable)(),
     (0, core_1.Property)({ columnType: "text" }),
     __metadata("design:type", String)
 ], PriceList.prototype, "title", void 0);
 __decorate([
+    (0, utils_1.Searchable)(),
     (0, core_1.Property)({ columnType: "text" }),
     __metadata("design:type", String)
 ], PriceList.prototype, "description", void 0);

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

@@ -1,4 +1,4 @@
-import { AddPricesDTO, Context, CreatePriceRuleDTO, DAL, InternalModuleDeclaration, ModuleJoinerConfig, ModulesSdkTypes, PriceSetDTO, PricingContext, PricingFilters, PricingRepositoryService, PricingTypes, RuleTypeDTO, UpsertPriceSetDTO } from "@medusajs/types";
+import { AddPricesDTO, Context, CreatePriceRuleDTO, DAL, FindConfig, 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 ".";
@@ -50,6 +50,9 @@ export default class PricingModuleService<TPriceSet extends PriceSet = PriceSet,
     protected readonly priceListRuleValueService_: ModulesSdkTypes.InternalModuleService<TPriceListRuleValue>;
     constructor({ baseRepository, pricingRepository, ruleTypeService, priceSetService, priceRuleService, priceSetRuleTypeService, priceService, priceListService, priceListRuleService, priceListRuleValueService, }: InjectedDependencies, moduleDeclaration: InternalModuleDeclaration);
     __joinerConfig(): ModuleJoinerConfig;
+    private setupCalculatedPriceConfig_;
+    list(filters?: PricingTypes.FilterablePriceSetProps, config?: FindConfig<PricingTypes.PriceSetDTO>, sharedContext?: Context): Promise<PriceSetDTO[]>;
+    listAndCount(filters?: PricingTypes.FilterablePriceSetProps, config?: FindConfig<PricingTypes.PriceSetDTO>, sharedContext?: Context): Promise<[PriceSetDTO[], number]>;
     calculatePrices(pricingFilters: PricingFilters, pricingContext?: PricingContext, sharedContext?: Context): Promise<PricingTypes.CalculatedPriceSet[]>;
     create(data: PricingTypes.CreatePriceSetDTO, sharedContext?: Context): Promise<PriceSetDTO>;
     create(data: PricingTypes.CreatePriceSetDTO[], sharedContext?: Context): Promise<PriceSetDTO[]>;

package/dist/services/pricing-module.js

@@ -48,13 +48,61 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
     __joinerConfig() {
         return joiner_config_1.joinerConfig;
     }
+    setupCalculatedPriceConfig_(filters, config) {
+        const fieldIdx = config.relations?.indexOf("calculated_price");
+        const shouldCalculatePrice = fieldIdx > -1;
+        if (!shouldCalculatePrice) {
+            return;
+        }
+        let pricingContext = filters.context ?? {};
+        // cleanup virtual field "calculated_price"
+        config.relations?.splice(fieldIdx, 1);
+        delete filters.context;
+        return pricingContext;
+    }
+    async list(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;
+            }
+        }
+        return priceSets;
+    }
+    async listAndCount(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;
+            }
+        }
+        return [priceSets, count];
+    }
     async calculatePrices(pricingFilters, pricingContext = { context: {} }, sharedContext = {}) {
         const results = await this.pricingRepository_.calculatePrices(pricingFilters, pricingContext, sharedContext);
         const pricesSetPricesMap = (0, utils_1.groupBy)(results, "price_set_id");
         const calculatedPrices = pricingFilters.id.map((priceSetId) => {
             // This is where we select prices, for now we just do a first match based on the database results
             // which is prioritized by rules_count first for exact match and then deafult_priority of the rule_type
-            // inject custom price selection here
+            // TODO: inject custom price selection here
             const prices = pricesSetPricesMap.get(priceSetId) || [];
             const priceListPrice = prices.find((p) => p.price_list_id);
             const defaultPrice = prices?.find((p) => !p.price_list_id);
@@ -318,7 +366,7 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
                     });
                     return {
                         ...rest,
-                        title: "test",
+                        title: "",
                         rules_count: numberOfRules,
                         price_rules: Array.from(rulesDataMap.values()),
                     };
@@ -749,6 +797,20 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
     }
 }
 exports.default = PricingModuleService;
+__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, "list", 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, "listAndCount", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     __param(2, (0, utils_1.MedusaContext)()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/pricing",
-  "version": "0.2.0-next-20240425093236",
+  "version": "0.2.0-next-20240429170320",
   "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-next-20240425093236",
+    "medusa-test-utils": "1.1.44-next-20240429170320",
     "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-next-20240425093236",
-    "@medusajs/types": "1.12.0-next-20240425093236",
-    "@medusajs/utils": "1.12.0-next-20240425093236",
+    "@medusajs/modules-sdk": "1.12.11-next-20240429170320",
+    "@medusajs/types": "1.12.0-next-20240429170320",
+    "@medusajs/utils": "1.12.0-next-20240429170320",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",