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

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

@@ -5,7 +5,7 @@ type ICreatingTaskKeys = 'data' | 'executionResults' | 'name' | 'numberOfTried'
 /**
  * リトライ可能なタスク作成属性
  */
-type ICreatingTask = (Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys>) & {
+type ICreatingTask = (Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.deleteTransaction.IAttributes, ICreatingTaskKeys>) & {
     expires: Date;
 };
 /**
@@ -64,11 +64,14 @@ export declare class ScheduledTaskRepo {
         status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
         executionResult: factory.task.IExecutionResult;
     }): Promise<void>;
+    /**
+     * cron:createImportEventCapacitiesTasksでの新タスク作成前に使用する
+     */
     deleteTooOldReadyTasks(params: {
         project: {
             id: string;
         };
-        name: factory.taskName;
+        name: factory.taskName.ImportEventCapacitiesFromCOA;
         runsAt: {
             $lt: Date;
         };

package/lib/chevre/repo/scheduledTask.js

@@ -40,15 +40,6 @@ class ScheduledTaskRepo {
                 .map((objectId) => {
                 return { id: objectId.toHexString() };
             });
-            // イベントは発火しない
-            // if (emitImmediately) {
-            //     savedTasks.forEach((savedTask) => {
-            //         taskEventEmitter.emitTaskStatusChanged({
-            //             id: savedTask.id,
-            //             status: factory.taskStatus.Ready
-            //         });
-            //     });
-            // }
             return savedTasks;
         }
         else {
@@ -80,7 +71,6 @@ class ScheduledTaskRepo {
         if (!(params.runsAt.$lt instanceof Date)) {
             throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
         }
-        // const { noEmitEvent } = options;
         const projection = {
             _id: 0,
             id: { $toString: '$_id' },
@@ -106,9 +96,6 @@ class ScheduledTaskRepo {
             new: true,
             projection,
             sort: { runsAt: factory_1.factory.sortType.Ascending } // ソートは、実行日時で固定化(2026-07-31~)
-            // ...(typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
-            //     ? { sort: params.sort }
-            //     : undefined
         })
             .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .lean()
@@ -116,18 +103,6 @@ class ScheduledTaskRepo {
         if (doc === null) {
             return null;
         }
-        // if (!noEmitEvent) {
-        //     const changedTask: IRunningTaskByName = {
-        //         id: doc.id,
-        //         status: factory.taskStatus.Running,
-        //         name: nameEq
-        //     };
-        //     taskEventEmitter.emitTaskStatusChanged(
-        //         changedTask,
-        //         // 現時点でタスク遅延実行ではnext指定なし(2026-07-30)
-        //         // (typeof next === 'function') ? next : undefined
-        //     );
-        // }
         return doc;
     }
     /**
@@ -162,6 +137,9 @@ class ScheduledTaskRepo {
         })
             .exec();
     }
+    /**
+     * cron:createImportEventCapacitiesTasksでの新タスク作成前に使用する
+     */
     async deleteTooOldReadyTasks(params) {
         return this.scheduledTaskModel.deleteMany({
             'project.id': { $eq: params.project.id },

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

@@ -1,28 +1,18 @@
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
-import { INextFunction } from '../eventEmitter/task';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IModel, IDocType } from './mongoose/schemas/task';
-import type { IExecutableTask } from '../taskSettings';
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+import { IDocType } from './mongoose/schemas/task';
 /**
  * リトライ可能なタスク作成属性
  */
 type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'> & {
-    expires?: Date;
+    expires?: never;
 };
 /**
  * タスクリポジトリ
  */
 export declare class TaskRepo {
-    readonly taskModel: IModel;
+    private readonly taskModel;
     constructor(connection: Connection);
-    runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
-        alternateName?: never;
-        identifier?: never;
-        expires: Date;
-    }, next: INextFunction): Promise<{
-        id: string;
-    }>;
     saveMany(taskAttributes: ICreatingTask[]): Promise<{
         id: string;
     }[]>;
@@ -39,110 +29,33 @@ export declare class TaskRepo {
         id: string;
         status: factory.taskStatus;
     } | undefined>;
+    /**
+     * イベント予約集計タスクの冗長な作成を避けるためのメソッド
+     */
+    findReadyAggregateEventTask(params: {
+        project: {
+            id: string;
+        };
+        reservationFor: {
+            id: string;
+        };
+    }): Promise<(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;
+    }) | null>;
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
+     * reimplement runTaskByIdentifier(2026-08-03~)
      */
-    createIfNotExistByAlternateName(params: ICreatingTask & {
-        alternateName: string;
+    runTaskByIdentifier(params: ICreatingTask & {
+        alternateName?: never;
         identifier: string;
         expires?: never;
     }): Promise<void>;
-    createOnAssetTransactionStatusChangedTaskIfNotExist(params: Pick<factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>): Promise<void>;
-    /**
-     * Ready -> remainingNumberOfTriesが1減る
-     * Running -> findOneするだけ
-     */
-    executeOneById(params: {
-        id: string;
-        status: factory.taskStatus.Ready | factory.taskStatus.Running;
-        executor: {
-            name: string;
-        };
-        expires?: Date;
-    }): Promise<IExecutableTask<factory.taskName> | null>;
-    /**
-     * Readyのタスクをname指定でひとつRunningに変更する
-     */
-    executeOneIfExists(params: {
-        name: {
-            $eq: factory.taskName;
-        };
-        executor: {
-            name: string;
-        };
-        runsAt: {
-            $lt: Date;
-        };
-        sort: {
-            numberOfTried?: factory.sortType;
-            runsAt?: factory.sortType;
-        };
-    }): Promise<IExecutableTask<factory.taskName> | null>;
-    /**
-     * add(2025-03-16~)
-     */
-    countPotentiallyRunning(params: {
-        name?: {
-            $eq?: factory.taskName;
-            $in?: factory.taskName[];
-        };
-        runsAt: {
-            $lt: Date;
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
-     */
-    emitRunningIfExists(params: {
-        /**
-         * 必ずタスク名指定で実行する
-         */
-        name: {
-            $eq: factory.taskName;
-            $in?: never;
-        } | {
-            $eq?: never;
-            $in: factory.taskName[];
-        };
-        runsAt: {
-            $lt: Date;
-        };
-        sort: {
-            numberOfTried?: factory.sortType;
-            runsAt?: factory.sortType;
-        };
-        executor: {
-            name: string;
-        };
-        nameFilterBeforeRunsAt: boolean;
-    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
-    /**
-     * Readyのままで期限切れのタスクをExpiredに変更する
-     */
-    makeExpiredMany(params: {
-        expiresLt: Date;
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
-     */
-    retryMany(params: {
-        intervalInMinutes: number;
-        /**
-         * リトライ条件に残り試行回数条件を追加する
-         * 十分に小さい数値を指定すれば、実質残り試行回数に関係なくRunningがReadyに変更されることになる
-         */
-        remainingNumberOfTries: {
-            $gte?: number;
-            $lte?: number;
-        };
-        name: {
-            $in?: factory.taskName[];
-        };
-    }): Promise<UpdateWriteOpResult>;
     /**
      * 実行中止済タスクを強制的にリトライ
      * 中止済タスクでなければ何もしない
@@ -150,66 +63,6 @@ export declare class TaskRepo {
     retryForciblyIfAborted(params: {
         id: string;
         remainingNumberOfTries: number;
-    }): Promise<UpdateWriteOpResult>;
-    abortMany(params: {
-        intervalInMinutes: number;
-        name: {
-            $in?: factory.taskName[];
-        };
-    }): Promise<UpdateWriteOpResult>;
-    /**
-     * タスクIDから実行結果とステータスを保管する
-     * Abortedの場合、dateAbortedもセットする
-     */
-    setExecutionResultAndStatus(params: {
-        /**
-         * タスクID
-         */
-        id: string;
-        remainingNumberOfTries: number;
-        name: factory.taskName;
-    }, update: {
-        status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
-        executionResult: factory.task.IExecutionResult;
-    }, next?: INextFunction): Promise<void>;
-    /**
-     * タスクの状態を参照する
-     * 非同期アクション移行が完了したら廃止する(2026-07-29~)
-     */
-    findTaskById(params: {
-        id: {
-            $eq: string;
-        };
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-        name: factory.taskName;
-    }, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
-        id: string;
-    } | undefined)>;
-    deleteByProject(params: {
-        project: {
-            id: string;
-        };
-    }): Promise<void>;
-    /**
-     * 不要なタスクを削除する
-     */
-    deleteRunsAtPassedCertainPeriod(params: {
-        runsAt: {
-            $lt: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
-    countDelayedTasks(params: {
-        delayInSeconds: number;
-        name: {
-            $nin?: factory.taskName[];
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};