@chevre/domain 25.2.0-alpha.10 → 25.2.0-alpha.11

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -214,19 +214,19 @@ const indexes = [
                 alternateName: { $exists: true }
             }
         }
+    ],
+    // add unique index(dev)(2025-03-28~)
+    // add unique index(test,prod)(2026-07-08~)
+    [
+        { identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier',
+            partialFilterExpression: {
+                identifier: { $exists: true }
+            }
+        }
     ]
-    // eslint-disable-next-line no-warning-comments
-    // TODO add unique index(2025-03-28~)
-    // [
-    //     { identifier: 1 },
-    //     {
-    //         unique: true,
-    //         name: 'uniqueIdentifier',
-    //         partialFilterExpression: {
-    //             identifier: { $exists: true }
-    //         }
-    //     }
-    // ]
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -127,6 +127,19 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     setCustomerByIdentifier(params: Pick<IOrderInTransaction, 'project' | 'identifier'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 注文ドキュメントに確認番号を保管する
+     * 確認番号未発行の場合のみ保管される
+     */
+    saveConfirmationNumberIfNotExist(params: {
+        identifier: string;
+        confirmationNumber: string;
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
+    }): Promise<void>;
     deleteByIdentifier(params: {
         identifier: string;
     }): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/orderInTransaction.js

@@ -241,6 +241,23 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }
         return result;
     }
+    /**
+     * 注文ドキュメントに確認番号を保管する
+     * 確認番号未発行の場合のみ保管される
+     */
+    async saveConfirmationNumberIfNotExist(params, options) {
+        const { identifier, confirmationNumber } = params;
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
+        if (typeof confirmationNumber !== 'string' || confirmationNumber === '') {
+            throw new factory_1.factory.errors.ArgumentNull('confirmationNumber');
+        }
+        await this.orderModel.updateOne({
+            identifier: { $eq: identifier },
+            confirmationNumber: { $exists: false },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
+        }, { $set: { confirmationNumber } })
+            .exec();
+    }
     async deleteByIdentifier(params) {
         return this.orderModel.deleteOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -125,6 +125,7 @@ export declare class PlaceOrderRepo {
         object: {
             orderDate: Date;
             orderNumber: string;
+            confirmationNumber: string;
         };
         result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
         potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;

package/lib/chevre/repo/transaction/placeOrder.js

@@ -441,6 +441,7 @@ class PlaceOrderRepo {
             endDate,
             'object.orderDate': params.object.orderDate, // add(2026-06-15~)
             'object.orderNumber': params.object.orderNumber, // add(2026-06-27~)
+            'object.confirmationNumber': params.object.confirmationNumber, // add(2026-07-08~)
             result: params.result, // resultを更新
             potentialActions: params.potentialActions // resultを更新
         }, {

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -58,7 +58,7 @@ function processTransactionNotInProgress(params) {
 function confirm(params, options) {
     return async (repos) => {
         // 確認番号を事前発行
-        await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+        const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
             status: { $in: [factory_1.factory.transactionStatusType.Confirmed, factory_1.factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
@@ -142,7 +142,9 @@ function confirm(params, options) {
         const seller = (0, factory_2.createSeller)({ transaction });
         const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
-            orderNumber, transaction,
+            orderNumber,
+            confirmationNumber,
+            transaction,
             acceptPayActions,
             authorizePaymentActions, authorizeEventServiceOfferActions,
             acceptedOffers, payTransactions, customer,
@@ -178,7 +180,8 @@ function confirm(params, options) {
                 id: transaction.id,
                 object: {
                     orderDate: params.result.order.orderDate,
-                    orderNumber
+                    orderNumber,
+                    confirmationNumber: placingOrder.confirmationNumber
                 },
                 result: result,
                 potentialActions: potentialActions
@@ -341,8 +344,10 @@ function createResult(params, options) {
         result: params.result
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
-    // 確認番号を発行
-    const { confirmationNumber } = createConfirmationNumber({ transaction });
+    // 取引のobjectへの依存を排除する(2026-07-08~)
+    const { confirmationNumber } = params;
+    // // 確認番号を発行
+    // const { confirmationNumber } = createConfirmationNumber({ transaction });
     // 注文作成
     const orderAsResult = (0, result_1.createOrderAsResult)({
         orderNumber: params.orderNumber,
@@ -433,14 +438,3 @@ function searchAuthorizeActions(params) {
         return authorizeActions;
     };
 }
-function createConfirmationNumber(params) {
-    const confirmationNumber = params.transaction.object.confirmationNumber;
-    // 取引に確認番号が保管されていなければ、確認番号を発行
-    if (typeof confirmationNumber !== 'string') {
-        // 事前に発行済なはずなので、ありえないフロー
-        throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
-    }
-    return {
-        confirmationNumber,
-    };
-}

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts

@@ -1,4 +1,5 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 /**
@@ -18,5 +19,6 @@ declare function publishConfirmationNumberIfNotExist(params: {
 }): (repos: {
     placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
+    orderInTransaction: OrderInTransactionRepo;
 }) => Promise<string>;
 export { publishConfirmationNumberIfNotExist };

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js

@@ -23,6 +23,11 @@ function publishConfirmationNumberIfNotExist(params) {
             status: { $in: params.status.$in },
             confirmationNumber
         });
+        // 注文ドキュメントにも保管(2026-07-08~)
+        await repos.orderInTransaction.saveConfirmationNumberIfNotExist({
+            identifier: params.id,
+            confirmationNumber
+        }, { onlyPlaceOrder: true });
         // 確認番号を取引から再取得
         confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
             id: params.id,

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.10"
+  "version": "25.2.0-alpha.11"
 }