@unchainedshop/core-orders 4.8.17 → 4.8.18

package/lib/migrations/20260625120000-normalize-contact-phone.d.ts

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

package/lib/migrations/20260625120000-normalize-contact-phone.js

@@ -0,0 +1,27 @@
+import { normalizePhoneNumber } from '@unchainedshop/utils';
+import { OrdersCollection } from "../orders-index.js";
+export default function normalizeContactPhone(repository) {
+    repository?.register({
+        id: 20260625120000,
+        name: 'Normalize order.contact.telNumber to E.164 format',
+        up: async ({ logger }) => {
+            const Orders = await OrdersCollection(repository.db);
+            const orders = await Orders.find({ 'contact.telNumber': { $exists: true, $nin: [null, ''] } }, { projection: { _id: true, contact: true, billingAddress: true, countryCode: true } }).toArray();
+            let changed = 0;
+            let skipped = 0;
+            for (const order of orders) {
+                const current = order.contact?.telNumber;
+                const defaultCountry = order.billingAddress?.countryCode || order.countryCode;
+                const normalized = normalizePhoneNumber(current, defaultCountry);
+                if (!normalized || normalized === current) {
+                    if (!normalized)
+                        skipped += 1;
+                    continue;
+                }
+                await Orders.updateOne({ _id: order._id }, { $set: { 'contact.telNumber': normalized } });
+                changed += 1;
+            }
+            logger?.info(`Normalize order.contact.telNumber: ${changed} updated, ${skipped} left unchanged (unparseable)`);
+        },
+    });
+}

package/lib/module/configureOrdersModule-mutations.js

@@ -1,4 +1,5 @@
 import { emit, registerEvents } from '@unchainedshop/events';
+import { normalizePhoneNumber } from '@unchainedshop/utils';
 import { generateDbFilterById, generateDbObjectId, mongodb, } from '@unchainedshop/mongodb';
 import { OrderStatus } from "../db/OrdersCollection.js";
 const ORDER_EVENTS = [
@@ -10,6 +11,14 @@ const ORDER_EVENTS = [
 ];
 export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
     registerEvents(ORDER_EVENTS);
+    const normalizeContactPhone = (contact, defaultCountry) => {
+        if (!contact?.telNumber)
+            return contact;
+        return {
+            ...contact,
+            telNumber: normalizePhoneNumber(contact.telNumber, defaultCountry) || contact.telNumber,
+        };
+    };
     return {
         create: async ({ userId, orderNumber, currencyCode, countryCode, billingAddress, contact, context, }) => {
             const { insertedId: orderId } = await Orders.insertOne({
@@ -17,7 +26,7 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                 created: new Date(),
                 status: null,
                 billingAddress,
-                contact,
+                contact: normalizeContactPhone(contact, billingAddress?.countryCode || countryCode),
                 userId,
                 currencyCode,
                 countryCode,
@@ -66,9 +75,13 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
         },
         updateContact: async (orderId, contact) => {
             const selector = generateDbFilterById(orderId);
+            const existing = await Orders.findOne(selector, {
+                projection: { billingAddress: true, countryCode: true },
+            });
+            const defaultCountry = existing?.billingAddress?.countryCode || existing?.countryCode;
             const order = await Orders.findOneAndUpdate(selector, {
                 $set: {
-                    contact,
+                    contact: normalizeContactPhone(contact, defaultCountry),
                     updated: new Date(),
                 },
             }, { returnDocument: 'after' });
@@ -113,7 +126,14 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                 $set.billingAddress = updates.billingAddress;
             }
             if (updates.contact) {
-                $set.contact = updates.contact;
+                let defaultCountry = updates.billingAddress?.countryCode;
+                if (!defaultCountry && updates.contact.telNumber) {
+                    const existing = await Orders.findOne(generateDbFilterById(orderId), {
+                        projection: { billingAddress: true, countryCode: true },
+                    });
+                    defaultCountry = existing?.billingAddress?.countryCode || existing?.countryCode;
+                }
+                $set.contact = normalizeContactPhone(updates.contact, defaultCountry);
             }
             if (updates.meta && Object.keys(updates.meta).length > 0) {
                 const contextSetters = Object.fromEntries(Object.entries(updates.meta).map(([key, value]) => [`context.${key}`, value]));

package/lib/module/configureOrdersModule.js

@@ -14,6 +14,7 @@ import { configureOrderModuleMutations } from "./configureOrdersModule-mutations
 import { configureOrdersModuleQueries } from "./configureOrdersModule-queries.js";
 import { emit, registerEvents } from '@unchainedshop/events';
 import renameCurrencyCode from "../migrations/20250502111800-currency-code.js";
+import normalizeOrderContactPhone from "../migrations/20260625120000-normalize-contact-phone.js";
 const ORDER_EVENTS = [
     'ORDER_CHECKOUT',
     'ORDER_CONFIRMED',
@@ -22,6 +23,7 @@ const ORDER_EVENTS = [
 ];
 export const configureOrdersModule = async ({ db, migrationRepository, options: orderOptions = {}, }) => {
     renameCurrencyCode(migrationRepository);
+    normalizeOrderContactPhone(migrationRepository);
     registerEvents(ORDER_EVENTS);
     ordersSettings.configureSettings(orderOptions);
     const Orders = await OrdersCollection(db);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-orders",
   "description": "Order management module for the Unchained Engine",
-  "version": "4.8.17",
+  "version": "4.8.18",
   "main": "lib/orders-index.js",
   "types": "lib/orders-index.d.ts",
   "type": "module",