@chevre/domain 26.0.0-alpha.13 → 26.0.0-alpha.15

package/lib/chevre/repo/transaction.d.ts

@@ -73,7 +73,7 @@ export declare class TransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/chevre/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/chevre/transaction/returnOrder").ITransaction, "id" | "status" | "typeOf">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -133,16 +133,16 @@ export declare class TransactionRepo {
     getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
+        status: factory.transactionStatusType;
+        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
-        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
-        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
     } & {
@@ -152,16 +152,16 @@ export declare class TransactionRepo {
     }) | ({
         object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
         error?: any;
+        status: factory.transactionStatusType;
+        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
-        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
         recipient?: undefined;
-        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
@@ -171,16 +171,16 @@ export declare class TransactionRepo {
     })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
+        status: factory.transactionStatusType;
+        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
-        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
-        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
     } & {
@@ -190,16 +190,16 @@ export declare class TransactionRepo {
     }) | ({
         object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
         error?: any;
+        status: factory.transactionStatusType;
+        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
-        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
         recipient?: undefined;
-        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {

package/lib/chevre/repository.d.ts

@@ -16,7 +16,6 @@ import type { CheckThingActionRepo } from './repo/action/checkThing';
 import type { PayActionRepo } from './repo/action/pay';
 import type { RefundActionRepo } from './repo/action/refund';
 import type { AsyncActionRepo } from './repo/asyncAction';
-import type { AsyncActionLegacyRepo } from './repo/asyncActionLegacy';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
 import type { AdminAsyncActionRepo } from './repo/adminAsyncAction';
 import type { AdminScheduledTaskRepo } from './repo/adminScheduledTask';
@@ -93,8 +92,8 @@ import type { RateLimitSettingRepo } from './repo/setting/rateLimit';
 import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { ScheduledTaskRepo } from './repo/scheduledTask';
-import type { ScheduledTaskLegacyRepo } from './repo/scheduledTaskLegacy';
 import type { TaskRepo } from './repo/task';
+import type { TaskDelayedRepo } from './repo/taskDelayed';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
 import type { PlaceOrderRepo } from './repo/transaction/placeOrder';
@@ -499,22 +498,18 @@ export type ScheduledTask = ScheduledTaskRepo;
 export declare namespace ScheduledTask {
     function createInstance(...params: ConstructorParameters<typeof ScheduledTaskRepo>): Promise<ScheduledTaskRepo>;
 }
-export type ScheduledTaskLegacy = ScheduledTaskLegacyRepo;
-export declare namespace ScheduledTaskLegacy {
-    function createInstance(...params: ConstructorParameters<typeof ScheduledTaskLegacyRepo>): Promise<ScheduledTaskLegacyRepo>;
-}
 export type Task = TaskRepo;
 export declare namespace Task {
     function createInstance(...params: ConstructorParameters<typeof TaskRepo>): Promise<TaskRepo>;
 }
+export type TaskDelayed = TaskDelayedRepo;
+export declare namespace TaskDelayed {
+    function createInstance(...params: ConstructorParameters<typeof TaskDelayedRepo>): Promise<TaskDelayedRepo>;
+}
 export type AsyncAction = AsyncActionRepo;
 export declare namespace AsyncAction {
     function createInstance(...params: ConstructorParameters<typeof AsyncActionRepo>): Promise<AsyncActionRepo>;
 }
-export type AsyncActionLegacy = AsyncActionLegacyRepo;
-export declare namespace AsyncActionLegacy {
-    function createInstance(...params: ConstructorParameters<typeof AsyncActionLegacyRepo>): Promise<AsyncActionLegacyRepo>;
-}
 export type Ticket = TicketRepo;
 export declare namespace Ticket {
     function createInstance(...params: ConstructorParameters<typeof TicketRepo>): Promise<TicketRepo>;

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.AsyncActionLegacy = exports.AsyncAction = exports.Task = exports.ScheduledTaskLegacy = 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.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 = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1044,17 +1044,6 @@ var ScheduledTask;
     }
     ScheduledTask.createInstance = createInstance;
 })(ScheduledTask || (exports.ScheduledTask = ScheduledTask = {}));
-var ScheduledTaskLegacy;
-(function (ScheduledTaskLegacy) {
-    let repo;
-    async function createInstance(...params) {
-        if (repo === undefined) {
-            repo = (await import('./repo/scheduledTaskLegacy.js')).ScheduledTaskLegacyRepo;
-        }
-        return new repo(...params);
-    }
-    ScheduledTaskLegacy.createInstance = createInstance;
-})(ScheduledTaskLegacy || (exports.ScheduledTaskLegacy = ScheduledTaskLegacy = {}));
 var Task;
 (function (Task) {
     let repo;
@@ -1066,28 +1055,28 @@ var Task;
     }
     Task.createInstance = createInstance;
 })(Task || (exports.Task = Task = {}));
-var AsyncAction;
-(function (AsyncAction) {
+var TaskDelayed;
+(function (TaskDelayed) {
     let repo;
     async function createInstance(...params) {
         if (repo === undefined) {
-            repo = (await import('./repo/asyncAction.js')).AsyncActionRepo;
+            repo = (await import('./repo/taskDelayed.js')).TaskDelayedRepo;
         }
         return new repo(...params);
     }
-    AsyncAction.createInstance = createInstance;
-})(AsyncAction || (exports.AsyncAction = AsyncAction = {}));
-var AsyncActionLegacy;
-(function (AsyncActionLegacy) {
+    TaskDelayed.createInstance = createInstance;
+})(TaskDelayed || (exports.TaskDelayed = TaskDelayed = {}));
+var AsyncAction;
+(function (AsyncAction) {
     let repo;
     async function createInstance(...params) {
         if (repo === undefined) {
-            repo = (await import('./repo/asyncActionLegacy.js')).AsyncActionLegacyRepo;
+            repo = (await import('./repo/asyncAction.js')).AsyncActionRepo;
         }
         return new repo(...params);
     }
-    AsyncActionLegacy.createInstance = createInstance;
-})(AsyncActionLegacy || (exports.AsyncActionLegacy = AsyncActionLegacy = {}));
+    AsyncAction.createInstance = createInstance;
+})(AsyncAction || (exports.AsyncAction = AsyncAction = {}));
 var Ticket;
 (function (Ticket) {
     let repo;

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,9 +27,9 @@ function executeAsyncActionById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, asyncActionHandler_1.executeAsyncAction)(task, (typeof next === 'function') ? next : undefined)(settings, {
+            await (0, asyncActionHandler_1.executeAsyncAction)(task, next)(settings, {
                 executeById: true,
-                executeByName: false
+                // executeByName: false // discontinue(2026-08-05~)
             });
         }
     };

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/order/confirmPayTransaction.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
+const util_1 = require("util");
 const factory_1 = require("../../factory");
 // import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
@@ -112,7 +113,9 @@ function onConfirmed(params) {
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };
+                const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
                 const onAssetTransactionStatusChangedTask = {
+                    identifier: taskIdentifier,
                     project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                     name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                     status: factory_1.factory.taskStatus.Ready,
@@ -122,7 +125,7 @@ function onConfirmed(params) {
                     executionResults: [],
                     data: onAssetTransactionStatusChangedTaskData
                 };
-                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+                await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
             }
         }
     };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js

