@chevre/domain 24.0.0-alpha.25 → 24.0.0-alpha.27

package/lib/chevre/repo/action.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionRepo = void 0;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../factory"));
-const settings_1 = require("../settings");
+// import { MONGO_MAX_TIME_MS } from '../settings';
 // import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
 // import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./action/actionProcess");
@@ -43,441 +43,11 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     this.actionModel = connection.model(modelName, createSchema());
     //     this.actionRecipeModel = connection.model(recipeModelName, createRecipeSchema());
     // }
-    static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = [];
-        const idIn = params.id?.$in;
-        if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
-        }
-        const idNin = params.id?.$nin;
-        if (Array.isArray(idNin)) {
-            andConditions.push({ _id: { $nin: idNin } });
-        }
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': {
-                    $eq: projectIdEq
-                }
-            });
-        }
-        const agentTypeOfIn = params.agent?.typeOf?.$in;
-        if (Array.isArray(agentTypeOfIn)) {
-            andConditions.push({
-                'agent.typeOf': {
-                    $exists: true,
-                    $in: agentTypeOfIn
-                }
-            });
-        }
-        const agentIdIn = params.agent?.id?.$in;
-        if (Array.isArray(agentIdIn)) {
-            andConditions.push({
-                'agent.id': {
-                    $exists: true,
-                    $in: agentIdIn
-                }
-            });
-        }
-        const instrumentTransactionNumberEq = params.instrument?.transactionNumber?.$eq;
-        if (typeof instrumentTransactionNumberEq === 'string') {
-            andConditions.push({ 'instrument.transactionNumber': { $exists: true, $eq: instrumentTransactionNumberEq } });
-        }
-        const instrumentTypeOfEq = params.instrument?.typeOf?.$eq;
-        if (typeof instrumentTypeOfEq === 'string') {
-            andConditions.push({ 'instrument.typeOf': { $exists: true, $eq: instrumentTypeOfEq } });
-        }
-        const instrumentIdentifierEq = params.instrument?.identifier?.$eq;
-        if (typeof instrumentIdentifierEq === 'string') {
-            andConditions.push({ 'instrument.identifier': { $exists: true, $eq: instrumentIdentifierEq } });
-        }
-        const instrumentIdEq = params.instrument?.id?.$eq;
-        if (typeof instrumentIdEq === 'string') {
-            andConditions.push({ 'instrument.id': { $exists: true, $eq: instrumentIdEq } });
-        }
-        const instrumentOrderNumberEq = params.instrument?.orderNumber?.$eq;
-        if (typeof instrumentOrderNumberEq === 'string') {
-            andConditions.push({ 'instrument.orderNumber': { $exists: true, $eq: instrumentOrderNumberEq } });
-        }
-        const locationIdEq = params.location?.id?.$eq;
-        if (typeof locationIdEq === 'string') {
-            andConditions.push({
-                'location.id': {
-                    $exists: true,
-                    $eq: locationIdEq
-                }
-            });
-        }
-        const locationIdentifierEq = params.location?.identifier?.$eq;
-        if (typeof locationIdentifierEq === 'string') {
-            andConditions.push({
-                'location.identifier': {
-                    $exists: true,
-                    $eq: locationIdentifierEq
-                }
-            });
-        }
-        const objectMovieTicketsIdentifierEq = params.object?.movieTickets?.identifier?.$eq;
-        if (typeof objectMovieTicketsIdentifierEq === 'string') {
-            andConditions.push({
-                'object.movieTickets.identifier': {
-                    $exists: true,
-                    $eq: objectMovieTicketsIdentifierEq
-                }
-            });
-        }
-        const objectMovieTicketsServiceOutputReservationForIdEq = params.object?.movieTickets?.serviceOutput?.reservationFor?.id?.$eq;
-        if (typeof objectMovieTicketsServiceOutputReservationForIdEq === 'string') {
-            andConditions.push({
-                'object.movieTickets.serviceOutput.reservationFor.id': {
-                    $exists: true,
-                    $eq: objectMovieTicketsServiceOutputReservationForIdEq
-                }
-            });
-        }
-        const objectPaymentMethodIdEq = params.object?.paymentMethodId?.$eq;
-        if (typeof objectPaymentMethodIdEq === 'string') {
-            andConditions.push({
-                'object.paymentMethodId': {
-                    $exists: true,
-                    $eq: objectPaymentMethodIdEq
-                }
-            });
-        }
-        const objectObjectPaymentMethodIdEq = params.object?.object?.paymentMethodId?.$eq;
-        if (typeof objectObjectPaymentMethodIdEq === 'string') {
-            andConditions.push({
-                'object.object.paymentMethodId': {
-                    $exists: true,
-                    $eq: objectObjectPaymentMethodIdEq
-                }
-            });
-        }
-        const objectReservationForIdEq = params.object?.reservationFor?.id?.$eq;
-        if (typeof objectReservationForIdEq === 'string') {
-            andConditions.push({
-                'object.reservationFor.id': {
-                    $exists: true,
-                    $eq: objectReservationForIdEq
-                }
-            });
-        }
-        const objectReservationNumberEq = params.object?.reservationNumber?.$eq;
-        if (typeof objectReservationNumberEq === 'string') {
-            andConditions.push({
-                'object.reservationNumber': {
-                    $exists: true,
-                    $eq: objectReservationNumberEq
-                }
-            });
-        }
-        const objectReservationNumberIn = params.object?.reservationNumber?.$in;
-        if (Array.isArray(objectReservationNumberIn)) {
-            andConditions.push({
-                'object.reservationNumber': {
-                    $exists: true,
-                    $in: objectReservationNumberIn
-                }
-            });
-        }
-        const objectPaymentMethodAccountIdEq = params.object?.paymentMethod?.accountId?.$eq;
-        if (typeof objectPaymentMethodAccountIdEq === 'string') {
-            andConditions.push({
-                'object.paymentMethod.accountId': {
-                    $exists: true,
-                    $eq: objectPaymentMethodAccountIdEq
-                }
-            });
-        }
-        const objectPaymentMethodPaymentMethodIdEq = params.object?.paymentMethod?.paymentMethodId?.$eq;
-        if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
-            andConditions.push({
-                'object.paymentMethod.paymentMethodId': {
-                    $exists: true,
-                    $eq: objectPaymentMethodPaymentMethodIdEq
-                }
-            });
-        }
-        const objectPaymentMethodPaymentMethodIdIn = params.object?.paymentMethod?.paymentMethodId?.$in;
-        if (Array.isArray(objectPaymentMethodPaymentMethodIdIn)) {
-            andConditions.push({
-                'object.paymentMethod.paymentMethodId': {
-                    $exists: true,
-                    $in: objectPaymentMethodPaymentMethodIdIn
-                }
-            });
-        }
-        const objectPaymentMethodTypeOfEq = params.object?.paymentMethod?.typeOf?.$eq;
-        if (typeof objectPaymentMethodTypeOfEq === 'string') {
-            andConditions.push({
-                'object.paymentMethod.typeOf': {
-                    $exists: true,
-                    $eq: objectPaymentMethodTypeOfEq
-                }
-            });
-        }
-        const objectTypeOfEq = params.object?.typeOf?.$eq;
-        if (typeof objectTypeOfEq === 'string') {
-            andConditions.push({
-                'object.typeOf': {
-                    $exists: true,
-                    $eq: objectTypeOfEq
-                }
-            });
-        }
-        const objectTypeOfIn = params.object?.typeOf?.$in;
-        if (Array.isArray(objectTypeOfIn)) {
-            andConditions.push({
-                'object.typeOf': {
-                    $exists: true,
-                    $in: objectTypeOfIn
-                }
-            });
-        }
-        const objectIdEq = params.object?.id?.$eq;
-        if (typeof objectIdEq === 'string') {
-            andConditions.push({
-                'object.id': {
-                    $exists: true,
-                    $eq: objectIdEq
-                }
-            });
-        }
-        const objectIdIn = params.object?.id?.$in;
-        if (Array.isArray(objectIdIn)) {
-            andConditions.push({
-                'object.id': {
-                    $exists: true,
-                    $in: objectIdIn
-                }
-            });
-        }
-        const objectOrderNumberIn = params.object?.orderNumber?.$in;
-        if (Array.isArray(objectOrderNumberIn)) {
-            andConditions.push({
-                'object.orderNumber': {
-                    $exists: true,
-                    $in: objectOrderNumberIn
-                }
-            });
-        }
-        const objectEventIdIn = params.object?.event?.id?.$in;
-        if (Array.isArray(objectEventIdIn)) {
-            andConditions.push({
-                'object.event.id': {
-                    $exists: true,
-                    $in: objectEventIdIn
-                }
-            });
-        }
-        // discontinue(2024-06-18~)
-        // const objectAcceptedOfferSeatNumberIn =
-        //     params.object?.acceptedOffer?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber?.$in;
-        // if (Array.isArray(objectAcceptedOfferSeatNumberIn)) {
-        //     andConditions.push({
-        //         'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': {
-        //             $exists: true,
-        //             $in: objectAcceptedOfferSeatNumberIn
-        //         }
-        //     });
-        // }
-        const objectTransactionNumberEq = params.object?.transactionNumber?.$eq;
-        if (typeof objectTransactionNumberEq === 'string') {
-            andConditions.push({ 'object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
-        }
-        if (typeof params.typeOf === 'string') {
-            andConditions.push({
-                typeOf: params.typeOf
-            });
-        }
-        else {
-            const typeOfEq = params.typeOf?.$eq;
-            if (typeof typeOfEq === 'string') {
-                andConditions.push({
-                    typeOf: { $eq: typeOfEq }
-                });
-            }
-        }
-        const actionStatusIn = params.actionStatus?.$in;
-        if (Array.isArray(actionStatusIn)) {
-            andConditions.push({
-                actionStatus: { $in: actionStatusIn }
-            });
-        }
-        if (Array.isArray(params.actionStatusTypes)) {
-            andConditions.push({
-                actionStatus: { $in: params.actionStatusTypes }
-            });
-        }
-        const startDateGte = params.startFrom;
-        if (startDateGte instanceof Date) {
-            andConditions.push({
-                startDate: { $gte: startDateGte }
-            });
-        }
-        const startDateLte = params.startThrough;
-        if (startDateLte instanceof Date) {
-            andConditions.push({
-                startDate: { $lte: startDateLte }
-            });
-        }
-        const fromLocationTypeOfIn = params.fromLocation?.typeOf?.$in;
-        if (Array.isArray(fromLocationTypeOfIn)) {
-            andConditions.push({
-                'fromLocation.typeOf': {
-                    $exists: true,
-                    $in: fromLocationTypeOfIn
-                }
-            });
-        }
-        const fromLocationAccountNumberIn = params.fromLocation?.accountNumber?.$in;
-        if (Array.isArray(fromLocationAccountNumberIn)) {
-            andConditions.push({
-                'fromLocation.accountNumber': {
-                    $exists: true,
-                    $in: fromLocationAccountNumberIn
-                }
-            });
-        }
-        const fromLocationAccountTypeIn = params.fromLocation?.accountType?.$in;
-        if (Array.isArray(fromLocationAccountTypeIn)) {
-            andConditions.push({
-                'fromLocation.accountType': {
-                    $exists: true,
-                    $in: fromLocationAccountTypeIn
-                }
-            });
-        }
-        const toLocationTypeOfIn = params.toLocation?.typeOf?.$in;
-        if (Array.isArray(toLocationTypeOfIn)) {
-            andConditions.push({
-                'toLocation.typeOf': {
-                    $exists: true,
-                    $in: toLocationTypeOfIn
-                }
-            });
-        }
-        const toLocationAccountNumberIn = params.toLocation?.accountNumber?.$in;
-        if (Array.isArray(toLocationAccountNumberIn)) {
-            andConditions.push({
-                'toLocation.accountNumber': {
-                    $exists: true,
-                    $in: toLocationAccountNumberIn
-                }
-            });
-        }
-        const toLocationAccountTypeIn = params.toLocation?.accountType?.$in;
-        if (Array.isArray(toLocationAccountTypeIn)) {
-            andConditions.push({
-                'toLocation.accountType': {
-                    $exists: true,
-                    $in: toLocationAccountTypeIn
-                }
-            });
-        }
-        const purposeTypeOfIn = params.purpose?.typeOf?.$in;
-        if (Array.isArray(purposeTypeOfIn)) {
-            andConditions.push({
-                'purpose.typeOf': {
-                    $exists: true,
-                    $in: purposeTypeOfIn
-                }
-            });
-        }
-        const purposeIdIn = params.purpose?.id?.$in;
-        if (Array.isArray(purposeIdIn)) {
-            andConditions.push({
-                'purpose.id': {
-                    $exists: true,
-                    $in: purposeIdIn
-                }
-            });
-        }
-        const purposeOrderNumberIn = params.purpose?.orderNumber?.$in;
-        if (Array.isArray(purposeOrderNumberIn)) {
-            andConditions.push({
-                'purpose.orderNumber': {
-                    $exists: true,
-                    $in: purposeOrderNumberIn
-                }
-            });
-        }
-        const resultTypeOfIn = params.result?.typeOf?.$in;
-        if (Array.isArray(resultTypeOfIn)) {
-            andConditions.push({
-                'result.typeOf': {
-                    $exists: true,
-                    $in: resultTypeOfIn
-                }
-            });
-        }
-        const resultIdIn = params.result?.id?.$in;
-        if (Array.isArray(resultIdIn)) {
-            andConditions.push({
-                'result.id': {
-                    $exists: true,
-                    $in: resultIdIn
-                }
-            });
-        }
-        const resultOrderNumberIn = params.result?.orderNumber?.$in;
-        if (Array.isArray(resultOrderNumberIn)) {
-            andConditions.push({
-                'result.orderNumber': {
-                    $exists: true,
-                    $in: resultOrderNumberIn
-                }
-            });
-        }
-        const resultCodeIn = params.result?.code?.$in;
-        if (Array.isArray(resultCodeIn)) {
-            andConditions.push({
-                'result.code': {
-                    $exists: true,
-                    $in: resultCodeIn
-                }
-            });
-        }
-        // sameAs(2024-04-23~)
-        const sameAsIdEq = params.sameAs?.id?.$eq;
-        if (typeof sameAsIdEq === 'string') {
-            andConditions.push({ 'sameAs.id': { $exists: true, $eq: sameAsIdEq } });
-        }
-        const aboutOrderNumberEq = params.about?.orderNumber?.$eq;
-        if (typeof aboutOrderNumberEq === 'string') {
-            andConditions.push({ 'about.orderNumber': { $exists: true, $eq: aboutOrderNumberEq } });
-        }
-        return andConditions;
-    }
     /**
      * アクション検索
      */
     async search(params, inclusion) {
-        const conditions = ActionRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = actionProcess_1.AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            positiveProjectionFields = inclusion.filter((key) => actionProcess_1.AVAILABLE_PROJECT_FIELDS.includes(key));
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-        if (typeof params.limit === 'number' && params.limit > 0) {
-            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            query.limit(params.limit)
-                .skip(params.limit * (page - 1));
-        }
-        /* istanbul ignore else */
-        if (params.sort?.startDate !== undefined) {
-            query.sort({ startDate: params.sort.startDate });
-        }
-        // const explainResult = await (<any>query).explain();
-        // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean() // 2024-08-26~
-            .exec();
+        return (this.findAnyActions(params, inclusion));
     }
     // /**
     //  * アクション開始
@@ -729,83 +299,7 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
      * 取引に対するアクションを検索する
      */
     async searchByPurpose(params) {
-        const andConditions = [
-            { 'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf } },
-            { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
-        ];
-        // const idNin = params.id?.$nin;
-        // if (Array.isArray(idNin)) {
-        //     andConditions.push({ _id: { $nin: idNin } });
-        // }
-        const objectPaymentMethodIdEq = params.object?.paymentMethodId?.$eq;
-        if (typeof objectPaymentMethodIdEq === 'string') {
-            andConditions.push({ 'object.paymentMethodId': { $exists: true, $eq: objectPaymentMethodIdEq } });
-        }
-        const objectTypeOfEq = params.object?.typeOf?.$eq;
-        if (typeof objectTypeOfEq === 'string') {
-            andConditions.push({ 'object.typeOf': { $exists: true, $eq: objectTypeOfEq } });
-        }
-        if (typeof params.typeOf === 'string') {
-            andConditions.push({ typeOf: { $eq: params.typeOf } });
-        }
-        const actionStatusEq = params.actionStatus?.$eq;
-        if (typeof actionStatusEq === 'string') {
-            andConditions.push({ actionStatus: { $eq: actionStatusEq } });
-        }
-        const positiveProjectionFields = [
-            'project',
-            'actionStatus',
-            'typeOf',
-            'description',
-            'agent',
-            'recipient',
-            'result',
-            'error',
-            'object',
-            'startDate',
-            'endDate',
-            'purpose',
-            'potentialActions',
-            'instrument',
-            'location',
-            'sameAs',
-            'cancelAction',
-            'identifier'
-        ];
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        const query = this.actionModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
-        if (typeof params.sort?.startDate === 'number') {
-            query.sort({ startDate: params.sort.startDate });
-        }
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        // return <Promise<IAction4transaction<T>[]>><Promise<unknown[]>>this.search<T>(
-        //     {
-        //         purpose: {
-        //             id: { $in: [params.purpose.id] },
-        //             typeOf: { $in: [params.purpose.typeOf] }
-        //         },
-        //         object: {
-        //             ...(typeof params.object?.typeOf?.$eq === 'string')
-        //                 ? { typeOf: { $eq: params.object.typeOf.$eq } }
-        //                 : undefined,
-        //             ...(typeof params.object?.paymentMethodId?.$eq === 'string')
-        //                 ? { paymentMethodId: { $eq: params.object.paymentMethodId.$eq } }
-        //                 : undefined
-        //         },
-        //         ...(typeof params.actionStatus?.$eq === 'string') ? { actionStatus: { $in: [params.actionStatus.$eq] } } : undefined,
-        //         ...(typeof params.typeOf === 'string') ? { typeOf: { $eq: params.typeOf } } : undefined,
-        //         ...(Array.isArray(params.id?.$nin)) ? { id: { $nin: params.id?.$nin } } : undefined,
-        //         ...(typeof params.sort?.startDate === 'number') ? { sort: params.sort } : undefined
-        //     },
-        //     [],
-        //     []
-        // );
+        return (this.findAnyActionsByPurpose(params));
     }
     /**
      * 注文番号から、注文に対するアクションを検索する

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

@@ -128,7 +128,6 @@ function sendOrder(params) {
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
-                console.log('createOwnerships:', createOwnerships);
                 // 所有権作成
                 if (createOwnerships) {
                     creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({

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

@@ -1,5 +1,6 @@
 import * as factory from '../../../../factory';
-import type { ActionRepo } from '../../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
+import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
@@ -7,7 +8,9 @@ import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
 interface IFixTransactionNumberRepos {
-    action: ActionRepo;
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -1,5 +1,6 @@
 import * as factory from '../../../../factory';
-import type { ActionRepo } from '../../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
+import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
@@ -10,6 +11,14 @@ interface IAcceptAction2ticketResult {
     invoiceByTicketToken: IInvoiceByTicketToken;
     ticketToken: string;
 }
+interface IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos {
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
+}
 /**
  * 決済承認前の決済採用アクションを参照する
  */
@@ -17,12 +26,7 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'referencesOrder'>;
     prePublishedPaymentMethodId: string;
     transaction: Pick<ITransactionInProgress, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
-}): (repos: {
-    action: ActionRepo;
-    authorization: AuthorizationRepo;
-    ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
-}) => Promise<{
+}): (repos: IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
         paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
@@ -37,4 +41,4 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     authorizeParams?: never;
     acceptAction2ticketResult?: never;
 }>;
