@chevre/domain 26.0.0-alpha.11 → 26.0.0-alpha.12

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

@@ -93,15 +93,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { expires: 1, runsAt: -1 },
-        {
-            name: 'expires',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
+    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+    // [
+    //     { expires: 1, runsAt: -1 },
+    //     {
+    //         name: 'expires',
+    //         partialFilterExpression: {
+    //             expires: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { remainingNumberOfTries: 1, runsAt: -1 },
         { name: 'searchByRemainingNumberOfTries-v2' }
@@ -195,15 +196,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { status: 1, expires: 1 },
-        {
-            name: 'makeExpiredMany',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
+    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+    // [
+    //     { status: 1, expires: 1 },
+    //     {
+    //         name: 'makeExpiredMany',
+    //         partialFilterExpression: {
+    //             expires: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         // add unique index(2025-03-28~)
         { alternateName: 1 },

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

@@ -18,4 +18,10 @@ export declare class ScheduledTaskMigrationRepo {
             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

@@ -66,5 +66,56 @@ class ScheduledTaskMigrationRepo {
         }
         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;

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

@@ -1,7 +1,7 @@
 import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/task';
+import { IDocType } from './mongoose/schemas/task';
 import type { IExecutableTask } from '../taskSettings';
 /**
  * リトライ可能なタスク作成属性
@@ -13,7 +13,7 @@ type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | '
  * タスクリポジトリ
  */
 export declare class TaskRepo {
-    readonly taskModel: IModel;
+    private readonly taskModel;
     constructor(connection: Connection);
     saveMany(taskAttributes: ICreatingTask[]): Promise<{
         id: string;
@@ -31,6 +31,23 @@ 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, {}> & 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;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    } & {
+        __v: number;
+    }) | null>;
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)

package/lib/chevre/repo/task.js

@@ -87,6 +87,18 @@ class TaskRepo {
         const { id, status } = doc;
         return { id, status };
     }
+    /**
+     * イベント予約集計タスクの冗長な作成を避けるためのメソッド
+     */
+    async findReadyAggregateEventTask(params) {
+        return this.taskModel.findOne({
+            'project.id': { $eq: params.project.id },
+            name: { $eq: factory_1.factory.taskName.AggregateScreeningEvent },
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            'data.id': { $exists: true, $eq: params.reservationFor.id }
+        }, { _id: 1 })
+            .exec();
+    }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.11"
+  "version": "26.0.0-alpha.12"
 }