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

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

@@ -36,13 +36,13 @@ export declare class AdminTaskRepo {
             $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, {}> & 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"> & {
+    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"> & {
+    }, 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

@@ -8,9 +8,7 @@ const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const task_1 = require("./mongoose/schemas/task");
-// | 'expires'; // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 const AVAILABLE_PROJECT_FIELDS = [
-    'alternateName',
     'identifier',
     'description',
     'project',
@@ -104,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) } });

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

@@ -1,7 +1,7 @@
 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'> & {
+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>;

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,6 +21,7 @@ const schemaDefinition = {
     executor: mongoose_1.SchemaTypes.Mixed,
     data: mongoose_1.SchemaTypes.Mixed,
     dateAborted: Date,
+    // alternateName: String, // add(2025-03-28~) // identidfier移行完了につき廃止(2026-08-07~)
     // expires: Date // add(2024-04-23~) // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 };
 const schemaOptions = {
@@ -93,16 +93,6 @@ const indexes = [
             }
         }
     ],
-    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
-    // [
-    //     { expires: 1, runsAt: -1 },
-    //     {
-    //         name: 'expires',
-    //         partialFilterExpression: {
-    //             expires: { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { remainingNumberOfTries: 1, runsAt: -1 },
         { name: 'searchByRemainingNumberOfTries-v2' }
@@ -200,27 +190,6 @@ const indexes = [
             }
         }
     ],
-    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
-    // [
-    //     { 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~)
     [
@@ -232,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/scheduledTask.d.ts

@@ -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

@@ -71,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' },
@@ -97,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()
@@ -141,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

@@ -39,7 +39,7 @@ export declare class TaskRepo {
         reservationFor: {
             id: string;
         };
-    }): Promise<(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"> & {
+    }): 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;

package/lib/chevre/service/asyncAction.js

@@ -27,10 +27,7 @@ function executeAsyncActionById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, asyncActionHandler_1.executeAsyncAction)(task, next)(settings, {
-                executeById: true,
-                // executeByName: false // discontinue(2026-08-05~)
-            });
+            await (0, asyncActionHandler_1.executeAsyncAction)(task, next)(settings, {});
         }
     };
 }

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

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

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

@@ -1,8 +1,5 @@
 import type { IExecuteSettings as IMinimumExecuteSettings, IRunningTask } from '../eventEmitter/task';
-import type { AggregationSettings } from '../taskSettings';
-interface IExecuteSettings extends IMinimumExecuteSettings {
-    aggregationSettings?: AggregationSettings;
-}
+type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * Runningの予定タスクを実行する

package/lib/chevre/service/scheduledTask.js

@@ -19,22 +19,15 @@ function executeScheduledTaskById(params) {
         const { id } = params;
         let task = null;
         try {
-            task = await scheduledTaskRepo.findRunningScheduledTaskById({
-                id,
-                // status,
-                // executor: { name: executor.name }
-            });
+            task = await scheduledTaskRepo.findRunningScheduledTaskById({ id });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('scheduledTaskRepo.findRunningScheduledTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
-                executeById: true,
-                // executeByName: false // discontinue(2026-08-05~)
-            });
+            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {});
         }
     };
 }

package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js

@@ -13,7 +13,7 @@ function onOperationFailed(params) {
             error = { message: String(error) };
         }
         const endDate = new Date();
