@medusajs/pricing 0.1.12-snapshot-20240328221015 → 0.2.0-snapshot-20240329154849

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

@@ -1,7 +1,8 @@
-import { AddPricesDTO, Context, DAL, InternalModuleDeclaration, ModuleJoinerConfig, ModulesSdkTypes, PriceSetDTO, PricingContext, PricingFilters, PricingRepositoryService, PricingTypes, RuleTypeDTO } from "@medusajs/types";
+import { AddPricesDTO, Context, 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 ".";
+import { UpdatePriceSetInput } from "src/types/services";
 type InjectedDependencies = {
     baseRepository: DAL.RepositoryService;
     pricingRepository: PricingRepositoryService;
@@ -52,12 +53,16 @@ export default class PricingModuleService<TPriceSet extends PriceSet = PriceSet,
     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[]>;
+    upsert(data: UpsertPriceSetDTO[], sharedContext?: Context): Promise<PriceSetDTO[]>;
+    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[]>;
+    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[]>;
     addPrices(data: AddPricesDTO, sharedContext?: Context): Promise<PricingTypes.PriceSetDTO>;
     addPrices(data: AddPricesDTO[], sharedContext?: Context): Promise<PricingTypes.PriceSetDTO[]>;
     removeRules(data: PricingTypes.RemovePriceSetRulesDTO[], sharedContext?: Context): Promise<void>;
-    update(data: PricingTypes.UpdatePriceSetDTO[], sharedContext?: Context): Promise<PriceSetDTO[]>;
     createPriceLists(data: PricingTypes.CreatePriceListDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
     updatePriceLists(data: PricingTypes.UpdatePriceListDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListDTO[]>;
     createPriceListRules(data: PricingTypes.CreatePriceListRuleDTO[], sharedContext?: Context): Promise<PricingTypes.PriceListRuleDTO[]>;

package/dist/services/pricing-module.js

@@ -94,12 +94,51 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
     async create(data, sharedContext = {}) {
         const input = Array.isArray(data) ? data : [data];
         const priceSets = await this.create_(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"] }, sharedContext);
         // Ensure the output to be in the same order as the input
         const results = priceSets.map((priceSet) => {
             return dbPriceSets.find((p) => p.id === priceSet.id);
         });
-        return Array.isArray(data) ? results : results[0];
+        return await this.baseRepository_.serialize(Array.isArray(data) ? results : results[0]);
+    }
+    async upsert(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));
+        }
+        if (forUpdate.length) {
+            operations.push(this.update_(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 = {}) {
+        let normalizedInput = [];
+        if ((0, utils_1.isString)(idOrSelector)) {
+            // Check if the ID exists, it will throw if not.
+            await this.priceSetService_.retrieve(idOrSelector, {}, sharedContext);
+            normalizedInput = [{ id: idOrSelector, ...data }];
+        }
+        else {
+            const priceSets = await this.priceSetService_.list(idOrSelector, {}, sharedContext);
+            normalizedInput = priceSets.map((priceSet) => ({
+                id: priceSet.id,
+                ...data,
+            }));
+        }
+        const updateResult = await this.update_(normalizedInput, sharedContext);
+        const priceSets = await this.baseRepository_.serialize(updateResult);
+        return (0, utils_1.isString)(idOrSelector) ? priceSets[0] : priceSets;
+    }
+    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);
     }
     async addRules(data, sharedContext = {}) {
         const inputs = Array.isArray(data) ? data : [data];
@@ -131,10 +170,6 @@ class PricingModuleService extends utils_1.ModulesSdkUtils.abstractModuleService
         await this.priceSetRuleTypeService_.delete(priceSetRuleTypes.map((psrt) => psrt.id), sharedContext);
         await this.priceService_.delete(priceRules.map((pr) => pr.price.id), sharedContext);
     }
-    async update(data, sharedContext = {}) {
-        const priceSets = await this.priceSetService_.update(data, sharedContext);
-        return await this.baseRepository_.serialize(priceSets);
-    }
     async createPriceLists(data, sharedContext = {}) {
         const priceLists = await this.createPriceLists_(data, sharedContext);
         return await this.baseRepository_.serialize(priceLists);
@@ -684,28 +719,42 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "addRules", null);
+], PricingModuleService.prototype, "upsert", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
-    __param(1, (0, utils_1.MedusaContext)()),
+    __param(2, (0, utils_1.MedusaContext)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
-], PricingModuleService.prototype, "addPrices", null);
+], PricingModuleService.prototype, "update", 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);
+], 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);
+__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, "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, "update", null);
+], PricingModuleService.prototype, "removeRules", null);
 __decorate([
     (0, utils_1.InjectManager)("baseRepository_"),
     __param(1, (0, utils_1.MedusaContext)()),

package/dist/types/services/index.d.ts

@@ -1 +1,2 @@
 export * from "./price-list";
+export * from "./price-set";

package/dist/types/services/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./price-list"), exports);
+__exportStar(require("./price-set"), exports);

package/dist/types/services/price-set.d.ts

@@ -0,0 +1,4 @@
+import { UpdatePriceSetDTO } from "@medusajs/types";
+export interface UpdatePriceSetInput extends UpdatePriceSetDTO {
+    id: string;
+}

package/dist/types/services/price-set.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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