-export { handlePrePublishedPaymentMethodIdOnAuthorizing };
+export { IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos, handlePrePublishedPaymentMethodIdOnAuthorizing };

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

@@ -125,24 +125,32 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
         const paymentMethodByTransaction = await repos.placeOrder.findInProgressPaymentMethodId({ id: params.transaction.id });
         if (params.prePublishedPaymentMethodId === paymentMethodByTransaction?.paymentMethodId) {
             // check existence of acceptAction when authorizing payment(2024-06-01~)
-            acceptPayAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.transaction.project.id } },
-                typeOf: { $eq: factory.actionType.AcceptAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                purpose: { id: { $in: [params.transaction.id] } },
-                object: {
-                    transactionNumber: { $eq: params.prePublishedPaymentMethodId },
-                    typeOf: { $eq: factory.assetTransactionType.Pay }
-                }
+            // acceptPayAction = (<Pick<IAcceptPayAction, 'object' | 'result' | 'id' | 'instrument'>[]>await repos.action.search<factory.actionType.AcceptAction>(
+            //     {
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: params.transaction.project.id } },
+            //         typeOf: { $eq: factory.actionType.AcceptAction },
+            //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            //         purpose: { id: { $in: [params.transaction.id] } },
+            //         object: {
+            //             transactionNumber: { $eq: params.prePublishedPaymentMethodId },
+            //             typeOf: { $eq: factory.assetTransactionType.Pay }
+            //         }
+            //     },
+            //     ['object', 'result', 'instrument']
+            // )).shift();
+            acceptPayAction = (await repos.acceptPayAction.findCompletedAcceptActionsByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                purpose: { id: params.transaction.id },
+                object: { transactionNumber: params.prePublishedPaymentMethodId }
             }, ['object', 'result', 'instrument'])).shift();
             if (acceptPayAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.AcceptAction);
             }
             debug('acceptPayAction found:', acceptPayAction.id);
             // find recipe(2024-06-02~)
-            const actionRecipe = await repos.action.findRecipeByAction({
+            const actionRecipe = await repos.acceptPayAction.findRecipeByAction({
                 project: { id: params.transaction.project.id },
                 recipeFor: { id: acceptPayAction.id }
             });
@@ -169,13 +177,22 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 throw new factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');
             }
             // 既に承認済であれば何もしない(2023-05-15~)
-            const existingCompletedAuthorizeActions = await repos.action.searchByPurpose({
-                typeOf: factory.actionType.AuthorizeAction,
+            // const existingCompletedAuthorizeActions = <IAuthorizePaymentAction[]>
+            //     await repos.action.searchByPurpose<factory.actionType.AuthorizeAction>({
+            //         typeOf: factory.actionType.AuthorizeAction,
+            //         purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
+            //         actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
+            //         object: {
+            //             paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
+            //             typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+            //         },
+            //         sort: { startDate: factory.sortType.Ascending }
+            //     });
+            const existingCompletedAuthorizeActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
                 purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
                 actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
                 object: {
-                    paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
-                    typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+                    paymentMethodId: { $eq: params.prePublishedPaymentMethodId }
                 },
                 sort: { startDate: factory.sortType.Ascending }
             });