@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.40

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -50,11 +50,10 @@ function processOrder(params) {
             // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
-        if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
-            await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
-        }
-        else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
-            || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+        // if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
+        //     await createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+        // } else 
+        if (params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
             // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
             await createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
         }
@@ -115,38 +114,56 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         }));
     };
 }
-function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
-    return async (repos) => {
-        const taskRunsAt = new Date();
-        await Promise.all(order.serialNumbers.map(async (moneyTransferTransactionNumber) => {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
-                    transactionNumber: moneyTransferTransactionNumber,
-                    typeOf: factory.assetTransactionType.MoneyTransfer
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmMoneyTransferTransactionTask = {
-                alternateName: taskIdentifier,
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            await repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
-        }));
-    };
-}
+// function createConfirmMoneyTransferTasksIfNotExist(
+//     order: Pick<IProcessingOrder, 'orderNumber' | 'project'> & {
+//         serialNumbers: string[];
+//     },
+//     simpleOrder: factory.order.ISimpleOrder
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }): Promise<void> => {
+//         const taskRunsAt = new Date();
+//         await Promise.all(order.serialNumbers.map(async (moneyTransferTransactionNumber) => {
+//             const data: factory.task.IData<factory.taskName.ConfirmMoneyTransfer> = {
+//                 project: order.project,
+//                 typeOf: factory.actionType.ConfirmAction,
+//                 object: {
+//                     // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
+//                     transactionNumber: moneyTransferTransactionNumber,
+//                     typeOf: factory.assetTransactionType.MoneyTransfer
+//                 },
+//                 agent: order.project,
+//                 purpose: simpleOrder
+//             };
+//             const taskIdentifier: string = util.format(
+//                 '%s:%s:%s:%s:%s:%s',
+//                 data.project.id,
+//                 factory.taskName.ConfirmMoneyTransfer,
+//                 data.purpose.typeOf,
+//                 simpleOrder.orderNumber,
+//                 data.object.typeOf,
+//                 data.object.transactionNumber
+//             );
+//             const confirmMoneyTransferTransactionTask: factory.task.IAttributes<factory.taskName.ConfirmMoneyTransfer> & {
+//                 alternateName: string;
+//                 identifier: string;
+//             } = {
+//                 alternateName: taskIdentifier,
+//                 identifier: taskIdentifier,
+//                 project: order.project,
+//                 name: factory.taskName.ConfirmMoneyTransfer,
+//                 status: factory.taskStatus.Ready,
+//                 runsAt: taskRunsAt,
+//                 remainingNumberOfTries: 10,
+//                 numberOfTried: 0,
+//                 executionResults: [],
+//                 data
+//             };
+//             await repos.task.createIfNotExistByAlternateName(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+//         }));
+//     };
+// }
 function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
     return async (repos) => {
         const taskRunsAt = new Date();

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -11,5 +11,5 @@ declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IRe
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js

@@ -63,8 +63,14 @@ function onOrderReturned(params) {
                 const potentialActionsByTransaction = params.returnOrderTransaction?.potentialActions?.returnOrder?.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
                 })?.potentialActions;
-                const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
-                const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
+                // const itemOfferedTypeOfs = <factory.order.IItemOffered['typeOf'][]>await repos.acceptedOffer.distinctValues(
+                //     { orderNumber: { $in: [params.order.orderNumber] } },
+                //     'acceptedOffers.itemOffered.typeOf'
+                // );
+                // const serialNumbers = await repos.acceptedOffer.distinctValues(
+                //     { orderNumber: { $in: [params.order.orderNumber] } },
+                //     'acceptedOffers.serialNumber'
+                // );
                 const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
                 const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
                 const reservationForSuperEventLocationBranchCodes = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
@@ -80,12 +86,15 @@ function onOrderReturned(params) {
                     ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber, project: params.order.project }, params.returnOrderTransaction),
                     // 取引のpotentialActionsを適用(2023-08-19~)
                     ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ order: params.order, potentialActions: potentialActionsByTransaction }),
-                    ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
-                        ? createReturnMoneyTransferTasks({
-                            ...params.order,
-                            serialNumbers
-                        }, simpleOrder)
-                        : []
+                    // ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
+                    //     ? createReturnMoneyTransferTasks(
+                    //         {
+                    //             ...params.order,
+                    //             serialNumbers
+                    //         },
+                    //         simpleOrder
+                    //     )
+                    //     : []
                 ];
                 break;
             default:
