@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.80

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 * as factory from '../../../factory';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
+import { 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

@@ -1,41 +1,18 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPlacingOrderFromExistingTransaction = createPlacingOrderFromExistingTransaction;
-const factory = __importStar(require("../../../factory"));
-const factory_1 = require("./factory");
+const factory_1 = require("../../../factory");
+const factory_2 = require("./factory");
 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 } },
-            typeOf: factory.transactionType.PlaceOrder,
-            statuses: [factory.transactionStatusType.Confirmed],
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            statuses: [factory_1.factory.transactionStatusType.Confirmed],
             result: {
                 order: {
                     confirmationNumber: { $eq: confirmationNumber },
@@ -46,7 +23,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
         if (placeOrderTransactionWithResult === undefined) {
-            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
         }
         let authorizePaymentActions = [];
         let authorizeOfferActionsWithInstrument = [];
@@ -54,31 +31,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を取得
@@ -94,14 +86,14 @@ function createPlacingOrderFromExistingTransaction(params) {
         catch (error) {
             let throwsError = true;
             // すでにtypeOf: Orderに変更済の場合、NotFoundとなる
-            if (error instanceof factory.errors.NotFound) {
+            if (error instanceof factory_1.factory.errors.NotFound) {
                 throwsError = false;
             }
             if (throwsError) {
                 throw error;
             }
         }
-        const order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
+        const order = (0, factory_2.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
         return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
     };
 }

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

@@ -1,10 +1,8 @@
-import * as factory from '../../../../factory';
+import { 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>[];
+    eventReservationAcceptedOffers: factory.order.IAcceptedOffer[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

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

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptedOffers2orderedItem = acceptedOffers2orderedItem;
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 /**
  * 受入オファーを注文アイテムに変換する
  */
@@ -32,10 +9,12 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
+    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
     // プロダクトがある場合
-    const { productOrderItems } = createProductItems(params);
-    return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
+    // const { productOrderItems } = createProductItems(params);
+    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
+    // return [...reservationOrderItems, ...productOrderItems];
+    return reservationOrderItems;
 }
 function createReservationAcceptedOffers(params) {
     const orderedItems = [];
@@ -45,7 +24,7 @@ function createReservationAcceptedOffers(params) {
         const reservationFor = itemOffered.reservationFor;
         const issuedThrough = itemOffered.issuedThrough;
         if (typeof reservationFor.id !== 'string' || reservationFor.id.length === 0) {
-            throw new factory.errors.NotFound('acceptedOffers.itemOffered.reservationFor.id');
+            throw new factory_1.factory.errors.NotFound('acceptedOffers.itemOffered.reservationFor.id');
         }
         if (typeof issuedThrough.typeOf === 'string') {
             if (!eventIds.includes(reservationFor.id)) {
@@ -62,8 +41,8 @@ function createReservationAcceptedOffers(params) {
 function reservationOffers2orderedItem(params) {
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
-    if (reservationFor.typeOf === factory.eventType.ScreeningEvent
-        && issuedThrough.typeOf === factory.product.ProductType.EventService) {
+    if (reservationFor.typeOf === factory_1.factory.eventType.ScreeningEvent
+        && issuedThrough.typeOf === factory_1.factory.product.ProductType.EventService) {
         const reservationFor4orderedItem = {
             location: {
                 branchCode: reservationFor.location.branchCode,
@@ -79,7 +58,7 @@ function reservationOffers2orderedItem(params) {
         return {
             typeOf: issuedThrough.typeOf,
             serviceOutput: {
-                typeOf: factory.reservationType.EventReservation,
+                typeOf: factory_1.factory.reservationType.EventReservation,
                 reservationFor: reservationFor4orderedItem
             },
             ...(typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined,
@@ -88,59 +67,7 @@ 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');
-    }
-}
-function createProductItems(params) {
-    const orderedItems = [];
-    const productIds = [];
-    if (Array.isArray(params.productAcceptedOffers) && params.productAcceptedOffers.length > 0) {
-        // プロダクトIDで最適化する
-        const issuedThrough = params.productAcceptedOffers[0].itemOffered.issuedThrough;
-        if (typeof issuedThrough?.id === 'string') {
-            if (!productIds.includes(issuedThrough.id)) {
-                productIds.push(issuedThrough.id);
-                orderedItems.push({
-                    typeOf: 'OrderItem',
-                    orderedItem: {
-                        id: String(issuedThrough.id),
-                        typeOf: issuedThrough.typeOf,
-                        ...(typeof issuedThrough.serviceType?.typeOf === 'string')
-                            ? { serviceType: issuedThrough.serviceType }
-                            : undefined
-                    }
-                });
-            }
-        }
+        throw new factory_1.factory.errors.Internal('unexpected params on reservationOffers2orderedItem');
     }
-    return {
-        productOrderItems: orderedItems
-    };
-}
-function createMoneyTransferAcceptedOffers(__) {
-    const orderedItems = [];
-    return {
-        moneyTransferOrderItems: orderedItems
-    };
 }

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

@@ -1,7 +1,7 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
-type IOrderAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IItemOffered>;
+type IOrderAcceptedOffer = factory.order.IAcceptedOffer;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,7 +7,7 @@ exports.createPlacingOrder = createPlacingOrder;
 exports.createSeller = createSeller;
 exports.createPaymentMethods = createPaymentMethods;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const orderedItem_1 = require("./factory/orderedItem");
 function createPaymentMethods(params) {
     const paymentMethods = [];
@@ -42,13 +19,13 @@ function createPaymentMethods(params) {
             ? a.result[0]
             : undefined;
         if (resultAsInvoice === undefined) {
-            throw new factory.errors.NotFound('authorizePaymentAction.resultAsInvoice'); // resultは必ず存在するはず
+            throw new factory_1.factory.errors.NotFound('authorizePaymentAction.resultAsInvoice'); // resultは必ず存在するはず
         }
         const paymentMethodAmountCurrencyByAuthorizeAction = resultAsInvoice.paymentMethodAsObject?.amount?.currency;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
         const paymentMethodType = resultAsInvoice.paymentMethodAsObject?.typeOf;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
+            throw new factory_1.factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
         }
         const paymentMethodOfInvoice = {
             identifier: paymentMethodType, // 決済方法区分を保証(2023-08-28~)
@@ -77,7 +54,7 @@ function createPaymentMethods(params) {
             // ? b.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? b.result[0]
             : undefined;
-        const jpyAmount = (resultAsInvoice?.totalPaymentDue?.currency === factory.priceCurrency.JPY)
+        const jpyAmount = (resultAsInvoice?.totalPaymentDue?.currency === factory_1.factory.priceCurrency.JPY)
             ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;
@@ -98,36 +75,35 @@ function createPlacingOrder(params) {
     const { transaction, authorizePaymentActions } = params;
     const orderByTransaction = transaction.result?.order;
     if (orderByTransaction === undefined) {
-        throw new factory.errors.NotFound('transaction.result.order');
+        throw new factory_1.factory.errors.NotFound('transaction.result.order');
     }
     const seller = createSeller({ transaction });
     const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
-    const productAcceptedOffers = [];
-    const moneyTransferAcceptedOffers = [];
+    // const productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[] = [];
+    // 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:
+            case factory_1.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.permit.PermitType.Permit:
+            //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
+            //     break;
+            // case factory.actionType.MoneyTransfer:
+            //     moneyTransferAcceptedOffers.push(<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>>acceptedOffer);
+            //     break;
             default:
-                throw new factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
+                throw new factory_1.factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }
     });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,
-        productAcceptedOffers,
-        moneyTransferAcceptedOffers
+        // productAcceptedOffers,
+        // moneyTransferAcceptedOffers
     });
     return {
         ...orderByTransaction,

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidAcceptedOfferIfNecessary = voidAcceptedOfferIfNecessary;
 const debug_1 = __importDefault(require("debug"));
 // import type { TransactionRepo } from '../../../repo/transaction';
-// import * as factory from '../../../factory';
+// import { factory } from '../../../factory';
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 // type IPlaceOrderTransaction = Pick<
 //     factory.transaction.placeOrder.ITransaction,

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 * as factory from '../../factory';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
+import { 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

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrder = placeOrder;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const createPlacingOrderFromExistingTransaction_1 = require("./placeOrder/createPlacingOrderFromExistingTransaction");
@@ -35,17 +12,22 @@ const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIf
 function placeOrder(params) {
     return async (repos, settings) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         // 注文番号から取引と注文をfixする
         const { order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             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}`);
+        if (order.orderStatus !== factory_1.factory.orderStatus.OrderPaymentDue) {
+            throw new factory_1.factory.errors.Internal(`orderStatus must be ${factory_1.factory.orderStatus.OrderPaymentDue}`);
         }
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -69,13 +51,13 @@ function placeOrder(params) {
             // potentialActions: {}, // discontinue(2024-06-28~)
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
-            typeOf: factory.actionType.OrderAction
+            typeOf: factory_1.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] },
+            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
             typeOf: { $eq: orderActionAttributes.typeOf },
             object: { orderNumber: { $in: [orderActionAttributes.object.orderNumber] } },
             purpose: {
@@ -108,7 +90,7 @@ function placeOrder(params) {
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
-            if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
+            if (order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue) {
                 await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
                     order: {
                         paymentMethods: order.paymentMethods,
@@ -127,7 +109,7 @@ function placeOrder(params) {
                 });
             }
             else {
-                throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
+                throw new factory_1.factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
             }
             // paymentMethods.length: 0の場合を考慮(2023-08-24~)
             if (order.paymentMethods.length === 0) {

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

@@ -2,7 +2,7 @@ import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
 import type { TaskRepo } from '../../repo/task';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import { IExternalOrder } from './onOrderStatusChanged';
 /**
  * 注文取引なしに注文を作成する