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

package/lib/chevre/repo/taskDelayed.js

@@ -0,0 +1,195 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskDelayedRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
+const task_1 = require("../eventEmitter/task");
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_2 = require("./mongoose/schemas/task");
+/**
+ * 遅延タスクリポジトリ
+ */
+class TaskDelayedRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
+    }
+    /**
+     * 潜在的に実行されるべきタスクをカウントする
+     * add(2025-03-16~)
+     */
+    async countPotentiallyRunning(params) {
+        const { runsAt, limit, name } = params;
+        const nameEq = name?.$eq;
+        const nameIn = name?.$in;
+        if (!(runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const query = this.taskModel.countDocuments({
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            ...(typeof nameEq === 'string' || Array.isArray(nameIn))
+                ? {
+                    name: {
+                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+                        ...(Array.isArray(nameIn)) ? { $in: nameIn } : undefined
+                    }
+                }
+                : undefined,
+            runsAt: { $lt: params.runsAt.$lt }
+        });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更する
+     */
+    async runDelayedTask(params) {
+        const { filter } = params;
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            name: 1
+        };
+        return this.taskModel.findOneAndUpdate(filter, {
+            $set: {
+                status: factory_1.factory.taskStatus.Running, // 実行中に変更
+                lastTriedAt: new Date(),
+                executor: params.executor
+            },
+            $inc: {
+                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                numberOfTried: 1 // トライ回数増やす
+            }
+        }, {
+            new: true,
+            projection,
+            sort: {
+                runsAt: factory_1.factory.sortType.Ascending // ソートはrunsAtで固定化(2026-08-07~)
+            }
+        })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     */
+    async runDelayedTaskIfExistsByName(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックスについては、name指定であれば'runDelayedTaskByName'を想定
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            name: params.name,
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            executor: params.executor
+        });
+        if (doc === null) {
+            return null;
+        }
+        const nameEq = params.name?.$eq;
+        let changedTask;
+        if (typeof nameEq === 'string') {
+            changedTask = {
+                id: doc.id,
+                status: factory_1.factory.taskStatus.Running,
+                name: nameEq
+            };
+        }
+        else {
+            changedTask = {
+                id: doc.id,
+                status: factory_1.factory.taskStatus.Running
+            };
+        }
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
+        return doc;
+    }
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     * 2026-08-06~
+     */
+    async runDelayedTaskIfExists(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        // インデックスについては、name未指定であれば'executeOneByNameIfExists'を想定
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.runDelayedTask({
+            filter,
+            executor: params.executor
+        });
+        if (doc === null) {
+            return null;
+        }
+        const changedTask = {
+            id: doc.id,
+            status: factory_1.factory.taskStatus.Running
+        };
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
+        return doc;
+    }
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    async retryTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            remainingNumberOfTries: { $gte: 1 },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            }
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+    /**
+     * $lte:0をReadyにする -> Readyにすれば自動的にAbortedになる
+     */
+    async retryAbortingTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            remainingNumberOfTries: { $lte: 0 },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            }
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+}
+exports.TaskDelayedRepo = TaskDelayedRepo;

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

@@ -0,0 +1,35 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+import type { IExecutableTask } from '../taskSettings';
+/**
+ * 実行中タスクリポジトリ
+ */
+export declare class TaskRunningRepo {
+    private readonly taskModel;
+    constructor(connection: Connection);
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
+    executeOneById(params: {
+        id: string;
+        status: factory.taskStatus.Ready | factory.taskStatus.Running;
+        executor: {
+            name: string;
+        };
+        expires?: never;
+    }): Promise<IExecutableTask<factory.taskName> | null>;
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    setExecutionResultAndStatus(params: {
+        /**
+         * タスクID
+         */
+        id: string;
+    }, update: {
+        status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
+        executionResult: factory.task.IExecutionResult;
+    }): Promise<void>;
+}

