@chevre/domain 26.0.0-alpha.3 → 26.0.0-alpha.30

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,16 +1,17 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateAssetTransactionRepo } from '../../repo/aggregateAssetTransaction';
+import type { AggregateScheduledTaskRepo } from '../../repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from '../../repo/aggregateTask';
-import { AggregationRepo } from '../../repo/aggregation';
-import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { AggregateTransactionRepo } from '../../repo/aggregateTransaction';
+import type { AggregationRepo } from '../../repo/aggregation';
 import type { EventRepo } from '../../repo/event';
-import { OrderRepo } from '../../repo/order';
-import type { TransactionRepo } from '../../repo/transaction';
+import type { OrderRepo } from '../../repo/order';
 type AggregateDurationUnit = 'days' | 'hours';
 interface IAggregateParams {
     aggregateDate: Date;
     aggregateDurationUnit: AggregateDurationUnit;
     aggregationCount: number;
-    excludedProjectId?: string;
+    excludedProjectId?: never;
 }
 declare function aggregateEvent(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
@@ -36,7 +37,7 @@ declare function aggregatePlaceOrder(params: IAggregateParams & {
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
-    transaction: TransactionRepo;
+    aggregateTransaction: AggregateTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -124,7 +125,7 @@ declare function aggregatePayMovieTicketAction(params: IAggregateParams): (repos
 }>;
 declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -134,7 +135,7 @@ declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
  */
 declare function aggregateReserveTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -146,4 +147,11 @@ declare function aggregateTask(params: IAggregateParams): (repos: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+declare function aggregateScheduledTask(params: IAggregateParams): (repos: {
+    agregation: AggregationRepo;
+    aggregateScheduledTask: AggregateScheduledTaskRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrder, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateScheduledTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -17,6 +17,7 @@ exports.aggregatePlaceOrder = aggregatePlaceOrder;
 exports.aggregateReserveAction = aggregateReserveAction;
 exports.aggregateReserveTransaction = aggregateReserveTransaction;
 exports.aggregateTask = aggregateTask;
+exports.aggregateScheduledTask = aggregateScheduledTask;
 exports.aggregateUseAction = aggregateUseAction;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
@@ -133,7 +134,7 @@ function aggregatePlaceOrder(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.transaction.aggregatePlaceOrder({
+            const aggregateResult = await repos.aggregateTransaction.aggregatePlaceOrder({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -143,7 +144,7 @@ function aggregatePlaceOrder(params) {
             const aggregateResultsByClientId = [];
             if (Array.isArray(params.clientIds)) {
                 for (const clientId of params.clientIds) {
-                    const aggregateResultByClientId = await repos.transaction.aggregatePlaceOrder({
+                    const aggregateResultByClientId = await repos.aggregateTransaction.aggregatePlaceOrder({
                         project: { id: { $ne: params.excludedProjectId } },
                         startFrom,
                         startThrough,
@@ -586,7 +587,7 @@ function aggregatePayTransaction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.assetTransaction.aggregateAssetTransaction({
+            const aggregateResult = await repos.aggregateAssetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -631,7 +632,7 @@ function aggregateReserveTransaction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.assetTransaction.aggregateAssetTransaction({
+            const aggregateResult = await repos.aggregateAssetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -692,3 +693,44 @@ function aggregateTask(params) {
         return { aggregationCount: i, aggregateDuration };
     };
 }
+function aggregateScheduledTask(params) {
+    return async (repos) => {
+        const { aggregateDate } = params;
+        if (!(aggregateDate instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('aggregateDate', 'must be Date');
+        }
+        const aggregateDuration = moment_timezone_1.default.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const runsFrom = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const runsThrough = (0, moment_timezone_1.default)(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = await repos.aggregateScheduledTask.aggregateScheduledTask({
+                // project: { id: { $ne: params.excludedProjectId } },
+                runsFrom,
+                runsThrough
+            });
+            await repos.agregation.saveAggregation({
+                typeOf: factory_1.factory.aggregation.AggregationType.AggregateScheduledTask,
+                project: { id: '*', typeOf: factory_1.factory.organizationType.Project },
+                aggregateDuration,
+                aggregateStart: runsFrom,
+                aggregateDate,
+                ...aggregateResult
+            });
+        }
+        debug(i, 'aggregations saved');
+        return { aggregationCount: i, aggregateDuration };
+    };
+}

package/lib/chevre/service/assetTransaction/cancelReservation/start.js

@@ -11,30 +11,15 @@ function validateStartParams(params) {
         const sellerId = params.seller?.id;
         // 予約番号で取引存在確認
         if (typeof params.object.reservation?.reservationNumber === 'string') {
-            const transactions = await repos.assetTransaction.search({
+            const transactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 limit: 1,
                 page: 1,
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
-                    reservationNumber: { $eq: params.object.reservation.reservationNumber },
-                    // 販売者検証(2023-08-01~)
-                    ...(typeof sellerId === 'string') ? { provider: { id: { $eq: sellerId } } } : undefined
+                    reservationNumber: { $eq: params.object.reservation.reservationNumber }
                 }
             });
             reserveTransaction = transactions.shift();
-            // ここでReservationConfirmedでない予約をスルーしても、
-            // ReservationRepo.cancel()で冪等性を保証しているのでvalidation不要か(2022-05-12~)
-            // 予約ステータス確認
-            // const unconfirmedReservations = await repos.reservation.search({
-            //     limit: 1,
-            //     page: 1,
-            //     typeOf: factory.reservationType.EventReservation,
-            //     reservationNumber: { $eq: params.object.reservation.reservationNumber },
-            //     reservationStatus: { $ne: factory.reservationStatusType.ReservationConfirmed }
-            // });
-            // if (unconfirmedReservations.length > 0) {
-            //     throw new factory.errors.Argument('object.reservation.reservationNumber', `Reservation ${unconfirmedReservations[0].id} not confirmed`);
-            // }
         }
         // 取引指定が確認できなければ、予約指定を確認
         if (reserveTransaction === undefined) {
@@ -59,6 +44,14 @@ function validateStartParams(params) {
                 reservations = [reservation];
             }
         }
+        else {
+            // 販売者検証(2023-08-01~)
+            if (typeof sellerId === 'string') {
+                if (reserveTransaction.object.provider?.id !== sellerId) {
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation);
+                }
+            }
+        }
         if (reserveTransaction === undefined && reservations === undefined) {
             throw new factory_1.factory.errors.Argument('object', 'Transaction or reservation must be specified');
         }

package/lib/chevre/service/assetTransaction/refund.js

@@ -135,12 +135,12 @@ function confirm(params) {
         else {
             throw new factory_1.factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const payTransaction = (await repos.assetTransaction.search({
+        const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Pay,
             transactionNumber: { $eq: transaction.object.paymentMethodId }
-        }, ['recipient'], [])).shift();
+        }, ['recipient'])).shift();
         if (payTransaction === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Pay);
         }

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

@@ -1,4 +1,4 @@
-import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction } from '../eventEmitter/task';
+import type { IExecuteSettings as IMinimumExecuteSettings, IAsyncActionNextFunction } from '../eventEmitter/task';
 type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 declare function executeAsyncActionById(params: {
@@ -12,5 +12,5 @@ declare function executeAsyncActionById(params: {
          */
         name: string;
     };
-}, next?: INextFunction): IOperation<void>;
+}, next: IAsyncActionNextFunction): IOperation<void>;
 export { executeAsyncActionById };

package/lib/chevre/service/asyncAction.js

@@ -27,10 +27,7 @@ function executeAsyncActionById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, asyncActionHandler_1.executeAsyncAction)(task, (typeof next === 'function') ? next : undefined)(settings, {
-                executeById: true,
-                executeByName: false
-            });
+            await (0, asyncActionHandler_1.executeAsyncAction)(task, next)(settings, {});
         }
     };
 }

package/lib/chevre/service/asyncActionHandler/onOperationFailed.d.ts

@@ -1,4 +1,4 @@
-import type { IExecutedTask } from '../../eventEmitter/task';
+import type { ITaskAsNextFunctionParam } from '../../eventEmitter/task';
 import type { AsyncActionRepo, IExecutableAsyncAction } from '../../repo/asyncAction';
 /**
  * タスク実行失敗時処理
@@ -10,6 +10,6 @@ declare function onOperationFailed(params: {
 }): (repos: {
     asyncAction: AsyncActionRepo;
 }) => Promise<{
-    executedTask: IExecutedTask;
+    executedTask: ITaskAsNextFunctionParam;
 }>;
 export { onOperationFailed };

package/lib/chevre/service/asyncActionHandler/onOperationFailed.js

@@ -32,10 +32,8 @@ function onOperationFailed(params) {
         });
         const executedTask = {
             id: task.id,
-            remainingNumberOfTries: 0,
             name: task.name,
             status: factory_1.factory.taskStatus.Aborted,
-            executionResult: result
         };
         return { executedTask };
     };

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

@@ -1,5 +1,5 @@
-import type { INextFunction } from '../eventEmitter/task';
-import type { ICallResult, ICallableTaskOperation, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
+import type { IAsyncActionNextFunction } from '../eventEmitter/task';
+import type { ICallableTaskOperation, IOperationExecute } from '../taskSettings';
 import type { IExecutableAsyncAction } from '../repo/asyncAction';
 export declare const taskLoader: {
     load: (taskName: string) => Promise<{
@@ -9,5 +9,5 @@ export declare const taskLoader: {
 /**
  * 非同期アクションを実行する
  */
-declare function executeAsyncAction(task: IExecutableAsyncAction, next?: INextFunction): IOperationExecute<void>;
-export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeAsyncAction };
+declare function executeAsyncAction(task: IExecutableAsyncAction, next: IAsyncActionNextFunction): IOperationExecute<void>;
+export { executeAsyncAction };

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/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/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/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~)