@chevre/domain 26.0.0-alpha.4 → 26.0.0-alpha.41

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

@@ -4,11 +4,11 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
+const factory_1 = require("../../../factory");
 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 +22,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,
@@ -51,115 +52,55 @@ const schemaOptions = {
 const indexes = [
     [
         { 'project.id': 1, runsAt: -1 },
-        { name: 'searchByProjectId-v20220721' }
+        { name: 'searchByProjectId-v20220721' } // タスク検索で使用中
     ],
     [
         { name: 1, runsAt: -1 },
-        { name: 'searchByName-v2' }
+        { name: 'searchByName-v2' } // タスク検索で使用中
     ],
     [
         { status: 1, runsAt: -1 },
-        { name: 'searchByStatus-v2' }
+        { name: 'searchByStatus-v2' } // タスク検索で使用中
     ],
     [
         { runsAt: -1 },
-        { name: 'searchByRunsAt-v2' }
-    ],
-    [
-        // identifier追加(2023-09-01~)
-        { identifier: 1, runsAt: -1 },
-        {
-            name: 'searchByIdentifier',
-            partialFilterExpression: {
-                identifier: { $exists: true }
-            }
-        }
+        { name: 'searchByRunsAt-v2' } // タスク検索で使用中
     ],
+    // identifierはユニークインデックス有なので不要(2026-08-07~)
+    // [
+    //     // identifier追加(2023-09-01~)
+    //     { identifier: 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByIdentifier',
+    //         partialFilterExpression: {
+    //             identifier: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { dateAborted: 1, runsAt: -1 },
         {
-            name: 'searchByDateAborted',
+            name: 'searchByDateAborted', // notifyAbortedTasksByEmailで使用中
             partialFilterExpression: {
                 dateAborted: { $type: 'date' }
             }
         }
     ],
-    [
-        { lastTriedAt: 1, runsAt: -1 },
-        {
-            name: 'searchByLastTriedAt-v2',
-            partialFilterExpression: {
-                lastTriedAt: { $type: 'date' }
-            }
-        }
-    ],
-    [
-        { expires: 1, runsAt: -1 },
-        {
-            name: 'expires',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
-    [
-        { remainingNumberOfTries: 1, runsAt: -1 },
-        { name: 'searchByRemainingNumberOfTries-v2' }
-    ],
-    [
-        { 'data.agent.id': 1, runsAt: -1 },
-        {
-            name: 'searchByDataAgentId',
-            partialFilterExpression: {
-                'data.agent.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.object.orderNumber': 1, runsAt: -1 },
-        {
-            name: 'searchByDataObjectOrderNumber',
-            partialFilterExpression: {
-                'data.object.orderNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.object.transactionNumber': 1, runsAt: -1 },
-        {
-            name: 'searchByDataObjectTransactionNumber',
-            partialFilterExpression: {
-                'data.object.transactionNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.object.id': 1, runsAt: -1 },
-        {
-            name: 'searchByDataObjectId',
-            partialFilterExpression: {
-                'data.object.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.purpose.id': 1, runsAt: -1 },
-        {
-            name: 'searchByDataPurposeId',
-            partialFilterExpression: {
-                'data.purpose.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'data.purpose.orderNumber': 1, runsAt: -1 },
-        {
-            name: 'searchByDataPurposeOrderNumber',
-            partialFilterExpression: {
-                'data.purpose.orderNumber': { $exists: true }
-            }
-        }
-    ],
+    // discontinue(2026-08-08~)
+    // [
+    //     { lastTriedAt: 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByLastTriedAt-v2',
+    //         partialFilterExpression: {
+    //             lastTriedAt: { $type: 'date' }
+    //         }
+    //     }
+    // ],
+    // discontinue(2026-08-08~)
+    // [
+    //     { remainingNumberOfTries: 1, runsAt: -1 },
+    //     { name: 'searchByRemainingNumberOfTries-v2' }
+    // ],
     [
         { 'data.id': 1, runsAt: -1 },
         {
@@ -169,14 +110,19 @@ const indexes = [
             }
         }
     ],
-    [
-        { status: 1, name: 1, numberOfTried: 1, runsAt: 1 },
-        { name: 'executeOneByName' }
-    ],
+    // 遅延タスク実行時のソート条件をrunsAtのみに統一したため、numberOfTriedを含めたインデックスはもう不要(2026-08-08~)
+    // [
+    //     { status: 1, name: 1, numberOfTried: 1, runsAt: 1 },
+    //     { name: 'executeOneByName' }
+    // ],
     [
         { 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 +141,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,9 +152,99 @@ 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 }
+    //         }
+    //     }
+    // ],
+    // ペイロード特定検索用はひとまず廃止(2026-08-07~)
+    // [
+    //     { 'data.agent.id': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataAgentId',
+    //         partialFilterExpression: {
+    //             'data.agent.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'data.object.orderNumber': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataObjectOrderNumber',
+    //         partialFilterExpression: {
+    //             'data.object.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'data.object.transactionNumber': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataObjectTransactionNumber',
+    //         partialFilterExpression: {
+    //             'data.object.transactionNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'data.object.id': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataObjectId',
+    //         partialFilterExpression: {
+    //             'data.object.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'data.purpose.id': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataPurposeId',
+    //         partialFilterExpression: {
+    //             'data.purpose.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'data.purpose.orderNumber': 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByDataPurposeOrderNumber',
+    //         partialFilterExpression: {
+    //             'data.purpose.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
+const EXPIRE_AFTER_SECONDS = typeof process.env.TASK_EXPIRE_AFTER_SECONDS === 'string'
+    ? Number(process.env.TASK_EXPIRE_AFTER_SECONDS)
+    : undefined;
+// 0より大きい数値が設定されている場合のみ ttlインデックスを追加
+if (typeof EXPIRE_AFTER_SECONDS === 'number' && EXPIRE_AFTER_SECONDS > 0) {
+    indexes.push([
+        { runsAt: 1 },
+        {
+            name: 'ttlByRunsAt',
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            partialFilterExpression: {
+                status: {
+                    $in: [
+                        factory_1.factory.taskStatus.Aborted,
+                        factory_1.factory.taskStatus.Executed
+                    ]
+                }
+            }
+        }
+    ]);
+}
 /**
  * タスクスキーマ
  */

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

@@ -41,8 +41,15 @@ const schemaOptions = {
 const indexes = [
     [
         { dateIssued: 1 },
-        { name: 'searchByDateIssued' }
+        {
+            name: 'ttlByDateIssued', // support ttl index(2026-08-09~)
+            expireAfterSeconds: 604800 // 7 days
+        }
     ],
+    // [
+    //     { dateIssued: 1 },
+    //     { name: 'searchByDateIssued' }
+    // ],
     [
         { 'project.id': 1, dateIssued: 1 },
         { name: 'searchByProjectId' }

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 },

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 },