@@ -169,62 +178,67 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
     }
     return tasks;
 }
-function createReturnMoneyTransferTasks(order, simpleOrder) {
-    const taskRunsAt = new Date();
-    const tasks = [];
-    for (const transactionNumber of order.serialNumbers) {
-        const returnMoneyTransferActionObject = {
-            // project: order.project,
-            typeOf: factory.actionType.MoneyTransfer,
-            // actionStatus: factory.actionStatusType.CompletedActionStatus,
-            // startDate: order.orderDate,
-            // id: '',
-            // amount: {
-            //     typeOf: 'MonetaryAmount',
-            //     currency: '' // この時点で不明でも動作する
-            // },
-            object: {
-                typeOf: factory.account.transactionType.Deposit,
-                // いったんtransactionNumberさえあれば返却可能
-                transactionNumber
-            }
-            // agent: order.project,
-            // recipient: {
-            //     typeOf: order.customer.typeOf,
-            //     id: order.customer.id,
-            //     name: String(order.customer.name)
-            // },
-            // fromLocation: <any>{},
-            // toLocation: <any>{},
-            // purpose: <any>{}
-        };
-        const returnMoneyTransferAction = {
-            project: order.project,
-            typeOf: factory.actionType.ReturnAction,
-            object: returnMoneyTransferActionObject,
-            agent: order.project,
-            recipient: {
-                typeOf: order.seller.typeOf,
-                id: order.seller.id,
-                name: order.seller.name
-            },
-            potentialActions: {},
-            purpose: simpleOrder,
-            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre }
-        };
-        tasks.push({
-            project: order.project,
-            name: factory.taskName.ReturnMoneyTransfer,
-            status: factory.taskStatus.Ready,
-            runsAt: taskRunsAt, // なるはやで実行
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: returnMoneyTransferAction
-        });
-    }
-    return tasks;
-}
+// function createReturnMoneyTransferTasks(
+//     order: Pick<factory.order.IOrder, 'seller' | 'customer' | 'project' | 'orderDate'> & {
+//         serialNumbers: string[];
+//     },
+//     simpleOrder: factory.order.ISimpleOrder
+// ): factory.task.IAttributes<factory.taskName.ReturnMoneyTransfer>[] {
+//     const taskRunsAt = new Date();
+//     const tasks: factory.task.IAttributes<factory.taskName.ReturnMoneyTransfer>[] = [];
+//     for (const transactionNumber of order.serialNumbers) {
+//         const returnMoneyTransferActionObject: factory.action.transfer.returnAction.moneyTransfer.IObject = {
+//             // project: order.project,
+//             typeOf: factory.actionType.MoneyTransfer,
+//             // actionStatus: factory.actionStatusType.CompletedActionStatus,
+//             // startDate: order.orderDate,
+//             // id: '',
+//             // amount: {
+//             //     typeOf: 'MonetaryAmount',
+//             //     currency: '' // この時点で不明でも動作する
+//             // },
+//             object: {
+//                 typeOf: factory.account.transactionType.Deposit,
+//                 // いったんtransactionNumberさえあれば返却可能
+//                 transactionNumber
+//             }
+//             // agent: order.project,
+//             // recipient: {
+//             //     typeOf: order.customer.typeOf,
+//             //     id: order.customer.id,
+//             //     name: String(order.customer.name)
+//             // },
+//             // fromLocation: <any>{},
+//             // toLocation: <any>{},
+//             // purpose: <any>{}
+//         };
+//         const returnMoneyTransferAction: factory.task.IData<factory.taskName.ReturnMoneyTransfer> = {
+//             project: order.project,
+//             typeOf: factory.actionType.ReturnAction,
+//             object: returnMoneyTransferActionObject,
+//             agent: order.project,
+//             recipient: {
+//                 typeOf: order.seller.typeOf,
+//                 id: order.seller.id,
+//                 name: order.seller.name
+//             },
+//             potentialActions: {},
+//             purpose: simpleOrder,
+//             instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre }
+//         };
+//         tasks.push({
+//             project: order.project,
+//             name: factory.taskName.ReturnMoneyTransfer,
+//             status: factory.taskStatus.Ready,
+//             runsAt: taskRunsAt, // なるはやで実行
+//             remainingNumberOfTries: 10,
+//             numberOfTried: 0,
+//             executionResults: [],
+//             data: returnMoneyTransferAction
+//         });
+//     }
+//     return tasks;
+// }
 function createReturnPayTransactionTasks(order, returnOrderTransaction) {
     const taskRunsAt = new Date();
     // const taskRunsAt = moment(order.dateReturned)

package/lib/chevre/service/order/payOrder.d.ts

@@ -2,7 +2,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 /**
@@ -13,6 +13,6 @@ declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPay
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }, settings: Settings) => Promise<void>;
 export { payOrder };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -1,21 +1,25 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
+import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { IPlacingOrder, OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
+interface ICreatePlacingOrderFromExistingTransactionRepos {
+    action?: never;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    placeOrder: PlaceOrderRepo;
+}
 declare function createPlacingOrderFromExistingTransaction(params: {
     project: {
         id: string;
     };
     confirmationNumber: string;
     orderNumber: string;
-}): (repos: {
-    action: ActionRepo;
-    orderInTransaction: OrderInTransactionRepo;
-    transaction: TransactionRepo;
-}) => Promise<{
+}): (repos: ICreatePlacingOrderFromExistingTransactionRepos) => Promise<{
     order: IPlacingOrder;
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];
 }>;
-export { createPlacingOrderFromExistingTransaction };
+export { ICreatePlacingOrderFromExistingTransactionRepos, createPlacingOrderFromExistingTransaction };

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -30,7 +30,7 @@ function createPlacingOrderFromExistingTransaction(params) {
     return async (repos) => {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
-        const placeOrderTransactions = await repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -54,31 +54,46 @@ function createPlacingOrderFromExistingTransaction(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = await repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['result']);
-                authorizeOfferActionsWithInstrument = await repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: {
-                        typeOf: {
-                            $in: [
-                                factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                                factory.offerType.Offer
-                            ]
-                        }
-                    },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['instrument']);
+                // authorizePaymentActions = <Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[]>
+                //     await repos.action.search<factory.actionType.AuthorizeAction>(
+                //         {
+                //             typeOf: factory.actionType.AuthorizeAction,
+                //             purpose: {
+                //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                //                 id: { $in: [placeOrderTransactionWithResult.id] }
+                //             },
+                //             object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
+                //             id: { $in: completedAuthorizeActionIds }
+                //         },
+                //         ['result']
+                //     );
+                authorizePaymentActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodResultsById({
+                    purpose: { id: placeOrderTransactionWithResult.id },
+                    ids: completedAuthorizeActionIds
+                });
+                // authorizeOfferActionsWithInstrument = <IAuthorizeActionWithInstrument[]>await repos.action.search<factory.actionType.AuthorizeAction>(
+                //     {
+                //         typeOf: factory.actionType.AuthorizeAction,
+                //         purpose: {
+                //             typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                //             id: { $in: [placeOrderTransactionWithResult.id] }
+                //         },
+                //         object: {
+                //             typeOf: {
+                //                 $in: [
+                //                     factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                //                     factory.offerType.Offer
+                //                 ]
+                //             }
+                //         },
+                //         id: { $in: completedAuthorizeActionIds }
+                //     },
+                //     ['instrument']
+                // );
+                authorizeOfferActionsWithInstrument = await repos.authorizeOfferAction.findAuthorizeOfferInstrumentsByIds({
+                    purpose: { id: placeOrderTransactionWithResult.id },
+                    ids: completedAuthorizeActionIds
+                });
             }
         }
         // orderedItem生成のためにacceptedOffersを取得

package/lib/chevre/service/order/placeOrder/factory/orderedItem.d.ts

@@ -5,6 +5,5 @@ import * as factory from '../../../../factory';
 declare function acceptedOffers2orderedItem(params: {
     eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
-    moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

package/lib/chevre/service/order/placeOrder/factory/orderedItem.js

@@ -32,10 +32,11 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
+    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
     // プロダクトがある場合
     const { productOrderItems } = createProductItems(params);
-    return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
+    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
+    return [...reservationOrderItems, ...productOrderItems];
 }
 function createReservationAcceptedOffers(params) {
     const orderedItems = [];
@@ -88,26 +89,6 @@ function reservationOffers2orderedItem(params) {
                 : undefined
         };
     }
-    else if (reservationFor.typeOf === factory.tripType.BusTrip
-        && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
-        const reservationFor4orderedItem = {
-            typeOf: reservationFor.typeOf,
-            id: reservationFor.id,
-            departureTime: reservationFor.departureTime,
-            arrivalTime: reservationFor.arrivalTime
-        };
-        return {
-            typeOf: issuedThrough.typeOf,
-            id: issuedThrough.id,
-            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
-                ? { serviceType: issuedThrough.serviceType }
-                : undefined,
-            serviceOutput: {
-                typeOf: factory.reservationType.ReservationPackage,
-                reservationFor: reservationFor4orderedItem
-            }
-        };
-    }
     else {
         throw new factory.errors.Internal('unexpected params on reservationOffers2orderedItem');
     }
@@ -138,9 +119,3 @@ function createProductItems(params) {
         productOrderItems: orderedItems
     };
 }
-function createMoneyTransferAcceptedOffers(__) {
-    const orderedItems = [];
-    return {
-        moneyTransferOrderItems: orderedItems
-    };
-}

package/lib/chevre/service/order/placeOrder/factory.js

@@ -106,20 +106,19 @@ function createPlacingOrder(params) {
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     const productAcceptedOffers = [];
-    const moneyTransferAcceptedOffers = [];
+    // const moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push(acceptedOffer);
                 break;
             case factory.permit.PermitType.Permit:
                 productAcceptedOffers.push(acceptedOffer);
                 break;
-            case factory.actionType.MoneyTransfer:
-                moneyTransferAcceptedOffers.push(acceptedOffer);
-                break;
+            // case factory.actionType.MoneyTransfer:
+            //     moneyTransferAcceptedOffers.push(<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>>acceptedOffer);
+            //     break;
             default:
                 throw new factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }
@@ -127,7 +126,7 @@ function createPlacingOrder(params) {
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
         productAcceptedOffers,
-        moneyTransferAcceptedOffers
+        // moneyTransferAcceptedOffers
     });
     return {
         ...orderByTransaction,

package/lib/chevre/service/order/placeOrder.d.ts

@@ -1,13 +1,27 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
+import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
+interface IPlaceOrderRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    order: OrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    setting: SettingRepo;
+    task: TaskRepo;
+    placeOrder: PlaceOrderRepo;
+}
 /**
  * 注文を作成する
  */
@@ -21,16 +35,7 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     useOnOrderStatusChanged: boolean;
-}): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    orderInTransaction: OrderInTransactionRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
-    transaction: TransactionRepo;
-}, settings: Settings) => Promise<{
+}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<{
     order: factory.transaction.placeOrder.IOrderAsResult;
 }>;
