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

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
+exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAssetTransaction = exports.AggregateTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateUseAction = exports.AggregateAction = exports.AdminTransaction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdminAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OrderNumber = exports.OrderInTransaction = exports.Order = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -125,17 +125,6 @@ var action;
         }
         CheckMovieTicket.createInstance = createInstance;
     })(CheckMovieTicket = action.CheckMovieTicket || (action.CheckMovieTicket = {}));
-    let CheckThing;
-    (function (CheckThing) {
-        let repo;
-        async function createInstance(...params) {
-            if (repo === undefined) {
-                repo = (await import('./repo/action/checkThing.js')).CheckThingActionRepo;
-            }
-            return new repo(...params);
-        }
-        CheckThing.createInstance = createInstance;
-    })(CheckThing = action.CheckThing || (action.CheckThing = {}));
     let Pay;
     (function (Pay) {
         let repo;
@@ -158,6 +147,39 @@ var action;
         }
         Refund.createInstance = createInstance;
     })(Refund = action.Refund || (action.Refund = {}));
+    let Update;
+    (function (Update) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/action/update.js')).UpdateActionRepo;
+            }
+            return new repo(...params);
+        }
+        Update.createInstance = createInstance;
+    })(Update = action.Update || (action.Update = {}));
+    let Inform;
+    (function (Inform) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/action/inform.js')).InformActionRepo;
+            }
+            return new repo(...params);
+        }
+        Inform.createInstance = createInstance;
+    })(Inform = action.Inform || (action.Inform = {}));
+    let Use;
+    (function (Use) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/action/use.js')).UseActionRepo;
+            }
+            return new repo(...params);
+        }
+        Use.createInstance = createInstance;
+    })(Use = action.Use || (action.Use = {}));
 })(action || (exports.action = action = {}));
 var AdditionalProperty;
 (function (AdditionalProperty) {
@@ -170,6 +192,28 @@ var AdditionalProperty;
     }
     AdditionalProperty.createInstance = createInstance;
 })(AdditionalProperty || (exports.AdditionalProperty = AdditionalProperty = {}));
+var AdminAction;
+(function (AdminAction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminAction.js')).AdminActionRepo;
+        }
+        return new repo(...params);
+    }
+    AdminAction.createInstance = createInstance;
+})(AdminAction || (exports.AdminAction = AdminAction = {}));
+var AdminAssetTransaction;
+(function (AdminAssetTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminAssetTransaction.js')).AdminAssetTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AdminAssetTransaction.createInstance = createInstance;
+})(AdminAssetTransaction || (exports.AdminAssetTransaction = AdminAssetTransaction = {}));
 var AdminAsyncAction;
 (function (AdminAsyncAction) {
     let repo;
@@ -203,6 +247,17 @@ var AdminTask;
     }
     AdminTask.createInstance = createInstance;
 })(AdminTask || (exports.AdminTask = AdminTask = {}));
+var AdminTransaction;
+(function (AdminTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminTransaction.js')).AdminTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AdminTransaction.createInstance = createInstance;
+})(AdminTransaction || (exports.AdminTransaction = AdminTransaction = {}));
 var AggregateAction;
 (function (AggregateAction) {
     let repo;
@@ -214,6 +269,17 @@ var AggregateAction;
     }
     AggregateAction.createInstance = createInstance;
 })(AggregateAction || (exports.AggregateAction = AggregateAction = {}));
+var AggregateUseAction;
+(function (AggregateUseAction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateUseAction.js')).AggregateUseActionRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateUseAction.createInstance = createInstance;
+})(AggregateUseAction || (exports.AggregateUseAction = AggregateUseAction = {}));
 var AggregateScheduledTask;
 (function (AggregateScheduledTask) {
     let repo;
@@ -236,6 +302,28 @@ var AggregateTask;
     }
     AggregateTask.createInstance = createInstance;
 })(AggregateTask || (exports.AggregateTask = AggregateTask = {}));
+var AggregateTransaction;
+(function (AggregateTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateTransaction.js')).AggregateTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateTransaction.createInstance = createInstance;
+})(AggregateTransaction || (exports.AggregateTransaction = AggregateTransaction = {}));
+var AggregateAssetTransaction;
+(function (AggregateAssetTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateAssetTransaction.js')).AggregateAssetTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateAssetTransaction.createInstance = createInstance;
+})(AggregateAssetTransaction || (exports.AggregateAssetTransaction = AggregateAssetTransaction = {}));
 var AggregateOffer;
 (function (AggregateOffer) {
     let repo;
@@ -624,17 +712,6 @@ var OrderNumber;
     }
     OrderNumber.createInstance = createInstance;
 })(OrderNumber || (exports.OrderNumber = OrderNumber = {}));
-var OwnershipInfo;
-(function (OwnershipInfo) {
-    let repo;
-    async function createInstance(...params) {
-        if (repo === undefined) {
-            repo = (await import('./repo/ownershipInfo.js')).OwnershipInfoRepo;
-        }
-        return new repo(...params);
-    }
-    OwnershipInfo.createInstance = createInstance;
-})(OwnershipInfo || (exports.OwnershipInfo = OwnershipInfo = {}));
 var Passport;
 (function (Passport) {
     let repo;
@@ -1055,6 +1132,17 @@ var Task;
     }
     Task.createInstance = createInstance;
 })(Task || (exports.Task = Task = {}));
+var TaskDelayed;
+(function (TaskDelayed) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/taskDelayed.js')).TaskDelayedRepo;
+        }
+        return new repo(...params);
+    }
+    TaskDelayed.createInstance = createInstance;
+})(TaskDelayed || (exports.TaskDelayed = TaskDelayed = {}));
 var AsyncAction;
 (function (AsyncAction) {
     let repo;

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

@@ -1,11 +1,12 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateUseActionRepo } from '../../repo/aggregateUseAction';
+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;
@@ -37,7 +38,7 @@ declare function aggregatePlaceOrder(params: IAggregateParams & {
     clientIds?: string[];
 }): (repos: {
     agregation: AggregationRepo;
-    transaction: TransactionRepo;
+    aggregateTransaction: AggregateTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -74,7 +75,7 @@ declare function aggregateAuthorizeOrderAction(params: IAggregateParams): (repos
  */
 declare function aggregateUseAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    aggregateAction: AggregateActionRepo;
+    aggregateUseAction: AggregateUseActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -125,7 +126,7 @@ declare function aggregatePayMovieTicketAction(params: IAggregateParams): (repos
 }>;
 declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -135,7 +136,7 @@ declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
  */
 declare function aggregateReserveTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;

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

@@ -134,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,
@@ -144,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,
@@ -329,7 +329,7 @@ function aggregateUseAction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.aggregateAction.aggregateByTypeOf({
+            const aggregateResult = await repos.aggregateUseAction.aggregateByTypeOf({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -587,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,
@@ -632,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,

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/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;
 }