@chevre/domain 25.2.0-alpha.55 → 25.2.0-alpha.56

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

@@ -0,0 +1,52 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/task';
+type ICreatingTaskKeys = 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description';
+/**
+ * リトライ可能なタスク作成属性
+ */
+type ICreatingTask = Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys>;
+/**
+ * 予定タスクリポジトリ
+ */
+export declare class ScheduledTaskRepo {
+    readonly taskModel: IModel;
+    constructor(connection: Connection);
+    addScheduledTasks(taskAttributes: ICreatingTask[]): Promise<{
+        id: string;
+    }[]>;
+    countPotentiallyRunningScheduledTasks(params: {
+        name: {
+            $eq: factory.taskName;
+        };
+        runsAt: {
+            $lt: Date;
+        };
+        limit?: number;
+    }): Promise<{
+        count: number;
+    }>;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
+    emitRunningScheduledTaskIfExists(params: {
+        /**
+         * 必ずタスク名指定で実行する
+         */
+        name: {
+            $eq: 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>;
+}
+export {};

package/lib/chevre/repo/scheduledTask.js

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduledTaskRepo = void 0;
+const task_1 = require("../eventEmitter/task");
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_2 = require("./mongoose/schemas/task");
+/**
+ * 予定タスクリポジトリ
+ */
+class ScheduledTaskRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
+    }
+    async addScheduledTasks(taskAttributes) {
+        if (taskAttributes.length > 0) {
+            // resolve uniqueness of identifier(2025-03-27~)
+            const creatingTasks = taskAttributes.map(({ identifier, ...creatingTask }) => creatingTask); // eslint-disable-line @typescript-eslint/no-unused-vars
+            const result = await this.taskModel.insertMany(creatingTasks, { ordered: false, rawResult: true });
+            if (result.insertedCount !== taskAttributes.length) {
+                throw new factory_1.factory.errors.Internal('all tasks not saved');
+            }
+            const savedTasks = Object.values(result.insertedIds)
+                .map((objectId) => {
+                return { id: objectId.toHexString() };
+            });
+            // イベントは発火しない
+            // if (emitImmediately) {
+            //     savedTasks.forEach((savedTask) => {
+            //         taskEventEmitter.emitTaskStatusChanged({
+            //             id: savedTask.id,
+            //             status: factory.taskStatus.Ready
+            //         });
+            //     });
+            // }
+            return savedTasks;
+        }
+        else {
+            return [];
+        }
+    }
+    async countPotentiallyRunningScheduledTasks(params) {
+        const { runsAt, limit, name } = params;
+        const nameEq = name.$eq;
+        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 },
+            runsAt: { $lt: params.runsAt.$lt },
+            name: { $eq: nameEq }
+        });
+        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スタータスに変更した上で、Runningイベントを発生させる
+     */
+    async emitRunningScheduledTaskIfExists(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            name: 1
+        };
+        const nameEq = params.name.$eq;
+        const { nameFilterBeforeRunsAt } = params;
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            ...(nameFilterBeforeRunsAt) ? { name: params.name } : undefined,
+            runsAt: { $lt: params.runsAt.$lt },
+            ...(!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
+        };
+        const doc = await 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,
+            ...(typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
+                ? { sort: params.sort }
+                : undefined
+        })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+        if (doc === null) {
+            return null;
+        }
+        const changedTask = {
+            id: doc.id,
+            status: factory_1.factory.taskStatus.Running,
+            name: nameEq
+        };
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
+        return doc;
+    }
+}
+exports.ScheduledTaskRepo = ScheduledTaskRepo;

package/lib/chevre/repository.d.ts

@@ -88,6 +88,7 @@ import type { MemberSettingRepo } from './repo/setting/member';
 import type { RateLimitSettingRepo } from './repo/setting/rateLimit';
 import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
+import type { ScheduledTaskRepo } from './repo/scheduledTask';
 import type { TaskRepo } from './repo/task';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
@@ -477,6 +478,10 @@ export type StockHolder = StockHolderRepo;
 export declare namespace StockHolder {
     function createInstance(...params: ConstructorParameters<typeof StockHolderRepo>): Promise<StockHolderRepo>;
 }
+export type ScheduledTask = ScheduledTaskRepo;
+export declare namespace ScheduledTask {
+    function createInstance(...params: ConstructorParameters<typeof ScheduledTaskRepo>): Promise<ScheduledTaskRepo>;
+}
 export type Task = TaskRepo;
 export declare namespace Task {
     function createInstance(...params: ConstructorParameters<typeof TaskRepo>): Promise<TaskRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateAction = exports.AdminTask = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1000,6 +1000,17 @@ var StockHolder;
     }
     StockHolder.createInstance = createInstance;
 })(StockHolder || (exports.StockHolder = StockHolder = {}));
+var ScheduledTask;
+(function (ScheduledTask) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/scheduledTask.js')).ScheduledTaskRepo;
+        }
+        return new repo(...params);
+    }
+    ScheduledTask.createInstance = createInstance;
+})(ScheduledTask || (exports.ScheduledTask = ScheduledTask = {}));
 var Task;
 (function (Task) {
     let repo;

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.55"
+  "version": "25.2.0-alpha.56"
 }