-export { placeOrder };
+export { IPlaceOrderRepos, placeOrder };

package/lib/chevre/service/order/placeOrder.js

@@ -42,7 +42,12 @@ function placeOrder(params) {
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
-        })(repos);
+        })({
+            authorizeOfferAction: repos.authorizeOfferAction,
+            authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
+            orderInTransaction: repos.orderInTransaction,
+            placeOrder: repos.placeOrder,
+        });
         // USE_ORDER_PAYMENT_DUE_ON_PLACED設定を廃止したので、必ずOrderPaymentDueのはず(2024-01-10~)
         if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
             throw new factory.errors.Internal(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);
@@ -72,7 +77,7 @@ function placeOrder(params) {
             typeOf: factory.actionType.OrderAction
         };
         // 冪等性を担保(2023-05-31~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },

package/lib/chevre/service/order/returnOrder.d.ts

@@ -4,7 +4,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import * as factory from '../../factory';
 declare function returnOrder(params: {
     agent: factory.action.transfer.returnAction.order.IAgent;
@@ -23,6 +23,6 @@ declare function returnOrder(params: {
     ownershipInfo: OwnershipInfoRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    returnOrder: ReturnOrderRepo;
 }) => Promise<void>;
 export { returnOrder };

package/lib/chevre/service/order/returnOrder.js

@@ -72,7 +72,7 @@ function returnOrder(params) {
                 throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
         // 返品取引検索
-        const returnOrderTransactions = await repos.transaction.projectFields({
+        const returnOrderTransactions = await repos.returnOrder.findReturnOrderTransactions({
             limit: 1,
             page: 1,
             project: { id: { $eq: order.project.id } },