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

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

@@ -11,6 +11,7 @@ export type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'pr
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
     seller?: factory.order.ISeller;
+    confirmationNumber?: string;
 };
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
@@ -127,6 +128,12 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     setCustomerByIdentifier(params: Pick<IOrderInTransaction, 'project' | 'identifier'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 確認番号を参照する
+     */
+    findConfirmationNumberByIdentifier(params: {
+        identifier: string;
+    }): Promise<string | undefined>;
     /**
      * 注文ドキュメントに確認番号を保管する
      * 確認番号未発行の場合のみ保管される
@@ -139,7 +146,7 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
          * 注文取引タイプのドキュメントのみを参照対象にするかどうか
          */
         onlyPlaceOrder: boolean;
-    }): Promise<void>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     deleteByIdentifier(params: {
         identifier: string;
     }): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/orderInTransaction.js

@@ -241,6 +241,22 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }
         return result;
     }
+    /**
+     * 確認番号を参照する
+     */
+    async findConfirmationNumberByIdentifier(params) {
+        const { identifier } = params;
+        const doc = await this.orderModel.findOne({
+            identifier: { $eq: identifier },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
+        }, { confirmationNumber: 1 })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        return doc.confirmationNumber;
+    }
     /**
      * 注文ドキュメントに確認番号を保管する
      * 確認番号未発行の場合のみ保管される
@@ -251,7 +267,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (typeof confirmationNumber !== 'string' || confirmationNumber === '') {
             throw new factory_1.factory.errors.ArgumentNull('confirmationNumber');
         }
-        await this.orderModel.updateOne({
+        return this.orderModel.updateOne({
             identifier: { $eq: identifier },
             confirmationNumber: { $exists: false },
             ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })

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

@@ -43,15 +43,6 @@ export declare class PlaceOrderRepo {
     findInProgressPaymentMethodId(params: {
         id: string;
     }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
-    /**
-     * 取引の確認番号を検索する
-     */
-    findInProgressConfirmationNumberById(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-    }): Promise<string | undefined>;
     /**
      * 取引期限変更
      */
@@ -60,17 +51,6 @@ export declare class PlaceOrderRepo {
         id: string;
         expires: Date;
     }): Promise<void>;
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    updateObject(params: {
-        typeOf: factory.transactionType.PlaceOrder;
-        id: string;
-        object?: {
-            name?: string;
-        };
-    }): Promise<void>;
     /**
      * 特定の進行中取引を更新する(汎用)
      */
@@ -91,13 +71,6 @@ export declare class PlaceOrderRepo {
     }): Promise<{
         modifiedCount: number;
     }>;
-    saveConfirmationNumberIfNotExist(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-        confirmationNumber: string;
-    }): Promise<void>;
     /**
      * 進行中の注文取引を取得する
      */

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