package/lib/chevre/repo/taskRunning.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskRunningRepo = void 0;
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_1 = require("./mongoose/schemas/task");
+const executableTaskProjection = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    // 必要最低限にprojection(2024-04-23~)
+    data: 1,
+    name: 1,
+    status: 1,
+    numberOfTried: 1,
+    project: 1,
+    remainingNumberOfTries: 1,
+    runsAt: 1,
+    // expires: 1 // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+};
+/**
+ * 実行中タスクリポジトリ
+ */
+class TaskRunningRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
+    }
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
+    async executeOneById(params) {
+        const now = new Date();
+        let doc;
+        if (params.status === factory_1.factory.taskStatus.Running) {
+            doc = await this.taskModel.findOne({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+            }, executableTaskProjection)
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        }
+        else {
+            doc = await this.taskModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+            }, {
+                $set: {
+                    status: factory_1.factory.taskStatus.Running, // 実行中に変更
+                    lastTriedAt: now,
+                    executor: params.executor
+                },
+                $inc: {
+                    remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                    numberOfTried: 1 // トライ回数増やす
+                }
+            }, { new: true, projection: executableTaskProjection })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // lean(2024-09-26~)
+                .exec();
+        }
+        if (doc === null) {
+            return null;
+        }
+        return doc;
+    }
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    async setExecutionResultAndStatus(params, update) {
+        const { id } = params;
+        const { status, executionResult } = update;
+        await this.taskModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                status,
+                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+            },
+            $push: { executionResults: executionResult }
+        })
+            .exec();
+    }
+}
+exports.TaskRunningRepo = TaskRunningRepo;

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

@@ -39,10 +39,4 @@ export declare class TicketRepo {
      */
     issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
     findTickets(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
-    /**
-     * 発行日時を一定期間過ぎたチケットを削除する
-     */
-    deleteTicketsByDateIssued(params: {
-        dateIssuedLt: Date;
-    }): Promise<void>;
 }

package/lib/chevre/repo/ticket.js

@@ -81,16 +81,5 @@ class TicketRepo {
             .lean() // 2024-08-20~
             .exec();
     }
-    /**
-     * 発行日時を一定期間過ぎたチケットを削除する
-     */
-    async deleteTicketsByDateIssued(params) {
-        await this.ticketModel.deleteMany({
-            dateIssued: {
-                $lt: params.dateIssuedLt
-            }
-        })
-            .exec();
-    }
 }
 exports.TicketRepo = TicketRepo;

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

@@ -1,37 +1,11 @@
-import type { Connection, UpdateQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/transaction';
-interface IAggregationByStatus {
-    transactionCount: number;
-    avgDuration: number;
-    maxDuration: number;
-    minDuration: number;
-    percentilesDuration: {
-        name: string;
-        value: number;
-    }[];
-}
-interface IStatus {
-    status: factory.transactionStatusType;
-    aggregation: IAggregationByStatus;
-}
-export interface IAggregatePlaceOrder {
-    statuses: IStatus[];
-}
 /**
  * 取引リポジトリ
  */
 export declare class TransactionRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    countPotentiallyExportTasks(params: {
-        endDate: {
-            $lt: Date;
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -53,27 +27,6 @@ export declare class TransactionRepo {
             startDate?: factory.sortType;
         };
     }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
-    /**
-     * tasksExportAction.actionStatusがActiveActionStatusのまま一定時間経過した取引について
-     * PotentialActionStatusに変更する
-     * 2025-03-10~
-     */
-    reExportAction(params: {
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
-     */
-    exportTasksMany(params: {
-        now: Date;
-        delayInSeconds: number;
-        status: {
-            $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">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -81,143 +34,4 @@ export declare class TransactionRepo {
     setTasksExportedById(params: {
         id: string;
     }): Promise<void>;
-    /**
-     * add(2025-03-13~)
-     */
-    countPotentiallyExpired(params: {
-        expires: {
-            $lt: Date;
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
-    /**
-     * add(2025-03-03~)
-     */
-    makeOneExpiredIfExists(params: {
-        expires: {
-            $lt: Date;
-        };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
-    /**
-     * 取引を期限切れにする
-     */
-    makeExpired(params: {
-        expires: {
-            $lt: Date;
-        };
-        limit: number;
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'>[]>;
-    findByIdAndDelete(params: {
-        id: string;
-    }): Promise<void>;
-    unsetUnnecessaryFields(params: {
-        filter: any;
-        $unset: any;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    updateById4migration(params: {
-        id: string;
-        update: UpdateQuery<IDocType>;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * 終了日時を一定期間過ぎたアクションを削除する
-     */
-    deleteEndDatePassedCertainPeriod(params: {
-        typeOf: factory.transactionType;
-        endDate: {
-            $gte: Date;
-            $lt: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
-    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;
-        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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
-        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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    })), 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;
-        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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
-        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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }))) | null>;
-    aggregatePlaceOrder(params: {
-        project?: {
-            id?: {
-                $ne?: string;
-            };
-        };
-        startFrom: Date;
-        startThrough: Date;
-        typeOf: factory.transactionType;
-        clientId?: string;
-    }): Promise<IAggregatePlaceOrder>;
-    private agggregateByStatus;
 }
-export {};