@unchainedshop/core-products 4.8.29 → 4.8.31

package/lib/db/ProductVariationsCollection.d.ts

@@ -11,6 +11,7 @@ export type ProductVariation = {
     options: string[];
     productId: string;
     type: string;
+    sortKey?: number;
 } & TimestampFields;
 export type ProductVariationText = {
     _id: string;

package/lib/db/ProductVariationsCollection.js

@@ -6,7 +6,7 @@ export const ProductVariationType = {
 export const ProductVariationsCollection = async (db) => {
     const ProductVariations = db.collection('product_variations');
     const ProductVariationTexts = db.collection('product_variation_texts');
-    await buildDbIndexes(ProductVariations, [{ index: { productId: 1 } }]);
+    await buildDbIndexes(ProductVariations, [{ index: { productId: 1, sortKey: 1 } }]);
     await buildDbIndexes(ProductVariationTexts, [
         { index: { productVariationId: 1 } },
         { index: { locale: 1, productVariationId: 1 } },

package/lib/module/configureProductVariationsModule.d.ts

@@ -17,7 +17,7 @@ export declare const configureProductVariationsModule: ({ db }: ModuleInput<Reco
         limit?: number;
         offset?: number;
     }, options?: mongodb.FindOptions) => Promise<ProductVariation[]>;
-    create: ({ type, ...doc }: Omit<ProductVariation, "_id" | "created"> & Pick<Partial<ProductVariation>, "_id" | "created"> & {
+    create: ({ type, sortKey, ...doc }: Omit<ProductVariation, "_id" | "created"> & Pick<Partial<ProductVariation>, "_id" | "created"> & {
         locale?: string;
         title?: string;
     }) => Promise<ProductVariation>;

package/lib/module/configureProductVariationsModule.js

@@ -70,16 +70,22 @@ export const configureProductVariationsModule = async ({ db }) => {
             const variations = ProductVariations.find(selector, {
                 skip: offset,
                 limit,
+                sort: { sortKey: 1 },
                 ...options,
             });
             return variations.toArray();
         },
-        create: async ({ type, ...doc }) => {
+        create: async ({ type, sortKey, ...doc }) => {
+            if (sortKey === undefined || sortKey === null) {
+                const lastProductVariation = (await ProductVariations.findOne({ productId: doc.productId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
+                sortKey = (lastProductVariation.sortKey || 0) + 1;
+            }
             const { insertedId: productVariationId } = await ProductVariations.insertOne({
                 _id: generateDbObjectId(),
                 created: new Date(),
                 type: ProductVariationType[type],
                 ...doc,
+                sortKey,
             });
             const productVariation = (await ProductVariations.findOne(generateDbFilterById(productVariationId), {}));
             await emit('PRODUCT_CREATE_VARIATION', {

package/lib/module/configureProductsModule.d.ts

@@ -222,7 +222,7 @@ export declare const configureProductsModule: (moduleInput: ModuleInput<Products
             limit?: number;
             offset?: number;
         }, options?: mongodb.FindOptions) => Promise<import("../products-index.ts").ProductVariation[]>;
-        create: ({ type, ...doc }: Omit<import("../products-index.ts").ProductVariation, "_id" | "created"> & Pick<Partial<import("../products-index.ts").ProductVariation>, "_id" | "created"> & {
+        create: ({ type, sortKey, ...doc }: Omit<import("../products-index.ts").ProductVariation, "_id" | "created"> & Pick<Partial<import("../products-index.ts").ProductVariation>, "_id" | "created"> & {
             locale?: string;
             title?: string;
         }) => Promise<import("../products-index.ts").ProductVariation>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-products",
   "description": "Product catalog management module for the Unchained Engine",
-  "version": "4.8.29",
+  "version": "4.8.31",
   "main": "lib/products-index.js",
   "types": "lib/products-index.d.ts",
   "type": "module",
@@ -41,6 +41,6 @@
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.3"
   }
 }

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

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

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

@@ -1,54 +0,0 @@
-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)`);
-            }
-        },
-    });
-}