@@ -226,22 +226,31 @@ class PlaceOrderRepo {
     //     }
     //     return doc.object.orderNumber;
     // }
-    /**
-     * 取引の確認番号を検索する
-     */
-    async findInProgressConfirmationNumberById(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            status: { $in: params.status.$in }
-        }, { 'object.confirmationNumber': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
-        }
-        return doc.object.confirmationNumber;
-    }
+    // /**
+    //  * 取引の確認番号を検索する
+    //  */
+    // public async findInProgressConfirmationNumberById(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    // }): Promise<string | undefined> {
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             status: { $in: params.status.$in }
+    //         },
+    //         { 'object.confirmationNumber': 1 }
+    //     )
+    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'confirmationNumber'> }>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`
+    //         );
+    //     }
+    //     return doc.object.confirmationNumber;
+    // }
     /**
      * 取引期限変更
      */
@@ -263,28 +272,41 @@ class PlaceOrderRepo {
             throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
     }
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    async updateObject(params) {
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, {
-            $set: {
-                ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
-            }
-        }, {
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
-        }
-    }
+    // /**
+    //  * 取引オブジェクトを更新
+    //  * 注文名称など
+    //  */
+    // public async updateObject(params: {
+    //     typeOf: factory.transactionType.PlaceOrder;
+    //     id: string;
+    //     object?: {
+    //         name?: string;
+    //     };
+    // }): Promise<void> {
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         {
+    //             $set: {
+    //                 ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
+    //             }
+    //         },
+    //         {
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    // }
     /**
      * 特定の進行中取引を更新する(汎用)
      */
@@ -316,15 +338,22 @@ class PlaceOrderRepo {
             .exec();
         return { modifiedCount: result.modifiedCount };
     }
-    async saveConfirmationNumberIfNotExist(params) {
-        await this.transactionModel.updateOne({
-            _id: { $eq: params.id },
-            // status: { $eq: factory.transactionStatusType.InProgress },
-            status: { $in: params.status.$in },
-            'object.confirmationNumber': { $exists: false }
-        }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
-            .exec();
-    }
+    // public async saveConfirmationNumberIfNotExist(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    //     confirmationNumber: string;
+    // }): Promise<void> {
+    //     await this.transactionModel.updateOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             // status: { $eq: factory.transactionStatusType.InProgress },
+    //             status: { $in: params.status.$in },
+    //             'object.confirmationNumber': { $exists: false }
+    //         },
+    //         { $set: { 'object.confirmationNumber': params.confirmationNumber } }
+    //     )
+    //         .exec();
+    // }
     /**
      * 進行中の注文取引を取得する
      */

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
-const factory_1 = require("../../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
@@ -12,7 +11,7 @@ function fixOrderAsNeeded(params) {
         // if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
         const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.purpose.id,
-            status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
+            // status: { $in: [factory.transactionStatusType.InProgress] },
             object: { orderDate }
         })(repos);
         // }

package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.d.ts

@@ -0,0 +1,15 @@
+import { factory } from '../../../factory';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
+type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
+export declare function deletePayTransactionsByPlaceOrder(params: {
+    authorizeActions: (IAuthorizeOfferAction | IAuthorizePaymentAction)[];
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'project'>;
+}): (repos: {
+    assetTransaction: AssetTransactionRepo;
+}) => Promise<{
+    deletePayTransactionResult: any;
+    deleteRefundResult: any;
+    payTransactionNumbers: string[];
+}>;
+export {};

package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deletePayTransactionsByPlaceOrder = deletePayTransactionsByPlaceOrder;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const factory_1 = require("../../../factory");
+function deletePayTransactionsByPlaceOrder(params) {
+    return async (repos) => {
+        let deletePayTransactionResult;
+        let deleteRefundResult;
+        const authorizeActions = params.authorizeActions;
+        // 決済取引番号を抽出
+        const authorizePaymentActions = authorizeActions
+            .filter((a) => {
+            return a.object.typeOf === factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment
+                && typeof a.object?.paymentMethodId === 'string'
+                && a.object.paymentMethodId.length > 0;
+        });
+        const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
+        if (payTransactionNumbers.length > 0) {
+            // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: payTransactionNumbers,
+                typeOf: factory_1.factory.assetTransactionType.Pay
+            });
+            deletePayTransactionResult = {
+                n: deleteAssetTransactionsResult?.n,
+                ok: deleteAssetTransactionsResult?.ok,
+                deletedCount: deleteAssetTransactionsResult?.deletedCount
+            };
+            // 返金取引も削除(2023-05-19~)
+            const refundTransactions = await repos.assetTransaction.search({
+                typeOf: factory_1.factory.assetTransactionType.Refund,
+                object: { paymentMethodId: { $in: payTransactionNumbers } }
+            }, ['transactionNumber'], []);
+            if (refundTransactions.length > 0) {
+                const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
+                    project: { id: params.transaction.project.id },
+                    transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
+                    typeOf: factory_1.factory.assetTransactionType.Refund
+                });
+                deleteRefundResult = {
+                    n: deleteRefundAssetTransactionsResult?.n,
+                    ok: deleteRefundAssetTransactionsResult?.ok,
+                    deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
+                };
+            }
+        }
+        return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
+    };
+}

package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.d.ts

@@ -0,0 +1,23 @@
+import { factory } from '../../../factory';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { ReservationRepo } from '../../../repo/reservation';
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
+type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
+interface IDeleteResult {
+    n?: number;
+    ok?: number;
+    deletedCount?: number;
+}
+export declare function deleteReservationsByPlaceOrder(params: {
+    authorizeActions: (IAuthorizeOfferAction | IAuthorizePaymentAction)[];
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'project'>;
+}): (repos: {
+    assetTransaction: AssetTransactionRepo;
+    reservation: ReservationRepo;
+}) => Promise<{
+    deleteResult?: IDeleteResult;
+    deleteReserveTransactionResult?: IDeleteResult;
+    deleteCancelReservationTransactionResult?: IDeleteResult;
+    reserveTransactionNumbers: string[];
+}>;
+export {};

package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteReservationsByPlaceOrder = deleteReservationsByPlaceOrder;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const factory_1 = require("../../../factory");
+function deleteReservationsByPlaceOrder(params) {
+    return async (repos) => {
+        let deleteResult;
+        let deleteReserveTransactionResult;
+        let deleteCancelReservationTransactionResult;
+        const authorizeActions = params.authorizeActions;
+        // 予約取引番号を抽出
+        const authorizeReservationOfferActions = authorizeActions
+            .filter((a) => {
+            return a.object.typeOf === factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation
+                && a.instrument?.transactionNumber === 'string'
+                && a.instrument.transactionNumber.length > 0;
+        });
+        const reserveTransactionNumbers = authorizeReservationOfferActions
+            .map((a) => String(a.instrument?.transactionNumber));
+        if (reserveTransactionNumbers.length > 0) {
+            // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
+            const deleteReservationsResult = await repos.reservation.deleteByReservationNumbers({
+                project: { id: params.transaction.project.id },
+                reservationNumbers: reserveTransactionNumbers
+            });
+            deleteResult = {
+                n: deleteReservationsResult?.n,
+                ok: deleteReservationsResult?.ok,
+                deletedCount: deleteReservationsResult?.deletedCount
+            };
+            // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: reserveTransactionNumbers,
+                typeOf: factory_1.factory.assetTransactionType.Reserve
+            });
+            deleteReserveTransactionResult = {
+                n: deleteAssetTransactionsResult?.n,
+                ok: deleteAssetTransactionsResult?.ok,
+                deletedCount: deleteAssetTransactionsResult?.deletedCount
+            };
+            // 予約番号で予約取消取引を検索
+            const deletingCancelReservationTransactions = await repos.assetTransaction.search({
+                project: { id: { $eq: params.transaction.project.id } },
+                object: { reservationNumber: { $in: reserveTransactionNumbers } },
+                typeOf: factory_1.factory.assetTransactionType.CancelReservation
+            }, ['transactionNumber'], []);
+            if (deletingCancelReservationTransactions.length > 0) {
+                // 予約取消取引も削除(2024-04-18~)
+                const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({
+                    project: { id: params.transaction.project.id },
+                    transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
+                    typeOf: factory_1.factory.assetTransactionType.CancelReservation
+                });
+                deleteCancelReservationTransactionResult = {
+                    n: deleteCancelReservationResult?.n,
+                    ok: deleteCancelReservationResult?.ok,
+                    deletedCount: deleteCancelReservationResult?.deletedCount
+                };
+            }
+        }
+        return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
+    };
+}

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -4,6 +4,8 @@ exports.deleteTransaction = deleteTransaction;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const factory_1 = require("../../factory");
 const deleteOrder_1 = require("../order/deleteOrder");
+const deletePayTransactionsByPlaceOrder_1 = require("./deleteTransaction/deletePayTransactionsByPlaceOrder");
+const deleteReservationsByPlaceOrder_1 = require("./deleteTransaction/deleteReservationsByPlaceOrder");
 /**
  * 取引に関わるリソースを削除する
  * 冪等性を確保すること
@@ -30,7 +32,6 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('object.id');
         }
-        // let deletingOrderNumberByTask: string | undefined;
         let transaction;
         if (params.object.typeOf === factory_1.factory.transactionType.PlaceOrder) {
             transaction = (await repos.placeOrder.findPlaceOrderTransactions({
@@ -38,7 +39,6 @@ function deleteTransactionById(params) {
                 typeOf: params.object.typeOf,
                 inclusion: ['typeOf', 'project', 'status']
             })).shift();
-            // deletingOrderNumberByTask = params.object.object.orderNumber;
         }
         else if (params.object.typeOf === factory_1.factory.transactionType.ReturnOrder) {
             transaction = (await repos.returnOrder.findReturnOrderTransactions({
@@ -70,7 +70,6 @@ function deleteTransactionById(params) {
         let deleteCancelReservationTransactionResult;
         let deletedReservationNumbers = [];
         let deleteActionResult;
-        // let deleteMessagessResult: IDeleteResult | undefined;
         const action = await repos.action.start(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
@@ -90,11 +89,6 @@ function deleteTransactionById(params) {
                             break;
                         case factory_1.factory.transactionStatusType.Confirmed: {
                             // identifierによる削除に変更(2026-06-28~)
-                            // if (typeof deletingOrderNumberByTask === 'string') {
-                            //     await deleteOrder({
-                            //         object: { orderNumber: deletingOrderNumberByTask }
-                            //     })(repos);
-                            // }
                             await (0, deleteOrder_1.deleteOrder)({
                                 object: { identifier: transaction.id }
                             })(repos);
@@ -104,12 +98,12 @@ function deleteTransactionById(params) {
                             throw new factory_1.factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
                     // 決済取引を削除
-                    const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    const deletePayTransactionsByPlaceOrderResult = await (0, deletePayTransactionsByPlaceOrder_1.deletePayTransactionsByPlaceOrder)({ authorizeActions, transaction })(repos);
                     deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;
                     deleteRefundResult = deletePayTransactionsByPlaceOrderResult.deleteRefundResult;
                     payTransactionNumbers = deletePayTransactionsByPlaceOrderResult.payTransactionNumbers;
                     // 取引上での予約を削除
-                    const deleteReservationsByPlaceOrderResult = await deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    const deleteReservationsByPlaceOrderResult = await (0, deleteReservationsByPlaceOrder_1.deleteReservationsByPlaceOrder)({ authorizeActions, transaction })(repos);
                     deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
                     deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
                     deleteCancelReservationTransactionResult =
@@ -121,10 +115,12 @@ function deleteTransactionById(params) {
                         purpose: { id: transaction.id, typeOf: transactionTypeOf },
                         typeOf: {
                             $in: [
-                                factory_1.factory.actionType.AuthorizeAction,
-                                factory_1.factory.actionType.CheckAction,
-                                factory_1.factory.actionType.InformAction,
-                                factory_1.factory.actionType.OrderAction
+                                factory_1.factory.actionType.AcceptAction, // オファー採用、決済採用
+                                factory_1.factory.actionType.AuthorizeAction, // オファー承認、決済承認
+                                factory_1.factory.actionType.CheckAction, // 決済カード認証
+                                // factory.actionType.InformAction, // 通知は特になし
+                                factory_1.factory.actionType.OrderAction, // 注文
+                                factory_1.factory.actionType.RefundAction // 決済採用返金
                             ]
                         }
                     });
@@ -171,138 +167,3 @@ function deleteTransactionById(params) {
         await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }
-function deleteReservationsByPlaceOrder(params) {
-    return async (repos) => {
-        let deleteResult;
-        let deleteReserveTransactionResult;
-        let deleteCancelReservationTransactionResult;
-        const authorizeActions = params.authorizeActions;
-        // 予約取引番号を抽出
-        const authorizeReservationOfferActions = authorizeActions
-            .filter((a) => {
-            const pendingTransactionNumber = a.instrument?.transactionNumber;
-            return a.object.typeOf === factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation
-                && typeof pendingTransactionNumber === 'string'
-                && pendingTransactionNumber.length > 0;
-        });
-        const reserveTransactionNumbers = authorizeReservationOfferActions
-            .map((a) => String(a.instrument?.transactionNumber));
-        if (reserveTransactionNumbers.length > 0) {
-            // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
-            const deleteReservationsResult = await repos.reservation.deleteByReservationNumbers({
-                project: { id: params.transaction.project.id },
-                reservationNumbers: reserveTransactionNumbers
-            });
-            deleteResult = {
-                n: deleteReservationsResult?.n,
-                ok: deleteReservationsResult?.ok,
-                deletedCount: deleteReservationsResult?.deletedCount
-            };
-            // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
-            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
-                project: { id: params.transaction.project.id },
-                transactionNumbers: reserveTransactionNumbers,
-                typeOf: factory_1.factory.assetTransactionType.Reserve
-            });
-            deleteReserveTransactionResult = {
-                n: deleteAssetTransactionsResult?.n,
-                ok: deleteAssetTransactionsResult?.ok,
-                deletedCount: deleteAssetTransactionsResult?.deletedCount
-            };
-            // 予約番号で予約取消取引を検索
-            const deletingCancelReservationTransactions = await repos.assetTransaction.search({
-                project: { id: { $eq: params.transaction.project.id } },
-                object: { reservationNumber: { $in: reserveTransactionNumbers } },
-                typeOf: factory_1.factory.assetTransactionType.CancelReservation
-            }, ['transactionNumber'], []);
-            if (deletingCancelReservationTransactions.length > 0) {
-                // 予約取消取引も削除(2024-04-18~)
-                const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({
-                    project: { id: params.transaction.project.id },
-                    transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
-                    typeOf: factory_1.factory.assetTransactionType.CancelReservation
-                });
-                deleteCancelReservationTransactionResult = {
-                    n: deleteCancelReservationResult?.n,
-                    ok: deleteCancelReservationResult?.ok,
-                    deletedCount: deleteCancelReservationResult?.deletedCount
-                };
-            }
-        }
-        return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
-    };
-}
-function deletePayTransactionsByPlaceOrder(params) {
-    return async (repos) => {
-        let deletePayTransactionResult;
-        let deleteRefundResult;
-        const authorizeActions = params.authorizeActions;
-        // 決済取引番号を抽出
-        const authorizePaymentActions = authorizeActions
-            .filter((a) => {
-            const pendingTransactionNumber = a.object?.paymentMethodId;
-            return a.object.typeOf === factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment
-                && typeof pendingTransactionNumber === 'string'
-                && pendingTransactionNumber.length > 0;
-        });
-        const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
-        if (payTransactionNumbers.length > 0) {
-            // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
-            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
-                project: { id: params.transaction.project.id },
-                transactionNumbers: payTransactionNumbers,
-                typeOf: factory_1.factory.assetTransactionType.Pay
-            });
-            deletePayTransactionResult = {
-                n: deleteAssetTransactionsResult?.n,
-                ok: deleteAssetTransactionsResult?.ok,
-                deletedCount: deleteAssetTransactionsResult?.deletedCount
-            };
-            // 返金取引も削除(2023-05-19~)
-            const refundTransactions = await repos.assetTransaction.search({
-                typeOf: factory_1.factory.assetTransactionType.Refund,
-                object: { paymentMethodId: { $in: payTransactionNumbers } }
-            }, ['transactionNumber'], []);
-            if (refundTransactions.length > 0) {
-                const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
-                    project: { id: params.transaction.project.id },
-                    transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
-                    typeOf: factory_1.factory.assetTransactionType.Refund
-                });
-                deleteRefundResult = {
-                    n: deleteRefundAssetTransactionsResult?.n,
-                    ok: deleteRefundAssetTransactionsResult?.ok,
-                    deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
-                };
-            }
-        }
-        return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
-    };
-}
-// function deleteMessagesByPlaceOrder(params: {
-//     transaction: factory.task.deleteTransaction.IObject;
-// }) {
-//     return async (repos: {
-//         message: MessageRepo;
-//     }): Promise<{
-//         deleteResult?: IDeleteResult;
-//     }> => {
-//         let deleteResult: IDeleteResult | undefined;
-//         if (params.transaction.typeOf === factory.transactionType.PlaceOrder
-//             && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-//             const orderNumber = params.transaction.object.orderNumber;
-//             if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-//                 const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
-//                     project: { id: params.transaction.project.id },
-//                     mainEntity: { orderNumber }
-//                 });
-//                 deleteResult = {
-//                     n: deleteReservationsResult?.n,
-//                     ok: deleteReservationsResult?.ok,
-//                     deletedCount: deleteReservationsResult?.deletedCount
-//                 };
-//             }
-//         }
-//         return { deleteResult };
-//     };
-// }

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

@@ -60,7 +60,7 @@ function confirm(params, options) {
         // 確認番号を事前発行
         const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
-            status: { $in: [factory_1.factory.transactionStatusType.Confirmed, factory_1.factory.transactionStatusType.InProgress] },
+            // status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);

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

@@ -1,23 +1,18 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { factory } from '../../../factory';
 /**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
+ * 未発行であれば、確認番号を発行して注文ドキュメントに保管する
+ * reimplement using OrderInTransactionRepo(2026-07-09~)
  */
 declare function publishConfirmationNumberIfNotExist(params: {
     /**
      * 取引ID
      */
     id: string;
-    status: {
-        $in: factory.transactionStatusType[];
-    };
     object: {
         orderDate: Date;
     };
 }): (repos: {
-    placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
     orderInTransaction: OrderInTransactionRepo;
 }) => Promise<string>;

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

@@ -1,41 +1,54 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
+const debug_1 = __importDefault(require("debug"));
+// import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 const factory_1 = require("../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:publishConfirmationNumberIfNotExist');
 /**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
+ * 未発行であれば、確認番号を発行して注文ドキュメントに保管する
+ * reimplement using OrderInTransactionRepo(2026-07-09~)
  */
 function publishConfirmationNumberIfNotExist(params) {
     return async (repos) => {
-        let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
-            id: params.id,
-            status: { $in: params.status.$in }
-        });
+        // let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
+        //     id: params.id,
+        //     status: { $in: params.status.$in }
+        // });
+        let confirmationNumber = await repos.orderInTransaction.findConfirmationNumberByIdentifier({ identifier: params.id });
+        debug('already exists?', confirmationNumber);
         // すでに発行済であれば何もしない
         if (typeof confirmationNumber === 'string') {
             return confirmationNumber;
         }
         // 確認番号を発行
         confirmationNumber = await repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
-        // 取引に存在しなければ保管
-        await repos.placeOrder.saveConfirmationNumberIfNotExist({
-            id: params.id,
-            status: { $in: params.status.$in },
-            confirmationNumber
-        });
+        debug('saving new confirmationNumber...', confirmationNumber);
+        // // 取引に存在しなければ保管
+        // await repos.placeOrder.saveConfirmationNumberIfNotExist({
+        //     id: params.id,
+        //     status: { $in: params.status.$in },
+        //     confirmationNumber
+        // });
         // 注文ドキュメントにも保管(2026-07-08~)
-        await repos.orderInTransaction.saveConfirmationNumberIfNotExist({
+        const saveResult = await repos.orderInTransaction.saveConfirmationNumberIfNotExist({
             identifier: params.id,
             confirmationNumber
         }, { onlyPlaceOrder: true });
+        debug('saveConfirmationNumberIfNotExist result:', JSON.stringify(saveResult));
         // 確認番号を取引から再取得
-        confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
-            id: params.id,
-            status: { $in: params.status.$in }
-        });
+        // confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
+        //     id: params.id,
+        //     status: { $in: params.status.$in }
+        // });
+        confirmationNumber = await repos.orderInTransaction.findConfirmationNumberByIdentifier({ identifier: params.id });
+        debug('confirmationNumber should exist:', confirmationNumber);
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
         if (typeof confirmationNumber !== 'string') {
-            throw new factory_1.factory.errors.Internal('transaction.object.confirmationNumber not found');
+            throw new factory_1.factory.errors.Internal('orderInTransaction.confirmationNumber not found');
         }
         return confirmationNumber;
     };

package/package.json

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