@chevre/domain 26.0.0 → 26.1.0-alpha.0

package/lib/chevre/repo/factory/action/createMongoConditions.js

@@ -0,0 +1,335 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMongoConditions = createMongoConditions;
+function createMongoConditions(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 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 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;
+}

package/lib/chevre/repo/mongoose/schemas/action/abstractAction.d.ts

@@ -0,0 +1,5 @@
+import type { Model } from 'mongoose';
+import type { IVirtuals } from '../../virtuals';
+type IAbstractActionDocType = any;
+type IAbstractActionModel = Model<IAbstractActionDocType, Record<string, never>, Record<string, never>, IVirtuals>;
+export { IAbstractActionDocType, IAbstractActionModel };

package/lib/chevre/repo/mongoose/schemas/action/abstractAction.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/chevre/service/assetTransaction/pay/check.d.ts

@@ -8,7 +8,9 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as MovieTicketPayment from '../../payment/movieTicket';
 export interface ICheckRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts

@@ -19,8 +19,8 @@ export interface IProcessAuthorizeOperationRepos {
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts

@@ -36,8 +36,8 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/assetTransaction/pay/start.d.ts

@@ -22,8 +22,8 @@ export interface IStartOperationRepos {
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js

@@ -43,12 +43,11 @@ function findAcceptAction(params) {
                 break;
             default: {
                 // タスクがReadyでなければアクション検索
-                const acceptAction = (await repos.action.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } },
-                    typeOf: { $eq: factory_1.factory.actionType.AcceptAction }
+                const acceptAction = (await repos.action.findActionBySameAs({
+                    sameAs: { id: task.id }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
-                })).shift();
-                if (acceptAction !== undefined) {
+                }));
+                if (typeof acceptAction?.id === 'string') {
                     // purpose検証
                     if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');

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

@@ -31,8 +31,8 @@ interface IAuthorizeRepos {
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     acceptPayAction: AcceptPayActionRepo;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;

package/lib/chevre/service/payment/any/findAcceptAction.js

@@ -43,12 +43,11 @@ function findAcceptAction(params) {
                 break;
             default: {
                 // タスクがReadyでなければアクション検索
-                const acceptAction = (await repos.acceptPayAction.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } },
-                    typeOf: { $eq: factory_1.factory.actionType.AcceptAction }
+                const acceptAction = (await repos.acceptPayAction.findActionBySameAs({
+                    sameAs: { id: task.id }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
-                })).shift();
-                if (acceptAction !== undefined) {
+                }));
+                if (typeof acceptAction?.id === 'string') {
                     // purpose検証
                     if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');

package/lib/chevre/service/payment/any/findAuthorizeAction.js

@@ -43,12 +43,11 @@ function findAuthorizeAction(params) {
                 break;
             default: {
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (await repos.authorizePaymentMethodAction.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } },
-                    typeOf: { $eq: factory_1.factory.actionType.AuthorizeAction }
+                const authorizeAction = (await repos.authorizePaymentMethodAction.findActionBySameAs({
+                    sameAs: { id: task.id }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
-                })).shift();
-                if (authorizeAction !== undefined) {
+                }));
+                if (typeof authorizeAction?.id === 'string') {
                     // purpose検証
                     if (authorizeAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');

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

@@ -2,7 +2,9 @@ import { factory } from '../../../factory';
 import type { CheckMovieTicketActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action/checkMovieTicket';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
 interface IFindCheckActionRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     asyncAction: AsyncActionRepo;
 }
 interface IFindCheckActionResult {

package/lib/chevre/service/payment/any/findCheckAction.js

@@ -43,18 +43,17 @@ function findCheckAction(params) {
                 break;
             default: {
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (await repos.checkMovieTicketAction.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } },
-                    typeOf: { $eq: factory_1.factory.actionType.CheckAction }
+                const authorizeAction = (await repos.actions.checkMovieTicket.findActionBySameAs({
+                    sameAs: { id: task.id }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
-                })).shift();
-                if (authorizeAction !== undefined) {
+                }));
+                if (typeof authorizeAction?.id === 'string') {
                     // purpose検証
                     if (authorizeAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');
                     }
                     // result from recipe(2024-06-10~)
-                    const purchaseNumberAuthResult = await repos.checkMovieTicketAction.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
+                    const purchaseNumberAuthResult = await repos.actions.checkMovieTicket.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
                         project: { id: params.project.id },
                         recipeFor: { id: authorizeAction.id }
                     });

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

@@ -42,8 +42,8 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

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

@@ -8,7 +8,9 @@ import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -42,7 +42,7 @@ function checkMovieTicket(params) {
                 ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
                 : undefined
         };
-        const action = await repos.checkMovieTicketAction.start(actionAttributes);
+        const action = await repos.actions.checkMovieTicket.start(actionAttributes);
         let processPurchaseNumberAuthResult;
         let recipe;
         try {
@@ -76,7 +76,7 @@ function checkMovieTicket(params) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.checkMovieTicketAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
+                await repos.actions.checkMovieTicket.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -84,7 +84,7 @@ function checkMovieTicket(params) {
             throw errors[0];
         }
         const result = {};
-        await repos.checkMovieTicketAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
+        await repos.actions.checkMovieTicket.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
         return { result: processPurchaseNumberAuthResult };
     };
 }

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

@@ -7,7 +7,9 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 export interface IValidateMovieTicketRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -121,7 +121,7 @@ function checkByIdentifierIfNotYet(params) {
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+            alreadyCheckedAction = (await repos.actions.checkMovieTicket.findCompletedCheckActions({
                 // limit: 1,
                 // page: 1,
                 // id: { $in: [specifiedCheckedActionId] },
@@ -163,7 +163,7 @@ function checkByIdentifierIfNotYet(params) {
         }
         debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
+            const recipe = await repos.actions.checkMovieTicket.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -103,11 +103,10 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } },
-                typeOf: { $eq: factory_1.factory.actionType.AcceptAction }
-            })).shift();
+            const action = (await actionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
+                purpose: { id: params.data.purpose.id }
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

package/lib/chevre/service/task/authorizePayment.js

@@ -57,8 +57,8 @@ function call(params) {
                 actions: {
                     pay: new pay_1.PayActionRepo(connection),
                     refund: new refund_1.RefundActionRepo(connection),
+                    checkMovieTicket: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 },
-                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 authorizePaymentMethodAction: authorizePaymentMethodActionRepo,
@@ -89,11 +89,10 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await authorizePaymentMethodActionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } },
-                typeOf: { $eq: factory_1.factory.actionType.AuthorizeAction }
-            })).shift();
+            const action = (await authorizePaymentMethodActionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
+                purpose: { id: params.data.purpose.id }
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

package/lib/chevre/service/task/checkMovieTicket.js

@@ -29,7 +29,9 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                checkMovieTicketAction: actionRepo,
+                actions: {
+                    checkMovieTicket: actionRepo,
+                },
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
@@ -43,13 +45,12 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                typeOf: { $eq: factory_1.factory.actionType.CheckAction },
+            const action = (await actionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
                 ...(typeof params.data.purpose?.id === 'string')
-                    ? { purpose: { id: { $eq: params.data.purpose.id } } }
+                    ? { purpose: { id: params.data.purpose.id } }
                     : undefined
-            })).shift();
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

package/lib/chevre/service/task/pay.js

@@ -32,8 +32,9 @@ function call(params) {
             ...params.data,
             sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
         })({
-            // action: new ActionRepo(connection),
-            checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
+            actions: {
+                checkMovieTicket: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
+            },
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection)