@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.20

package/lib/chevre/eventEmitter/task.d.ts

@@ -16,9 +16,6 @@ interface IReadyTask {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready;
-    remainingNumberOfTries?: never;
-    expires?: Date;
-    executionResult?: never;
 }
 /**
  * タスク名不明の遅延実行中タスク
@@ -27,9 +24,6 @@ interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
     name?: never;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
  * タスク名指定での遅延実行中タスク
@@ -38,35 +32,26 @@ interface IRunningTaskByName {
     id: string;
     status: factory.taskStatus.Running;
     name: factory.taskName;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
- * 実行後タスクイベント
+ * タスクステータス変更イベント発火時パラメータとしてのタスク
  */
-interface IExecutedTask {
+type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName;
+type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
+interface ITaskAsNextFunctionParam {
     id: string;
     status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
     name: factory.taskName;
-    executionResult: factory.task.IExecutionResult;
-    /**
-     * 実行されたタスクの残り試行回数
-     */
-    remainingNumberOfTries: number;
-    expires?: never;
 }
-type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
-type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
-type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
+type IAsyncActionNextFunction = (task: ITaskAsNextFunctionParam) => IOperationExecute<void>;
+type IOnTaskStatusChangedListener = (task: IChangedTask) => void;
 type RedisClientType = ReturnType<typeof createClient>;
 /**
  * タスクイベントエミッター
  */
 declare class TaskEventEmitter extends EventEmitter {
     onTaskStatusChanged(listener: IOnTaskStatusChangedListener): void;
-    emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
+    emitTaskStatusChanged(task: IChangedTask): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecuteSettings, IOnTaskStatusChangedListener, taskEventEmitter, ITaskAsNextFunctionParam, IAsyncActionNextFunction };

package/lib/chevre/eventEmitter/task.js

@@ -14,8 +14,8 @@ class TaskEventEmitter extends events_1.EventEmitter {
         this.on(EventName.OnTaskStatusChanged, listener);
     }
     // support next function required(2025-05-25~)
-    emitTaskStatusChanged(task, next) {
-        this.emit(EventName.OnTaskStatusChanged, task, (typeof next === 'function') ? next : undefined);
+    emitTaskStatusChanged(task) {
+        this.emit(EventName.OnTaskStatusChanged, task);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

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

@@ -1,6 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
-import { IModel, IDocType } from './mongoose/schemas/asyncAction';
+import { IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
 export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
@@ -9,7 +9,7 @@ type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project
  * 非同期アクション管理リポジトリ
  */
 export declare class AdminAsyncActionRepo {
-    readonly asyncActionModel: IModel;
+    private readonly asyncActionModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask>[];
     findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/scheduledTasks';
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+type IKeyOfProjection = keyof IDocType;
 type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status' | 'limit' | 'page' | 'sort'>;
 /**
  * 予定タスク管理リポジトリ

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

@@ -1,7 +1,7 @@
 import type { AnyKeys, Connection, FilterQuery, ProjectionType } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/task';
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 /**
  * タスク管理リポジトリ
  */
@@ -16,14 +16,34 @@ export declare class AdminTaskRepo {
      * 検索する
      */
     findTasks(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
-    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
-        expires?: Date;
+    /**
+     * cron:notifyLatency専用
+     */
+    countDelayedTasks(params: {
+        delayInSeconds: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
+        limit?: number;
+    }): Promise<{
+        count: number;
+    }>;
+    /**
+     * 不要なタスクを削除する
+     */
+    deleteRunsAtPassedCertainPeriod(params: {
+        runsAt: {
+            $lt: Date;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "name" | "description" | "project" | "identifier" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+        expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
-        expires?: Date;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "name" | "description" | "project" | "identifier" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+        expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/adminTask.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminTaskRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const task_1 = require("./mongoose/schemas/task");
 const AVAILABLE_PROJECT_FIELDS = [
-    'alternateName',
     'identifier',
     'description',
     'project',
@@ -19,7 +22,7 @@ const AVAILABLE_PROJECT_FIELDS = [
     'executor',
     'data',
     'dateAborted',
-    'expires'
+    // 'expires' // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 ];
 /**
  * タスク管理リポジトリ
@@ -99,10 +102,6 @@ class AdminTaskRepo {
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({ 'data.purpose.orderNumber': { $exists: true, $eq: objectPurposeOrderNumberEq } });
         }
-        const alternateNameRegex = params.alternateName?.$regex;
-        if (typeof alternateNameRegex === 'string' && alternateNameRegex.length > 0) {
-            andConditions.push({ alternateName: { $exists: true, $regex: new RegExp(alternateNameRegex) } });
-        }
         const identifierRegex = params.identifier?.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             andConditions.push({ identifier: { $exists: true, $regex: new RegExp(identifierRegex) } });
@@ -150,6 +149,42 @@ class AdminTaskRepo {
             .lean() // lean(2024-09-26~)
             .exec();
     }
+    /**
+     * cron:notifyLatency専用
+     */
+    async countDelayedTasks(params) {
+        const { limit } = params;
+        const runsAtLt = (0, moment_1.default)()
+            .add(-params.delayInSeconds, 'seconds')
+            .toDate();
+        const query = this.taskModel.countDocuments({
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: runsAtLt },
+            ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
+        });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
+    }
+    /**
+     * 不要なタスクを削除する
+     */
+    async deleteRunsAtPassedCertainPeriod(params) {
+        return this.taskModel.deleteMany({
+            runsAt: { $lt: params.runsAt.$lt },
+            status: {
+                $in: [
+                    factory_1.factory.taskStatus.Aborted,
+                    factory_1.factory.taskStatus.Executed,
+                    // factory.taskStatus.Expired // discontinue(2026-08-06~)
+                ]
+            }
+        })
+            .exec();
+    }
     getCursor(conditions, projection) {
         return this.taskModel.find(conditions, projection)
             .sort({ runsAt: factory_1.factory.sortType.Ascending })

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

@@ -0,0 +1,32 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+interface IAggregationByStatus {
+    taskCount: number;
+    avgLatency: number;
+    maxLatency: number;
+    minLatency: number;
+    percentilesLatency: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.taskStatus;
+    aggregation: IAggregationByStatus;
+}
+interface IAggregateTask {
+    statuses: IStatus[];
+}
+/**
+ * 予定タスク集計リポジトリ
+ */
+export declare class AggregateScheduledTaskRepo {
+    private readonly scheduledTaskModel;
+    constructor(connection: Connection);
+    aggregateScheduledTask(params: {
+        runsFrom: Date;
+        runsThrough: Date;
+    }): Promise<IAggregateTask>;
+    private agggregateByStatus;
+}
+export {};

package/lib/chevre/repo/aggregateScheduledTask.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateScheduledTaskRepo = void 0;
+const factory_1 = require("../factory");
+const scheduledTasks_1 = require("./mongoose/schemas/scheduledTasks");
+/**
+ * 予定タスク集計リポジトリ
+ */
+class AggregateScheduledTaskRepo {
+    scheduledTaskModel;
+    constructor(connection) {
+        this.scheduledTaskModel = connection.model(scheduledTasks_1.modelName, (0, scheduledTasks_1.createSchema)());
+    }
+    async aggregateScheduledTask(params) {
+        const statuses = await Promise.all([
+            factory_1.factory.taskStatus.Executed,
+            factory_1.factory.taskStatus.Aborted
+        ].map(async (taskStatus) => {
+            const matchConditions = {
+                status: { $eq: taskStatus },
+                runsAt: {
+                    $gte: params.runsFrom,
+                    $lte: params.runsThrough
+                },
+                // ...(typeof params.project?.id?.$ne === 'string')
+                //     ? { 'project.id': { $ne: params.project.id.$ne } }
+                //     : undefined
+            };
+            return this.agggregateByStatus({ matchConditions, status: taskStatus });
+        }));
+        return { statuses };
+    }
+    async agggregateByStatus(params) {
+        const matchConditions = params.matchConditions;
+        const taskStatus = params.status;
+        const aggregate1 = this.scheduledTaskModel.aggregate([
+            {
+                $match: matchConditions
+            },
+            {
+                $project: {
+                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                    status: '$status',
+                    runsAt: '$runsAt',
+                    lastTriedAt: '$lastTriedAt'
+                }
+            },
+            {
+                $group: {
+                    _id: '$status',
+                    taskCount: { $sum: 1 },
+                    maxLatency: { $max: '$latency' },
+                    minLatency: { $min: '$latency' },
+                    avgLatency: { $avg: '$latency' }
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    taskCount: '$taskCount',
+                    avgLatency: '$avgLatency',
+                    maxLatency: '$maxLatency',
+                    minLatency: '$minLatency'
+                }
+            }
+        ]);
+        // const explainResult = await aggregate1.explain();
+        // console.dir(explainResult, { depth: null });
+        // return;
+        const aggregations = await aggregate1.exec();
+        const percents = [50, 95, 99];
+        if (aggregations.length === 0) {
+            return {
+                status: taskStatus,
+                aggregation: {
+                    taskCount: 0,
+                    avgLatency: 0,
+                    maxLatency: 0,
+                    minLatency: 0,
+                    percentilesLatency: percents.map((percent) => {
+                        return {
+                            name: String(percent),
+                            value: 0
+                        };
+                    })
+                }
+            };
+        }
+        const ranks4percentile = percents.map((percentile) => {
+            return {
+                percentile,
+                rank: Math.floor(aggregations[0].taskCount * percentile / 100)
+            };
+        });
+        const aggregate2 = this.scheduledTaskModel.aggregate([
+            {
+                $match: matchConditions
+            },
+            {
+                $project: {
+                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                    status: '$status',
+                    runsAt: '$runsAt',
+                    lastTriedAt: '$lastTriedAt'
+                }
+            },
+            { $sort: { latency: 1 } },
+            {
+                $group: {
+                    _id: '$status',
+                    latencies: { $push: '$latency' }
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    percentilesLatency: ranks4percentile.map((rank) => {
+                        return {
+                            name: String(rank.percentile),
+                            value: { $arrayElemAt: ['$latencies', rank.rank] }
+                        };
+                    })
+                }
+            }
+        ]);
+        const aggregations2 = await aggregate2.exec();
+        return {
+            status: taskStatus,
+            aggregation: {
+                ...aggregations[0],
+                ...aggregations2[0]
+            }
+        };
+    }
+}
+exports.AggregateScheduledTaskRepo = AggregateScheduledTaskRepo;

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

@@ -1,6 +1,6 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IModel, IDocType } from './mongoose/schemas/asyncAction';
+import { IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
 type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'project' | 'runsAt' | 'status'> & {
     expires: Date;
@@ -11,7 +11,7 @@ type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
  * 非同期アクションリポジトリ
  */
 export declare class AsyncActionRepo {
-    readonly asyncActionModel: IModel;
+    private readonly asyncActionModel;
     constructor(connection: Connection);
     /**
      * Readyタスクをひとつ追加する

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -32,6 +32,7 @@ interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
 export interface IStorageSettings {
+    deleteTransactionTaskExpiresInDays: number;
     /**
      * 取引保管期間(Confirmed)
      * default:365

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -1,11 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = Omit<factory.task.ITask<factory.taskName>, 'id'> & {
-    /**
-     * 非同期アクション移行前のタスクには残っている(2026-07-29時点)
-     */
-    expires?: Date;
+type IDocType = Pick<factory.task.ITask<factory.taskName>, 'data' | 'dateAborted' | 'description' | 'executionResults' | 'executor' | 'identifier' | 'lastTriedAt' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
+    expires?: never;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -8,7 +8,6 @@ const settings_1 = require("../../../settings");
 const modelName = 'Task';
 exports.modelName = modelName;
 const schemaDefinition = {
-    alternateName: String, // add(2025-03-28~)
     identifier: String,
     description: String, // add(2025-03-30~)
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
@@ -22,7 +21,8 @@ const schemaDefinition = {
     executor: mongoose_1.SchemaTypes.Mixed,
     data: mongoose_1.SchemaTypes.Mixed,
     dateAborted: Date,
-    expires: Date // add(2024-04-23~)
+    // alternateName: String, // add(2025-03-28~) // identidfier移行完了につき廃止(2026-08-07~)
+    // expires: Date // add(2024-04-23~) // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -93,15 +93,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { expires: 1, runsAt: -1 },
-        {
-            name: 'expires',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
     [
         { remainingNumberOfTries: 1, runsAt: -1 },
         { name: 'searchByRemainingNumberOfTries-v2' }
@@ -177,6 +168,10 @@ const indexes = [
         { status: 1, runsAt: 1, name: 1 },
         { name: 'executeOneByNameIfExists' } // add(2025-03-08~)
     ],
+    [
+        { status: 1, name: 1, runsAt: 1 },
+        { name: 'runDelayedTaskByName' } // add(2026-08-05~)
+    ],
     [
         { status: 1, remainingNumberOfTries: 1, lastTriedAt: 1 },
         {
@@ -195,26 +190,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { status: 1, expires: 1 },
-        {
-            name: 'makeExpiredMany',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
-    [
-        // add unique index(2025-03-28~)
-        { alternateName: 1 },
-        {
-            unique: true,
-            name: 'uniqueAlternateName',
-            partialFilterExpression: {
-                alternateName: { $exists: true }
-            }
-        }
-    ],
     // add unique index(dev)(2025-03-28~)
     // add unique index(test,prod)(2026-07-08~)
     [
@@ -226,7 +201,21 @@ const indexes = [
                 identifier: { $exists: true }
             }
         }
-    ]
+    ],
+    // alternateNameへのインデックスはおそらくもう不要(2026-08-07~)
+    // dev,testではインデックス削除済(2026-08-07)
+    // prodでは削除予定(2026-08-??)
+    // [
+    //     // add unique index(2025-03-28~)
+    //     { alternateName: 1 },
+    //     {
+    //         unique: true,
+    //         name: 'uniqueAlternateName',
+    //         partialFilterExpression: {
+    //             alternateName: { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

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

@@ -79,7 +79,6 @@ export interface IPaymentMethodByPaymentUrl {
  */
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
-    private readonly transactionModel;
     constructor(connection: Connection);
     createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
@@ -177,8 +176,6 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     savePaymentMethodId(params: {
         id: string;
         paymentMethod: IPaymentMethodByPaymentUrl;
-    }, options: {
-        savePaymentMethodIdInTransaction: boolean;
     }): Promise<void>;
     /**
      * 進行中取引に保管された採用済決済方法を検索する

package/lib/chevre/repo/orderInTransaction.js

@@ -5,7 +5,11 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-const transaction_1 = require("./mongoose/schemas/transaction");
+// import {
+//     createSchema as createTransactionSchema,
+//     IModel as ITransactionModel, modelName as transactionModelName,
+//     IDocType as ITransactionDocType
+// } from './mongoose/schemas/transaction';
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -13,11 +17,11 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
-    transactionModel;
+    // private readonly transactionModel: ITransactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
-        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
+        // this.transactionModel = connection.model<ITransactionDocType, ITransactionModel>(transactionModelName, createTransactionSchema());
     }
     async createPlaceOrderIfNotExists(params) {
         const { orderNumber, project, identifier, broker, seller, customer } = params;
@@ -284,29 +288,33 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 特定の進行中取引の決済方法IDを保管する
      * transactionsへの保管としてひとまず定義(2026-07-11~)
      */
-    async savePaymentMethodId(params, options) {
-        const { savePaymentMethodIdInTransaction } = options;
+    async savePaymentMethodId(params) {
         const { paymentMethodId } = params.paymentMethod;
         if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
             throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
         }
-        if (savePaymentMethodIdInTransaction) {
-            await this.transactionModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-            }, {
-                $set: { 'object.paymentMethods': { paymentMethodId } }
-            }, {
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
-                }
-            });
-        }
+        // savePaymentMethodIdInTransactionは廃止(2026-08-04~)
+        // if (savePaymentMethodIdInTransaction) {
+        //     await this.transactionModel.findOneAndUpdate(
+        //         {
+        //             _id: { $eq: params.id },
+        //             status: { $eq: factory.transactionStatusType.InProgress }
+        //         },
+        //         {
+        //             $set: { 'object.paymentMethods': { paymentMethodId } }
+        //         },
+        //         {
+        //             projection: { _id: 1 }
+        //         }
+        //     )
+        //         .lean<{ _id: ObjectId }>()
+        //         .exec()
+        //         .then((doc) => {
+        //             if (doc === null) {
+        //                 throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        //             }
+        //         });
+        // }
         // 注文ドキュメントにも保管する(2026-07-12~)
         await this.orderModel.findOneAndUpdate({
             identifier: { $eq: params.id },