-        // remainingNumberOfTries<=0ならAborted(2025-08-04~)
+        // remainingNumberOfTries<=0ならAborted
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             const result = {
@@ -35,7 +35,6 @@ function onOperationFailed(params) {
         }
         else {
             // 予定タスクは分析連携不要
-            // await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,

package/lib/chevre/service/scheduledTaskHandler.js

@@ -1,14 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeScheduledTask = executeScheduledTask;
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./scheduledTaskHandler/onOperationFailed");
-const debug = (0, debug_1.default)('chevre-domain:service:scheduledTaskHandler');
 exports.taskLoader = {
     load: (taskName) => {
         return import(`./task/${taskName}.js`);
@@ -19,18 +14,10 @@ exports.taskLoader = {
  */
 function executeScheduledTask(task) {
     const now = new Date();
-    debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const scheduledTaskRepo = new (await import('../repo/scheduledTask.js')).ScheduledTaskRepo(settings.connection);
         try {
             // 予定タスクのexpiresはDBのttl基準なので期限検証はしない
-            // if (task.expires instanceof Date) {
-            //     const taskExpired: boolean = moment(now)
-            //         .isAfter(task.expires);
-            //     if (taskExpired) {
-            //         throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
-            //     }
-            // }
             // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
             // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
             const { remainingNumberOfTries } = task;

package/lib/chevre/service/task.js

@@ -23,8 +23,7 @@ function executeTaskById(params) {
             task = await taskRunningRepo.executeOneById({
                 id,
                 status,
-                executor: { name: executor.name },
-                // ...(expires instanceof Date) ? { expires } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+                executor: { name: executor.name }
             });
         }
         catch (error) {
@@ -33,10 +32,7 @@ function executeTaskById(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task)(settings, {
-                executeById: true,
-                // executeByName: false // discontinue(2026-08-05~)
-            });
+            await (0, taskHandler_1.executeTask)(task)(settings, {});
         }
     };
 }

package/lib/chevre/service/taskHandler/onOperationFailed.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperationFailed = onOperationFailed;
-// import type { INextFunction } from '../../eventEmitter/task';
 const factory_1 = require("../../factory");
 const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
 /**

package/lib/chevre/service/taskHandler.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeTask = executeTask;
 const debug_1 = __importDefault(require("debug"));
-const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./taskHandler/onOperationFailed");
 const debug = (0, debug_1.default)('chevre-domain:service:taskHandler');
@@ -26,14 +25,7 @@ function executeTask(task) {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
         const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
         try {
-            // 期限検証(2024-04-23~)
-            if (task.expires instanceof Date) {
-                const taskExpired = (0, moment_1.default)(now)
-                    .isAfter(task.expires);
-                if (taskExpired) {
-                    throw new factory_1.factory.errors.Internal(`task expired [expires:${task.expires}]`);
-                }
-            }
+            // タスクのexpiresは廃止済なので期限検証はなし(2026-08-07~)
             // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
             // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
             const { remainingNumberOfTries } = task;
@@ -63,8 +55,7 @@ function executeTask(task) {
         }
         catch (error) {
             await (0, onOperationFailed_1.onOperationFailed)({
-                task, now, error,
-                // ...(typeof next === 'function') ? { next } : undefined // discontinue next(2026-08-05~)
+                task, now, error
             })({ setting: settingRepo, task: taskRepo, taskRunning: taskRunningRepo });
         }
     };

package/lib/chevre/taskSettings.d.ts

@@ -20,12 +20,10 @@ declare class AggregationSettings {
 interface IExecuteSettings extends IMinimumExecuteSettings {
     aggregationSettings?: AggregationSettings;
 }
-interface IExecuteOptions {
-    /**
-     * 現時点(2026-08-05)でリトライタスク、予定タスク、非同期アクション、全てID指定でしか実行されない
-     */
-    executeById: true;
-}
+/**
+ * かつてはexecuteById,executeByNameといったオプションが存在したが、現時点で特に何もなし(2026-08-07)
+ */
+type IExecuteOptions = Record<string, never>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0",
+    "@chevre/factory": "10.2.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.19"
+  "version": "26.0.0-alpha.20"
 }

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

@@ -1,27 +0,0 @@
-import type { Connection } from 'mongoose';
-/**
- * 予定タスク移行リポジトリ
- */
-export declare class ScheduledTaskMigrationRepo {
-    private readonly scheduledTaskModel;
-    private readonly taskModel;
-    constructor(connection: Connection);
-    /**
-     * DeleteTransactionタスク移行処理
-     */
-    migrateDeleteTransactionTasks(params: {
-        limit: number;
-        runsAtGte: Date;
-        expiresInDays: number;
-    }): Promise<(import("mongodb").BulkWriteResult & {
-        mongoose?: {
-            validationErrors: import("mongoose").Error[];
-        } | undefined;
-    }) | undefined>;
-    deleteLagacyTasks(params: {
-        limit: number;
-    }): Promise<import("mongodb").DeleteResult | undefined>;
-    deleteLagacyAsyncActions(params: {
-        limit: number;
-    }): Promise<import("mongodb").DeleteResult | undefined>;
-}

package/lib/chevre/repo/scheduledTaskMigration.js

@@ -1,121 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduledTaskMigrationRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
-const factory_1 = require("../factory");
-const scheduledTasks_1 = require("./mongoose/schemas/scheduledTasks");
-const task_1 = require("./mongoose/schemas/task");
-/**
- * 予定タスク移行リポジトリ
- */
-class ScheduledTaskMigrationRepo {
-    scheduledTaskModel;
-    taskModel;
-    constructor(connection) {
-        this.scheduledTaskModel = connection.model(scheduledTasks_1.modelName, (0, scheduledTasks_1.createSchema)());
-        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
-    }
-    /**
-     * DeleteTransactionタスク移行処理
-     */
-    async migrateDeleteTransactionTasks(params) {
-        const { limit, runsAtGte, expiresInDays } = params;
-        // limit件抽出
-        const migratingTasks = await this.taskModel.find({
-            // _id: { $eq: '6a66e83f9b21f3d4bf5fa232' },
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            name: { $eq: factory_1.factory.taskName.DeleteTransaction },
-            runsAt: { $gte: runsAtGte }
-        })
-            .limit(limit)
-            .lean()
-            .exec();
-        if (migratingTasks.length === 0) {
-            return;
-        }
-        ;
-        const bulkOps = migratingTasks.map((migratingTask) => {
-            return {
-                updateOne: {
-                    filter: {
-                        _id: { $eq: migratingTask._id }
-                    },
-                    update: {
-                        $setOnInsert: {
-                            ...migratingTask,
-                            expires: (0, moment_1.default)(migratingTask.runsAt)
-                                .add(expiresInDays, 'days')
-                                .toDate()
-                        }
-                    },
-                    upsert: true
-                }
-            };
-        });
-        // 新コレクションへ挿入
-        const result = await this.scheduledTaskModel.bulkWrite(bulkOps, { ordered: false });
-        // 新コレクションへ書き込めたIDだけを旧DBから削除
-        const successfulIds = [];
-        migratingTasks.forEach(d => successfulIds.push(d._id));
-        if (successfulIds.length > 0) {
-            await this.taskModel.deleteMany({ _id: { $in: successfulIds } })
-                .exec();
-        }
-        return result;
-    }
-    async deleteLagacyTasks(params) {
-        const { limit } = params;
-        const deletingTasks = await this.taskModel.find({
-            name: {
-                $in: [
-                    factory_1.factory.taskName.DeleteTransaction,
-                    factory_1.factory.taskName.ImportEventsFromCOA,
-                    factory_1.factory.taskName.ImportEventCapacitiesFromCOA
-                ]
-            }
-        }, { _id: 1 })
-            .limit(limit)
-            .lean()
-            .exec();
-        // console.log(deletingTasks);
-        if (deletingTasks.length === 0) {
-            return;
-        }
-        ;
-        return this.taskModel.deleteMany({
-            _id: { $in: deletingTasks.map((doc) => doc._id) }
-        })
-            .exec();
-    }
-    async deleteLagacyAsyncActions(params) {
-        const { limit } = params;
-        const deletingTasks = await this.taskModel.find({
-            name: {
-                $in: [
-                    factory_1.factory.taskName.AcceptCOAOffer,
-                    factory_1.factory.taskName.AuthorizePayment,
-                    factory_1.factory.taskName.CheckMovieTicket,
-                    factory_1.factory.taskName.PublishPaymentUrl,
-                    factory_1.factory.taskName.VoidReserveTransaction
-                ]
-            },
-            expires: { $exists: true, $lte: new Date() }
-        }, { _id: 1 })
-            .limit(limit)
-            .lean()
-            .exec();
-        // console.log(deletingTasks);
-        if (deletingTasks.length === 0) {
-            return;
-        }
-        ;
-        return this.taskModel.deleteMany({
-            _id: { $in: deletingTasks.map((doc) => doc._id) }
-        })
-            .exec();
-    }
-}
-exports.ScheduledTaskMigrationRepo = ScheduledTaskMigrationRepo;