@@ -62,7 +62,7 @@ function createSendOrderTaskIfNotExist(params) {
         };
         const taskIdentifier = `${sendOrderTaskData.project.id}:${factory_1.factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
         const sendOrderTask = {
-            alternateName: taskIdentifier,
+            // alternateName: taskIdentifier,
             identifier: taskIdentifier,
             project: params.order.project,
             name: factory_1.factory.taskName.SendOrder,
@@ -92,7 +92,7 @@ function createOnAuthorizationCreatedTask(order) {
             const taskRunsAt = new Date();
             const taskIdentifier = `${order.project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.transactionType.PlaceOrder}:${placeOrderTransaction?.id}`;
             const task = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 name: factory_1.factory.taskName.OnAuthorizationCreated,
                 status: factory_1.factory.taskStatus.Ready,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -53,7 +53,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
             const confirmPayTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -48,7 +48,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: params.order.project,
                 name: factory_1.factory.taskName.SendEmailMessage,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -6,7 +6,7 @@ type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broke
     orderStatus: factory.orderStatus.OrderProcessing;
 };
 type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'alternateName' | 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
-    alternateName: string;
+    alternateName?: never;
     identifier: string;
 };
 type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -142,7 +142,7 @@ function createCheckResourceTask(order) {
     };
     const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {
-        alternateName: taskIdentifier, // add identifier(2025-03-29~)
+        // alternateName: taskIdentifier, // add identifier(2025-03-29~)
         identifier: taskIdentifier, // add identifier(2025-03-29~)
         project: order.project,
         name: factory_1.factory.taskName.CheckResource,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -50,7 +50,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmReserveTransaction,

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

@@ -18,7 +18,6 @@ import type { ProductRepo } from '../repo/product';
 import type { ProjectRepo } from '../repo/project';
 import type { ReservationRepo } from '../repo/reservation';
 import type { SellerRepo } from '../repo/seller';
-import type { TaskRepo } from '../repo/task';
 export declare function deleteProject(params: {
     id: string;
 }): (repos: {
@@ -38,7 +37,6 @@ export declare function deleteProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 export declare function cleanUpDatabaseByProject(params: {
@@ -59,5 +57,4 @@ export declare function cleanUpDatabaseByProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/project.js

@@ -26,6 +26,5 @@ function cleanUpDatabaseByProject(params) {
         await repos.product.deleteByProject({ project: { id: params.id } });
         await repos.reservation.deleteByProject({ project: { id: params.id } });
         await repos.seller.deleteByProject({ project: { id: params.id } });
-        await repos.task.deleteByProject({ project: { id: params.id } });
     };
 }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -42,7 +42,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // );
                     const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
-                        alternateName: taskIdentifier,
+                        // alternateName: taskIdentifier,
                         identifier: taskIdentifier,
                         name: factory_1.factory.taskName.OnAuthorizationCreated,
                         status: factory_1.factory.taskStatus.Ready,

package/lib/chevre/service/scheduledTask.js

@@ -33,7 +33,7 @@ function executeScheduledTaskById(params) {
         if (task !== null) {
             await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
                 executeById: true,
-                executeByName: false
+                // executeByName: false // discontinue(2026-08-05~)
             });
         }
     };

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

@@ -7,9 +7,6 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-// import { OrderNumberRepo } from '../../repo/orderNumber';
-// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -19,14 +16,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
@@ -57,7 +50,6 @@ function call(params) {
             });
         }
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
@@ -86,8 +78,6 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +94,6 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    // orderInTransaction: new OrderInTransactionRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService

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

@@ -34,19 +34,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         let callResult;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

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

@@ -9,23 +9,17 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

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

@@ -247,7 +247,9 @@ function onConfirmed(params, options) {
                 },
                 useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
             };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
             const onAssetTransactionStatusChangedTask = {
+                identifier: taskIdentifier,
                 project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                 status: factory_1.factory.taskStatus.Ready,
@@ -257,7 +259,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+            await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
         }
     };
 }

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

@@ -10,10 +10,8 @@ const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
-// import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-// import { ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
@@ -24,17 +22,12 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const { savePaymentMethodIdInTransaction: _savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
             await (0, any_1.publishPaymentUrl)({
@@ -51,11 +44,9 @@ function call(params) {
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
                 orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-                // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
-                // project: new ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })