@chevre/domain 26.0.0-alpha.41 → 26.0.0-alpha.42

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

@@ -1,11 +1,7 @@
 import { factory } from '../../factory';
-import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
+import type { ConfirmActionRepo } from '../../repo/action/confirm';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
-import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
-import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
 declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
     project: {
@@ -13,13 +9,11 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
         typeOf: factory.organizationType.Project;
     };
 }, options: Record<string, never>): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
-    action: ActionRepo;
+    actions: {
+        confirm: ConfirmActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    accountingReport: AccountingReportRepo;
-    event: EventRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

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

@@ -36,12 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
 const util_1 = require("util");
 const factory_1 = require("../../factory");
-// import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
 function confirmPayTransaction(data, options) {
     return async (repos) => {
         // アクション開始
-        const action = await repos.action.start(data);
+        const action = await repos.actions.confirm.start(data);
         try {
             for (const confirmingTransaction of data.object) {
                 await PayTransactionService.confirm({
@@ -61,20 +60,14 @@ function confirmPayTransaction(data, options) {
                         ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
                         : undefined
                 })({
-                    acceptedOffer: repos.acceptedOffer,
-                    action: repos.action,
-                    accountingReport: repos.accountingReport,
                     assetTransaction: repos.assetTransaction,
-                    event: repos.event,
                     order: repos.order,
-                    // project: repos.project,
-                    task: repos.task
                 });
             }
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.confirm.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -83,7 +76,7 @@ function confirmPayTransaction(data, options) {
         }
         // アクション完了
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.confirm.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
         await onConfirmed(data)({
             task: repos.task

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

@@ -5,8 +5,10 @@ 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 {
-    authorizeOfferAction: AuthorizeOfferActionRepo;
-    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    actions: {
+        authorizeOffer: AuthorizeOfferActionRepo;
+        authorizePaymentMethod: AuthorizePaymentMethodActionRepo;
+    };
     orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }

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

@@ -35,11 +35,11 @@ function createPlacingOrderFromExistingTransaction(params) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             /* istanbul ignore else -- @preserve */
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodResultsById({
+                authorizePaymentActions = await repos.actions.authorizePaymentMethod.findAuthorizePaymentMethodResultsById({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
                 });
-                authorizeOfferActionsWithInstrument = await repos.authorizeOfferAction.findAuthorizeOfferInstrumentsByIds({
+                authorizeOfferActionsWithInstrument = await repos.actions.authorizeOffer.findAuthorizeOfferInstrumentsByIds({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
                 });

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

@@ -1,6 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
+import type { OrderActionRepo } from '../../repo/action/order';
 import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
 import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
 import type { MessageRepo } from '../../repo/message';
@@ -14,9 +14,11 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    authorizeOfferAction: AuthorizeOfferActionRepo;
-    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    actions: {
+        order: OrderActionRepo;
+        authorizeOffer: AuthorizeOfferActionRepo;
+        authorizePaymentMethod: AuthorizePaymentMethodActionRepo;
+    };
     message: MessageRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;

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

@@ -17,8 +17,7 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({
-            authorizeOfferAction: repos.authorizeOfferAction,
-            authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
+            actions: repos.actions,
             orderInTransaction: repos.orderInTransaction,
             placeOrder: repos.placeOrder,
         });
@@ -42,19 +41,12 @@ function placeOrder(params) {
             typeOf: factory_1.factory.actionType.OrderAction
         };
         // 冪等性を担保(2023-05-31~)
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: orderActionAttributes.typeOf },
-            object: { orderNumber: { $in: [orderActionAttributes.object.orderNumber] } },
-            purpose: {
-                id: { $in: [orderActionPurpose.id] },
-                typeOf: { $in: [orderActionPurpose.typeOf] }
-            }
-        }, ['id']);
-        if (completedActions.length === 0) {
-            const action = await repos.action.start(orderActionAttributes);
+        const completedAction = await repos.actions.order.findCompletedOrderAction({
+            object: { orderNumber: orderActionAttributes.object.orderNumber },
+            purpose: { id: orderActionPurpose.id }
+        });
+        if (completedAction === null) {
+            const action = await repos.actions.order.start(orderActionAttributes);
             try {
                 // 冗長なオファーを除外する(念のため)
                 await (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
@@ -65,14 +57,14 @@ function placeOrder(params) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
+                    await repos.actions.order.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
                 }
                 throw error;
             }
-            await repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+            await repos.actions.order.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)

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

@@ -1,5 +1,5 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { ActionRepo } from '../../repo/action';
+import type { ReturnActionRepo } from '../../repo/action/returnAction';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -17,7 +17,9 @@ declare function returnOrder(params: {
     useOnOrderStatusChanged: boolean;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
-    action: ActionRepo;
+    actions: {
+        returnAction: ReturnActionRepo;
+    };
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -80,7 +80,7 @@ function returnOrder(params) {
         };
         const returnedOwnershipInfos = [];
         let returnedOrder;
-        const action = await repos.action.start(returnOrderActionAttributes);
+        const action = await repos.actions.returnAction.start(returnOrderActionAttributes);
         try {
             // ひとまず所有権管理を廃止するため、所有権返却処理は不要(2026-08-10)
             // returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
@@ -98,7 +98,7 @@ function returnOrder(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.returnAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -106,7 +106,7 @@ function returnOrder(params) {
             throw error;
         }
         const result = returnedOwnershipInfos;
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.returnAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         if (params.useOnOrderStatusChanged) {
             await (0, onOrderStatusChanged_1.onOrderReturned)({
                 order: {

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -9,7 +9,6 @@ import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
 interface IFixTransactionNumberRepos {
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts

@@ -13,7 +13,6 @@ interface IAcceptAction2ticketResult {
     ticketToken: string;
 }
 interface IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos {
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -28,7 +28,6 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     accountingReport: AccountingReportRepo;
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts

@@ -10,7 +10,6 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IInvalidatePaymentUrlRepos {
     accountingReport: AccountingReportRepo;
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/any/onPayActionCompleted.d.ts

@@ -7,7 +7,6 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnPayActionCompletedRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.d.ts

@@ -4,7 +4,6 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnRefundActionCompletedOrFailedRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/processVoidPayTransaction.d.ts

@@ -5,7 +5,6 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IProcessVoidPayTransactionRepos {
-    action?: never;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/payment/any/voidPayTransaction.d.ts

@@ -22,7 +22,6 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     };
 }): (repos: {
     accountingReport: AccountingReportRepo;
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -9,7 +9,6 @@ interface ICreditCardPaymentAgencyTransaction {
     secureTran2Result?: never;
 }
 interface IProcessAuthorizeCreditCardRepos {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     creditCardService: GMO.service.Credit;
 }

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts

@@ -9,7 +9,6 @@ interface ICreditCardPaymentAgencyTransaction3ds {
     secureTran2Result: GMO.factory.service.credit.ISecureTran2Result;
 }
 interface IProcessAuthorizeCreditCard3dsRepos {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     creditCardService: GMO.service.Credit;
 }

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -41,7 +41,6 @@ payTransaction: IPayTransactionAsAuthorizeInvoiceAction, paymentServiceId: strin
         id?: string;
     };
 }): (repos: {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts

@@ -11,7 +11,6 @@ import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/i
  * クレジットカード決済
  */
 declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts

@@ -16,7 +16,6 @@ declare function refundCreditCard(params: Pick<factory.action.trade.refund.IAttr
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/faceToFace.d.ts

@@ -11,7 +11,6 @@ declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
 declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
@@ -21,7 +20,6 @@ declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (r
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -39,7 +39,6 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts

@@ -10,7 +10,6 @@ import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPayOperationRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts

@@ -7,7 +7,6 @@ import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IRefundOperationRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { CancelActionRepo } from '../../repo/action/cancel';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { ReservationRepo } from '../../repo/reservation';
@@ -10,7 +10,9 @@ import type { TaskRepo } from '../../repo/task';
  * 保留予約取消
  */
 declare function cancelPendingReservation(actionAttributes: factory.task.cancelPendingReservation.IPotentialCancelAction): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -22,7 +24,9 @@ declare function cancelPendingReservation(actionAttributes: factory.task.cancelP
  * 予約をキャンセルする
  */
 declare function cancelReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/cancelReservation.js

@@ -52,24 +52,14 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_2.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: factory_1.factory.actionType.CancelAction },
-            object: {
-                typeOf: { $eq: factory_1.factory.reservationType.ReservationPackage },
-                reservationNumber: { $eq: reserveTransaction.transactionNumber }
-            },
-            purpose: {
-                id: { $in: [params.purpose.id] },
-                typeOf: { $in: [params.purpose.typeOf] }
-            }
-        }, ['id']);
-        if (completedActions.length === 0) {
+        const completedAction = await repos.actions.cancel.findCompletedCancelAction({
+            object: { reservationNumber: reserveTransaction.transactionNumber },
+            purpose: { id: params.purpose.id }
+        });
+        if (completedAction === null) {
             if (actionAttributes !== undefined) {
                 // アクション開始
-                const action = await repos.action.start(actionAttributes);
+                const action = await repos.actions.cancel.start(actionAttributes);
                 actionId = action.id;
                 const actionObject = actionAttributes.object;
                 // let cancelResult: ICancelResult | undefined;
@@ -126,7 +116,7 @@ function cancelPengindIfNotYet(params) {
                 }
                 catch (error) {
                     try {
-                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.actions.cancel.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
@@ -134,11 +124,11 @@ function cancelPengindIfNotYet(params) {
                     throw error;
                 }
                 const actionResult = {};
-                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
             }
         }
         else {
-            actionId = completedActions.at(0)?.id;
+            actionId = completedAction.id;
         }
         return {
             reserveTransaction,
@@ -163,7 +153,7 @@ function cancelReservation(actionAttributesList) {
         const now = new Date();
         if (actionAttributesList.length > 0) {
             await Promise.all(actionAttributesList.map(async (actionAttributes) => {
-                const action = await repos.action.start(actionAttributes);
+                const action = await repos.actions.cancel.start(actionAttributes);
                 let cancelResult;
                 let canceledReservationForId;
                 try {
@@ -275,7 +265,7 @@ function cancelReservation(actionAttributesList) {
                 }
                 catch (error) {
                     try {
-                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.actions.cancel.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
@@ -294,7 +284,7 @@ function cancelReservation(actionAttributesList) {
                     } : undefined
                     // canceledReservationId: canceledReservation?.id
                 };
-                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -32,7 +32,9 @@ interface ICheckInReservationParams {
     };
 }
 export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
-    action: ActionRepo;
+    actions: {
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/confirmReservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -13,7 +13,9 @@ export declare function confirmReservation(params: {
     useOnReservationConfirmed: boolean;
     byTask: boolean;
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/confirmReservation.js

@@ -78,19 +78,6 @@ function reserveTransaction2action(params) {
     // if (typeof transaction.object.underName?.typeOf === 'string') {
     //     underName = transaction.object.underName;
     // }
-    // const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
-    // const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    // pendingReservations.forEach((reservation) => {
-    //     const acceptedOffer4reservation = transaction.object.acceptedOffer?.find(
-    //         (o) => o.itemOffered?.serviceOutput?.id === reservation.id
-    //     );
-    //     moneyTransferActions.push(...createMoneyTransferActions({
-    //         acceptedOffer: acceptedOffer4reservation,
-    //         reservation,
-    //         transaction: params.transaction,
-    //         underName
-    //     }));
-    // });
     const reservationPackage = {
         reservationFor: {
             id: String(reservationFor.id),
@@ -135,9 +122,7 @@ function createReservationUnderName(params) {
         ...((typeof telephone === 'string') && { telephone })
     };
 }
-function reserveIfNotYet(
-// params: factory.action.reserve.IAttributes,
-params, options) {
+function reserveIfNotYet(params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
         const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
@@ -152,23 +137,12 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: actionAttributes.typeOf },
-            object: {
-                typeOf: { $eq: actionAttributes.object.typeOf }
-                // reservationNumber: { $eq: params.object.reservationNumber }
-            },
-            purpose: {
-                id: { $in: [actionAttributes.purpose.id] },
-                typeOf: { $in: [actionAttributes.purpose.typeOf] }
-            }
-        }, ['id']);
-        debug(completedActions.length, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        if (completedActions.length === 0) {
-            const action = await repos.action.start(actionAttributes);
+        const completedAction = await repos.actions.reserve.findCompletedReserveAction({
+            purpose: { id: actionAttributes.purpose.id }
+        });
+        debug(completedAction?.id, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        if (completedAction === null) {
+            const action = await repos.actions.reserve.start(actionAttributes);
             try {
                 let underName;
                 const underNameByTransaction = reserveTransaction.object.underName;
@@ -217,7 +191,7 @@ params, options) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.actions.reserve.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -225,7 +199,7 @@ params, options) {
                 throw error;
             }
             const actionResult = {};
-            await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            await repos.actions.reserve.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { actionAttributes, reserveTransaction };
     };

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
 import type { UseActionRepo } from '../../repo/action/use';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
@@ -26,9 +26,9 @@ export declare function useReservation(params: {
         identifier?: string;
     };
 }): (repos: {
-    action: ActionRepo;
     actions: {
         use: UseActionRepo;
+        reserve: ReserveActionRepo;
     };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;