@chevre/domain 26.0.0-alpha.9 → 26.0.0

package/lib/chevre/service/asyncActionHandler.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeAsyncAction = executeAsyncAction;
-const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./asyncActionHandler/onOperationFailed");
-const debug = (0, debug_1.default)('chevre-domain:service:asyncActionHandler');
 exports.taskLoader = {
     load: (taskName) => {
         return import(`./task/${taskName}.js`);
@@ -20,10 +18,9 @@ exports.taskLoader = {
  */
 function executeAsyncAction(task, next) {
     const now = new Date();
-    debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const asyncActionRepo = new (await import('../repo/asyncAction.js')).AsyncActionRepo(settings.connection);
-        let executedTask;
+        let taskAsNextFunctionParam;
         try {
             // 期限検証(2024-04-23~)
             if (task.expires instanceof Date) {
@@ -57,32 +54,33 @@ function executeAsyncAction(task, next) {
                 status: factory_1.factory.taskStatus.Executed,
                 executionResult: result
             });
-            executedTask = {
+            taskAsNextFunctionParam = {
                 id: task.id,
-                remainingNumberOfTries: 0, // one timeの前提なのでひとまず固定で0
                 name: task.name,
                 status: factory_1.factory.taskStatus.Executed,
-                executionResult: result
             };
         }
         catch (error) {
             const onOperationFailedResult = await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
             })({ asyncAction: asyncActionRepo });
-            executedTask = onOperationFailedResult.executedTask;
+            taskAsNextFunctionParam = {
+                id: onOperationFailedResult.executedTask.id,
+                name: onOperationFailedResult.executedTask.name,
+                status: onOperationFailedResult.executedTask.status
+            };
+            ;
         }
         finally {
             if (typeof next === 'function') {
-                if (executedTask === undefined) {
-                    executedTask = {
+                if (taskAsNextFunctionParam === undefined) {
+                    taskAsNextFunctionParam = {
                         id: task.id,
-                        remainingNumberOfTries: 0, // one timeの前提なのでひとまず固定で0
                         name: task.name,
                         status: factory_1.factory.taskStatus.Aborted,
-                        executionResult: {} // eslint-disable-line @typescript-eslint/no-explicit-any
                     };
                 }
-                await next(executedTask)(settings);
+                await next(taskAsNextFunctionParam)(settings);
             }
         }
     };

package/lib/chevre/service/event/processUpdateMovieTheater.d.ts

@@ -1,5 +1,5 @@
 import type { COA } from '@motionpicture/coa-service';
-import type { ActionRepo } from '../../repo/action';
+import type { UpdateActionRepo } from '../../repo/action/update';
 import type { CategoryCodeRepo } from '../../repo/categoryCode';
 import type { MovieTheaterRepo } from '../../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../../repo/place/screeningRoom';
@@ -9,7 +9,9 @@ import { IImportFromCOAParams } from './factory';
 type IMovieTheater = Pick<factory.place.movieTheater.IPlace, 'id' | 'typeOf' | 'branchCode' | 'name' | 'kanaName'>;
 declare function processUpdateMovieTheater(params: IImportFromCOAParams): (repos: {
     masterService: COA.service.Master;
-    action: ActionRepo;
+    actions: {
+        update: UpdateActionRepo;
+    };
     categoryCode: CategoryCodeRepo;
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;

package/lib/chevre/service/event/processUpdateMovieTheater.js

@@ -20,7 +20,7 @@ function processUpdateMovieTheater(params) {
             },
             targetCollection: { typeOf: factory_1.factory.placeType.MovieTheater }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         let seller;
         let movieTheater;
         let screeningRooms;
@@ -66,7 +66,7 @@ function processUpdateMovieTheater(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -77,7 +77,7 @@ function processUpdateMovieTheater(params) {
             screeningRoomsCount: screeningRooms.length,
             ...(processTime !== undefined) ? { processTime } : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result: actionResult });
         return { seller, movieTheater, screeningRooms };
     };
 }

package/lib/chevre/service/event.d.ts

@@ -2,7 +2,7 @@
  * マスターデータ同期サービス
  */
 import type { COA } from '@motionpicture/coa-service';
-import type { ActionRepo } from '../repo/action';
+import type { UpdateActionRepo } from '../repo/action/update';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
 import type { EventRepo } from '../repo/event';
@@ -17,7 +17,9 @@ import { saveScreeningEventSeries } from './event/saveScreeningEventSeries';
  * イベントをインポートする
  */
 declare function importFromCOA(params: IImportFromCOAParams): (repos: {
-    action: ActionRepo;
+    actions: {
+        update: UpdateActionRepo;
+    };
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;

package/lib/chevre/service/event.js

@@ -70,7 +70,7 @@ function importFromCOA(params) {
             instrument,
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEvent }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         let savedScreeningEventsCount = 0;
         let savedScreeningEventSeriesCount = 0;
         let cancelledIds = [];
@@ -131,7 +131,7 @@ function importFromCOA(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -144,7 +144,7 @@ function importFromCOA(params) {
             savedScreeningEventSeriesCount,
             ...(processTime !== undefined) ? { processTime } : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }
 function cancelDeletedEvents(params) {

package/lib/chevre/service/notification/sendEmailMessage.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { SendEmailMessageActionRepo } from '../../repo/action/sendEmailMessage';
 import type { MessageRepo } from '../../repo/message';
 import type { ProjectRepo } from '../../repo/project';
 import type { IntegrationSettingRepo } from '../../repo/setting/integration';
@@ -11,7 +11,9 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        sendEmailMessage: SendEmailMessageActionRepo;
+    };
     message: MessageRepo;
     project: ProjectRepo;
     integrationSetting: IntegrationSettingRepo;

package/lib/chevre/service/notification/sendEmailMessage.js

@@ -80,7 +80,7 @@ function sendEmailMessage(params) {
             project: { id: params.project.id }
         });
         const startingAction = createSendEmailMessageActionAttributes(params);
-        const action = await repos.action.start(startingAction, { recipe });
+        const action = await repos.actions.sendEmailMessage.start(startingAction, { recipe });
         let result;
         try {
             mailData.customArgs = {
@@ -121,13 +121,13 @@ function sendEmailMessage(params) {
                     mailData,
                     project: { id: params.project.id }
                 });
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.actions.sendEmailMessage.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
+        await repos.actions.sendEmailMessage.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
     };
 }

package/lib/chevre/service/notification/triggerWebhook.d.ts

@@ -1,9 +1,11 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { InformActionRepo } from '../../repo/action/inform';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { SettingRepo } from '../../repo/setting';
 interface ITriggerWebhookRepos {
-    action: ActionRepo;
+    actions: {
+        inform: InformActionRepo;
+    };
     potentialAction: PotentialActionRepo;
     setting: SettingRepo;
 }

package/lib/chevre/service/notification/triggerWebhook.js

@@ -88,18 +88,7 @@ function createInformActionAttributes(params) {
         const { about, object, purpose, recipient, project, id, typeOf } = params;
         // redefine recipient(2025-02-15~)
         let informRecipient;
-        // let informRecipient: factory.action.interact.inform.IRecipient | factory.action.interact.inform.IRecipientDeprecated = {
-        //     ...recipient
-        //     // url: target.urlTemplate // discontinue(2025-02-15~)
-        // };
-        if (recipient?.typeOf === factory_1.factory.organizationType.Corporation && typeof recipient.id === 'string') {
-            informRecipient = {
-                id: recipient.id,
-                name: recipient.name,
-                typeOf: recipient.typeOf
-            };
-        }
-        else if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
+        if (recipient?.typeOf === factory_1.factory.creativeWorkType.WebApplication) {
             informRecipient = {
                 name: recipient.name,
                 typeOf: recipient.typeOf
@@ -139,9 +128,9 @@ function createInformActionAttributes(params) {
             project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
             recipient: informRecipient,
             typeOf: factory_1.factory.actionType.InformAction,
+            target, // add(2025-02-06~)
             ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
             ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
-            ...(typeof target?.typeOf === 'string') ? { target } : undefined // add(2025-02-06~)
         };
     };
 }
@@ -159,7 +148,7 @@ function processInformAction(params, options) {
         const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
         const informActionAttributes = await createInformActionAttributes(params)(repos);
-        const action = await repos.action.start(informActionAttributes);
+        const action = await repos.actions.inform.startInformAction(informActionAttributes);
         let result = {};
         try {
             const urlTemplate = informActionAttributes.target?.urlTemplate;
@@ -226,13 +215,13 @@ function processInformAction(params, options) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.inform.giveUpInformAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.actions.inform.completeInformAction({ typeOf: action.typeOf, id: action.id, result: result });
     };
 }

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -25,7 +25,6 @@ import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
-    action?: never;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;

package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts

@@ -9,7 +9,6 @@ import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IIssueEventOfferTicketRepos {
-    action?: never;
     authorizeTicketedObjectAction: AuthorizeTicketedObjectActionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
-import type { ActionRepo } from '../../../../repo/action';
+import type { CancelActionRepo } from '../../../../repo/action/cancel';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
@@ -9,7 +9,9 @@ import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 interface IVoidTransactionRepos {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory_1 = require("../../../../factory");
-// import type { TransactionRepo } from '../../../../repo/transaction';
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
     return async (repos, settings) => {
-        // const transactionNumber = params.action.object.pendingTransaction?.transactionNumber;
         const transactionNumber = params.action.instrument.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
-            const assetTransactions = await repos.assetTransaction.search({
+            const assetTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.action.project.id } },

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.d.ts

@@ -1,6 +1,6 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../../factory';
-import { ActionRepo } from '../../../../repo/action';
+import { CancelActionRepo } from '../../../../repo/action/cancel';
 import { AcceptCOAOfferActionRepo } from '../../../../repo/action/acceptCOAOffer';
 import { TaskRepo } from '../../../../repo/task';
 declare function processVoidTransaction4coa(params: {
@@ -11,8 +11,10 @@ declare function processVoidTransaction4coa(params: {
      */
     asyncCancelPendingReservation: boolean;
 }): (repos: {
-    action: ActionRepo;
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+    };
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;
@@ -24,8 +26,10 @@ declare function processVoidTransactionByAcceptAction4coa(params: {
      */
     asyncCancelPendingReservation: boolean;
 }): (repos: {
-    action: ActionRepo;
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+    };
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.js

@@ -13,7 +13,7 @@ function processVoidTransaction4coa(params, options) {
         if (typeof acceptActionId !== 'string') {
             throw new factory_1.factory.errors.NotFound('action.object.id');
         }
-        const acceptAction = await repos.acceptCOAOfferAction.findById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
+        const acceptAction = await repos.actions.acceptCOAOffer.findAnyActionById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
         // console.log('processVoidTransaction4coa processing...', params.action.id, params.action.purpose.id, acceptAction);
         await (0, cancel_1.cancelByAcceptAction)({ action: acceptAction }, options)(repos);
     };

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -1,7 +1,7 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
-import type { ActionRepo } from '../../../repo/action';
+import type { CancelActionRepo } from '../../../repo/action/cancel';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
@@ -16,9 +16,11 @@ interface IVoidTransactionRepos {
     /**
      * CancelAction開始で使用される
      */
-    action: ActionRepo;
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
-    authorizeOfferAction: AuthorizeOfferActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+        authorizeOffer: AuthorizeOfferActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -24,7 +24,7 @@ function voidTransaction(params) {
         };
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
-        let authorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+        let authorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -79,7 +79,7 @@ function voidTransaction(params) {
                 await repos.orderInTransaction.deleteByIdentifier({ identifier: params.purpose.id });
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.actions.authorizeOffer.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.typeOf) {
                 // case WebAPIIdentifier.COA:
                 case factory_1.factory.assetTransactionType.COAReserveTransaction: {
@@ -88,8 +88,7 @@ function voidTransaction(params) {
                         throw new factory_1.factory.errors.Internal('repos.reserveService required');
                     }
                     await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
-                        action: repos.action,
-                        acceptCOAOfferAction: repos.acceptCOAOfferAction,
+                        actions: repos.actions,
                         reserveService,
                         task: repos.task
                     });
@@ -121,7 +120,7 @@ function cancelAcceptActions(params) {
             id: params.purpose.id
         }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
-        const completedAuthorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+        const completedAuthorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -131,7 +130,7 @@ function cancelAcceptActions(params) {
             actionStatus: { $eq: factory_1.factory.actionStatusType.CompletedActionStatus }
         });
         // 興行オファー採用アクション検索
-        let acceptActions = await repos.acceptCOAOfferAction.findAcceptCOAOfferActionsByPurpose({
+        let acceptActions = await repos.actions.acceptCOAOffer.findAcceptCOAOfferActionsByPurpose({
             // typeOf: factory.actionType.AcceptAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -166,13 +165,12 @@ function cancelAcceptActions(params) {
         }
         const { reserveService } = repos;
         await Promise.all(acceptActions.map(async (action) => {
-            await repos.acceptCOAOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.actions.acceptCOAOffer.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             if (reserveService === undefined) {
                 throw new factory_1.factory.errors.Internal('repos.reserveService required');
             }
             await (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
-                action: repos.action,
-                acceptCOAOfferAction: repos.acceptCOAOfferAction,
+                actions: repos.actions,
                 reserveService,
                 task: repos.task
             });

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -1,7 +1,7 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
-import type { ActionRepo } from '../../../repo/action';
+import type { CancelActionRepo } from '../../../repo/action/cancel';
 import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
@@ -16,9 +16,11 @@ interface IVoidTransactionByActionIdRepos {
     /**
      * CancelAction開始で使用される
      */
-    action: ActionRepo;
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
-    authorizeOfferAction: AuthorizeOfferActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+        authorizeOffer: AuthorizeOfferActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -27,24 +27,13 @@ function voidTransactionByActionId(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
-        const action = await repos.authorizeOfferAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
+        const action = await repos.actions.authorizeOffer.findAnyActionById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
-        // // add orderInTransaction(2024-01-15~)
-        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        // // const orderNumberByTransaction = transaction.object.orderNumber;
-        // const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
-        // if (typeof orderNumberByTransaction === 'string') {
-        //     await voidAcceptedOffer({
-        //         // authorizeActions: [action],
-        //         authorizeActionsWithInstrument: [action],
-        //         orderNumber: orderNumberByTransaction
-        //     })(repos);
-        // }
+        await repos.actions.authorizeOffer.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         await (0, any_1.voidAcceptedOffer)({
             authorizeActionsWithInstrument: [action],
             placeOrderId: params.purpose.id
@@ -56,8 +45,7 @@ function voidTransactionByActionId(params) {
                     throw new factory_1.factory.errors.Internal('repos.reserveService required');
                 }
                 await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
-                    action: repos.action,
-                    acceptCOAOfferAction: repos.acceptCOAOfferAction,
+                    actions: repos.actions,
                     reserveService,
                     task: repos.task
                 });

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

@@ -130,7 +130,7 @@ function reAcceptOffer(params) {
         // }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);
+        await repos.authorizeOfferAction.findAnyActionById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory_1.factory.actionType.AcceptAction,

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

@@ -27,7 +27,7 @@ function changeOffers(params) {
         //     throw new factory.errors.NotFound('transaction.object.orderNumber');
         // }
         // 取引内のアクションかどうか確認
-        const authorizeAction = await repos.action.findById({ typeOf: factory_2.factory.actionType.AuthorizeAction, id: params.id });
+        const authorizeAction = await repos.action.findAnyActionById({ typeOf: factory_2.factory.actionType.AuthorizeAction, id: params.id });
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
             throw new factory_2.factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts

@@ -1,7 +1,6 @@
 import { factory } from '../../../factory';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
      * アクションID
@@ -35,11 +34,8 @@ declare function findAcceptAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: {
     action: AcceptCOAOfferActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction };

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

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
 const factory_1 = require("../../../factory");
-function findAcceptAction(params, options) {
+function findAcceptAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-27~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AcceptCOAOffer
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AcceptCOAOffer
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.acceptCOAOffer.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.AcceptCOAOffer
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.AcceptCOAOffer
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AcceptCOAOffer);
         }

package/lib/chevre/service/offer/onEventChanged.js

@@ -203,7 +203,6 @@ function createInformTasks(params, setting) {
                     const informActionAttributes = {
                         object: event4inform,
                         recipient: {
-                            id: '',
                             name: String(informEvent.recipient?.name),
                             typeOf: factory_1.factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
@@ -257,7 +256,6 @@ function createInform2aggTasks(params, setting) {
                     const informActionAttributes = {
                         object: informObject,
                         recipient: {
-                            id: '',
                             name: String(informEvent.recipient?.name),
                             typeOf: factory_1.factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)