@unchainedshop/core-products 5.0.0-alpha.2 → 5.0.0-alpha.4

package/lib/db/ProductsCollection.d.ts

@@ -50,7 +50,7 @@ export interface ProductPrice extends Price {
     isTaxable?: boolean;
     isNetPrice?: boolean;
     countryCode: string;
-    maxQuantity?: number;
+    minQuantity?: number;
 }
 export interface ProductPriceRange {
     minPrice: ProductPrice;

package/lib/db/ProductsCollection.js

@@ -41,11 +41,13 @@ export const ProductsCollection = async (db) => {
         },
     ]);
     await buildDbIndexes(Products, [
-        { index: { deleted: 1, status: 1, sequence: 1 } },
+        { index: { status: 1, sequence: 1, published: -1 } },
         { index: { slugs: 1 } },
         { index: { tags: 1 } },
         { index: { 'warehousing.sku': 1 }, options: { sparse: true } },
-    ]);
+        { index: { 'bundleItems.productId': 1 }, options: { sparse: true } },
+        { index: { 'proxy.assignments.productId': 1 }, options: { sparse: true } },
+    ], { rebuild: false });
     await buildDbIndexes(ProductTexts, [
         { index: { productId: 1 } },
         { index: { slug: 1 } },

package/lib/migrations/20260611120000-pricing-maxquantity-to-minquantity.d.ts

@@ -0,0 +1,2 @@
+import type { MigrationRepository } from '@unchainedshop/mongodb';
+export default function migrateCommercePricingToMinQuantity(repository: MigrationRepository): void;

package/lib/migrations/20260611120000-pricing-maxquantity-to-minquantity.js

@@ -0,0 +1,54 @@
+import { createLogger } from '@unchainedshop/logger';
+import { ProductsCollection } from "../db/ProductsCollection.js";
+const logger = createLogger('unchained:core-products:migrations');
+const UNMIGRATED_PRICING_SELECTOR = {
+    'commerce.pricing': { $elemMatch: { minQuantity: { $exists: false } } },
+};
+const convertPricingToMinQuantity = (pricing = []) => {
+    const groups = new Map();
+    for (const level of pricing) {
+        const key = `${level.countryCode}:${level.currencyCode}`;
+        const group = groups.get(key);
+        if (group)
+            group.push(level);
+        else
+            groups.set(key, [level]);
+    }
+    const nextPricing = [];
+    for (const levels of groups.values()) {
+        const sorted = [...levels].sort((a, b) => (a.maxQuantity || Number.POSITIVE_INFINITY) - (b.maxQuantity || Number.POSITIVE_INFINITY));
+        const seenMax = new Set();
+        let previousMax = 0;
+        sorted.forEach((level, index) => {
+            if (level.maxQuantity) {
+                if (seenMax.has(level.maxQuantity)) {
+                    logger.warn(`Duplicate maxQuantity ${level.maxQuantity} for ${level.countryCode}/${level.currencyCode} — order resolved by stable sort`);
+                }
+                seenMax.add(level.maxQuantity);
+            }
+            const { maxQuantity, ...rest } = level;
+            nextPricing.push({ ...rest, minQuantity: index === 0 ? 0 : previousMax + 1 });
+            previousMax = maxQuantity || previousMax;
+        });
+    }
+    return nextPricing;
+};
+export default function migrateCommercePricingToMinQuantity(repository) {
+    repository?.register({
+        id: 20260611120000,
+        name: 'Convert product commerce pricing tiers from maxQuantity to minQuantity',
+        up: async () => {
+            const { Products } = await ProductsCollection(repository.db);
+            let migrated = 0;
+            const cursor = Products.find(UNMIGRATED_PRICING_SELECTOR);
+            for await (const product of cursor) {
+                const nextPricing = convertPricingToMinQuantity((product.commerce?.pricing ?? []));
+                await Products.updateOne({ _id: product._id }, { $set: { 'commerce.pricing': nextPricing } });
+                migrated += 1;
+            }
+            if (migrated > 0) {
+                logger.info(`Converted commerce pricing tiers to minQuantity on ${migrated} product(s)`);
+            }
+        },
+    });
+}

package/lib/mock/product.d.ts

@@ -8,21 +8,14 @@ declare const _default: {
     slugs: string[];
     updated: Date;
     commerce: {
-        pricing: ({
+        pricing: {
             amount: number;
-            maxQuantity: null;
+            minQuantity: number;
             isTaxable: boolean;
             isNetPrice: boolean;
             currencyCode: string;
             countryCode: string;
-        } | {
-            amount: number;
-            maxQuantity: number;
-            isTaxable: boolean;
-            isNetPrice: boolean;
-            currencyCode: string;
-            countryCode: string;
-        })[];
+        }[];
     };
     published: Date;
 };

package/lib/mock/product.js

@@ -11,7 +11,7 @@ export default {
         pricing: [
             {
                 amount: 1000,
-                maxQuantity: null,
+                minQuantity: 3,
                 isTaxable: false,
                 isNetPrice: false,
                 currencyCode: 'CHF',
@@ -19,7 +19,7 @@ export default {
             },
             {
                 amount: 20000,
-                maxQuantity: 2,
+                minQuantity: 0,
                 isTaxable: true,
                 isNetPrice: true,
                 currencyCode: 'ETB',
@@ -27,7 +27,7 @@ export default {
             },
             {
                 amount: 1,
-                maxQuantity: 1,
+                minQuantity: 0,
                 isTaxable: false,
                 isNetPrice: false,
                 currencyCode: 'ETH',
@@ -35,7 +35,7 @@ export default {
             },
             {
                 amount: 750,
-                maxQuantity: 2,
+                minQuantity: 0,
                 isTaxable: false,
                 isNetPrice: false,
                 currencyCode: 'CHF',

package/lib/module/configureProductMediaModule.js

@@ -54,7 +54,7 @@ export const configureProductMediaModule = async ({ db }) => {
             const mediaList = ProductMedias.find(selector, {
                 skip: offset,
                 limit,
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
                 ...options,
             });
             return mediaList.toArray();
@@ -64,7 +64,7 @@ export const configureProductMediaModule = async ({ db }) => {
                 const lastProductMedia = (await ProductMedias.findOne({
                     productId: doc.productId,
                 }, {
-                    sort: { sortKey: -1 },
+                    sort: { sortKey: -1, _id: -1 },
                 })) || { sortKey: 0 };
                 sortKey = lastProductMedia.sortKey + 1;
             }
@@ -123,7 +123,7 @@ export const configureProductMediaModule = async ({ db }) => {
             }));
             const productMedias = await ProductMedias.find({
                 _id: { $in: changedProductMediaIds },
-            }, { sort: { sortKey: 1 } }).toArray();
+            }, { sort: { sortKey: 1, _id: 1 } }).toArray();
             await emit('PRODUCT_REORDER_MEDIA', { productMedias });
             return productMedias;
         },

package/lib/module/configureProductPrices.d.ts

@@ -36,7 +36,7 @@ export declare const configureProductPricesModule: ({ proxyProducts, db, }: {
         countryCode: string;
     }) => Promise<{
         minQuantity: number;
-        maxQuantity: number;
+        maxQuantity: number | null;
         price: ProductPrice;
     }[]>;
     rates: {

package/lib/module/configureProductPrices.js

@@ -18,6 +18,18 @@ export const normalizeRate = (baseCurrency, quoteCurrency, rateRecord) => {
     rate = fromDecimals !== targetDecimals ? rate / 10 ** (fromDecimals - targetDecimals) : rate;
     return rate;
 };
+const normalizeProductPrice = (priceLevel) => {
+    if (priceLevel.amount === null)
+        return null;
+    return {
+        amount: priceLevel.amount,
+        currencyCode: priceLevel.currencyCode,
+        countryCode: priceLevel.countryCode,
+        minQuantity: priceLevel.minQuantity ?? 0,
+        isTaxable: !!priceLevel.isTaxable,
+        isNetPrice: !!priceLevel.isNetPrice,
+    };
+};
 export const configureProductPricesModule = ({ proxyProducts, db, }) => {
     const catalogPrice = async (product, { countryCode, currencyCode, quantity = 1, }) => {
         const pricing = getPriceLevels({
@@ -25,24 +37,18 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
             currencyCode,
             countryCode,
         });
-        const foundPrice = pricing.find((level) => !level.maxQuantity || level.maxQuantity >= quantity);
+        const foundPrice = pricing.filter((level) => (level.minQuantity ?? 0) <= quantity).pop();
         if (!foundPrice)
             return null;
-        const normalizedPrice = {
-            isTaxable: false,
-            isNetPrice: false,
-            ...foundPrice,
-        };
-        if (normalizedPrice.amount !== null) {
-            return normalizedPrice;
-        }
-        return null;
+        return normalizeProductPrice(foundPrice);
     };
     return {
         price: catalogPrice,
         priceRange: getPriceRange,
         async catalogPrices(product) {
-            return (product.commerce && product.commerce.pricing) || [];
+            return ((product.commerce && product.commerce.pricing) || [])
+                .map(normalizeProductPrice)
+                .filter((priceLevel) => Boolean(priceLevel));
         },
         catalogPriceRange: async (product, { quantity = 0, vectors = [], includeInactive = false, countryCode, currencyCode, }) => {
             const products = await proxyProducts(product, vectors, {
@@ -65,28 +71,24 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
             };
         },
         catalogPricesLeveled: async (product, { currencyCode, countryCode }) => {
-            let previousMax;
-            const filteredAndSortedPriceLevels = getPriceLevels({
+            const sortedPriceLevels = getPriceLevels({
                 product,
                 currencyCode,
                 countryCode,
             });
-            return filteredAndSortedPriceLevels.map((priceLevel, i) => {
-                const max = priceLevel.maxQuantity || 0;
-                const min = previousMax ? previousMax + 1 : 0;
-                previousMax = priceLevel.maxQuantity;
+            return sortedPriceLevels.flatMap((priceLevel, i) => {
+                const nextLevel = sortedPriceLevels[i + 1];
+                const price = normalizeProductPrice({
+                    ...priceLevel,
+                    currencyCode,
+                    countryCode,
+                });
+                if (!price)
+                    return [];
                 return {
-                    minQuantity: min,
-                    maxQuantity: i === 0 && priceLevel.maxQuantity && priceLevel.maxQuantity > 0
-                        ? priceLevel.maxQuantity
-                        : max,
-                    price: {
-                        isTaxable: !!priceLevel.isTaxable,
-                        isNetPrice: !!priceLevel.isNetPrice,
-                        amount: priceLevel.amount,
-                        currencyCode,
-                        countryCode,
-                    },
+                    minQuantity: priceLevel.minQuantity ?? 0,
+                    maxQuantity: nextLevel?.minQuantity != null ? nextLevel.minQuantity - 1 : null,
+                    price,
                 };
             });
         },
@@ -106,7 +108,7 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
                     ],
                     timestamp: { $lte: referenceDate },
                     expiresAt: { $gte: referenceDate },
-                }, { sort: { timestamp: -1 } });
+                }, { sort: { timestamp: -1, _id: -1 } });
                 if (!mostRecentCurrencyRate)
                     return null;
                 const rate = normalizeRate(baseCurrency, quoteCurrency, mostRecentCurrencyRate);

package/lib/module/configureProductsModule.d.ts

@@ -80,7 +80,7 @@ export declare const configureProductsModule: (moduleInput: ModuleInput<Products
             countryCode: string;
         }) => Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("../db/ProductsCollection.ts").ProductPrice;
         }[]>;
         rates: {

package/lib/module/configureProductsModule.js

@@ -8,6 +8,7 @@ import { configureProductReviewsModule } from "./configureProductReviewsModule.j
 import { configureProductTextsModule } from "./configureProductTextsModule.js";
 import { configureProductVariationsModule } from "./configureProductVariationsModule.js";
 import { productsSettings } from "../products-settings.js";
+import migrateCommercePricingToMinQuantity from "../migrations/20260611120000-pricing-maxquantity-to-minquantity.js";
 const PRODUCT_EVENTS = [
     'PRODUCT_CREATE',
     'PRODUCT_REMOVE',
@@ -23,6 +24,7 @@ const PRODUCT_EVENTS = [
 const InternalProductStatus = {
     DRAFT: null,
 };
+const isDraftStatus = (status) => status === ProductStatus.DRAFT || status === InternalProductStatus.DRAFT;
 export const buildFindSelector = ({ slugs, tags, includeDrafts = false, includeDeleted = false, productIds, productSelector, queryString, skus, bundleItemProductIds, proxyAssignmentProductIds, }) => {
     const selector = productSelector ? { ...productSelector } : {};
     if (productIds && !selector._id) {
@@ -69,10 +71,11 @@ export const buildFindSelector = ({ slugs, tags, includeDrafts = false, includeD
     return selector;
 };
 export const configureProductsModule = async (moduleInput) => {
-    const { db, options: productsOptions = {} } = moduleInput;
+    const { db, migrationRepository, options: productsOptions = {} } = moduleInput;
     registerEvents(PRODUCT_EVENTS);
     await productsSettings.configureSettings(productsOptions);
     const { Products, ProductTexts } = await ProductsCollection(db);
+    migrateCommercePricingToMinQuantity(migrationRepository);
     const productTexts = configureProductTextsModule({
         Products,
         ProductTexts,
@@ -94,7 +97,7 @@ export const configureProductsModule = async (moduleInput) => {
         return deletedResult.deletedCount;
     };
     const publishProduct = async (product) => {
-        if (product.status === InternalProductStatus.DRAFT) {
+        if (isDraftStatus(product.status)) {
             await Products.updateOne(generateDbFilterById(product._id), {
                 $set: {
                     status: ProductStatus.ACTIVE,
@@ -146,7 +149,7 @@ export const configureProductsModule = async (moduleInput) => {
     return {
         findProduct: async (params) => {
             if ('sku' in params) {
-                return Products.findOne({ 'warehousing.sku': params.sku }, { sort: { sequence: 1 } });
+                return Products.findOne({ 'warehousing.sku': params.sku }, { sort: { sequence: 1, _id: 1 } });
             }
             if ('slug' in params && params.slug != null) {
                 return Products.findOne({ slugs: params.slug }, {});
@@ -187,7 +190,7 @@ export const configureProductsModule = async (moduleInput) => {
             return product.status === ProductStatus.ACTIVE;
         },
         isDraft: (product) => {
-            return product.status === ProductStatus.DRAFT || product.status === InternalProductStatus.DRAFT;
+            return isDraftStatus(product.status);
         },
         normalizedStatus: (product) => {
             return product.status === null ? ProductStatus.DRAFT : product.status;

package/lib/module/utils/getPriceLevels.js

@@ -1,17 +1,10 @@
 export const getPriceLevels = (params) => {
-    return (params.product?.commerce?.pricing || [])
-        .toSorted(({ maxQuantity: leftMaxQuantity = 0 }, { maxQuantity: rightMaxQuantity = 0 }) => {
-        if (leftMaxQuantity === rightMaxQuantity || (!leftMaxQuantity && !rightMaxQuantity))
-            return 0;
-        if (!leftMaxQuantity)
-            return 1;
-        if (!rightMaxQuantity)
-            return -1;
-        return leftMaxQuantity - rightMaxQuantity;
-    })
+    return ((params.product?.commerce?.pricing || [])
+        .toSorted((left, right) => (left.minQuantity ?? 0) - (right.minQuantity ?? 0))
         .filter((priceLevel) => {
         if (!params.currencyCode)
             return priceLevel.countryCode === params.countryCode;
-        return (priceLevel.currencyCode === params.currencyCode && priceLevel.countryCode === params.countryCode);
-    });
+        return (priceLevel.currencyCode === params.currencyCode &&
+            priceLevel.countryCode === params.countryCode);
+    }));
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-products",
   "description": "Product catalog management module for the Unchained Engine",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.4",
   "main": "lib/products-index.js",
   "types": "lib/products-index.d.ts",
   "type": "module",
@@ -36,10 +36,12 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@unchainedshop/events": "^5.0.0-alpha.1",
+    "@unchainedshop/logger": "^5.0.0-alpha.1",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.1",
     "@unchainedshop/utils": "^5.0.0-alpha.1"
   },
   "devDependencies": {
-    "@types/node": "^25.0.0",
-    "typescript": "^5.8.3"
+    "@types/node": "^26.2.0",
+    "typescript": "^6.0.3"
   }
 }