@chevre/domain 25.2.0-alpha.9 → 26.0.0-alpha.0

package/lib/chevre/repo/place/section.d.ts

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, PipelineStage } from 'mongoose';
+import type { Connection, PipelineStage, mongo } from 'mongoose';
 import { factory } from '../../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 type ICreatingSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>;
@@ -57,7 +56,7 @@ export declare class SectionRepo {
     addSeatSectionsByBranchCodeIfNotExist(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     /**
      * コードをキーにして冪等編集
@@ -65,7 +64,7 @@ export declare class SectionRepo {
     updateSeatSectionsByBranchCode(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     migrateSectionIdentifier(screeningRoomSection: {
         project: {

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

@@ -37,8 +37,8 @@ export declare class PriceSpecificationRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -53,8 +53,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
@@ -70,8 +70,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -86,8 +86,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery, Types } from 'mongoose';
+import { Connection, FilterQuery, Types, mongo } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
@@ -65,7 +64,7 @@ export declare class ProductRepo {
         };
         $unset?: Partial<Record<IUnsetKey, 1>>;
     }[]): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedProducts?: {
             id: string;
         }[];
@@ -80,7 +79,7 @@ export declare class ProductRepo {
         hasOfferCatalog: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * プロジェクト指定で削除する
      */

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -1,5 +1,6 @@
-import { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../../factory';
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * レート制限キーインターフェース
  */
@@ -34,3 +35,4 @@ export declare class OfferRateLimitRepo {
     unlock(params: IRateLimitKey): Promise<void>;
     getHolder(ratelimitKey: IRateLimitKey): Promise<string | null>;
 }
+export {};

package/lib/chevre/repo/rateLimit/offer.js

@@ -28,7 +28,6 @@ class OfferRateLimitRepo {
      * ロックする
      * discontinue array params(2025-05-26~)
      */
-    // public async lock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
     async lock(params) {
         const key = OfferRateLimitRepo.createKey(params);
         const value = params.reservationNumber;
@@ -50,18 +49,8 @@ class OfferRateLimitRepo {
         catch (_error) {
             throw new factory_1.factory.errors.RateLimitExceeded('Offer');
         }
-        // const multi = this.redisClient.multi();
-        // multi.setNX(key, value)
-        //     .expire(key, ttl);
-        // const results = await multi.exec();
-        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-        //     return;
-        // } else {
-        //     throw new factory.errors.RateLimitExceeded('Offer');
-        // }
     }
     // discontinue array params(2025-05-26~)
-    // public async unlock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
     async unlock(params) {
         const key = OfferRateLimitRepo.createKey(params);
         // reimplement using concurrentLockRepo(2025-05-27~)
@@ -69,7 +58,6 @@ class OfferRateLimitRepo {
             about: { identifier: key, typeOf: 'Thing' },
             audience: { identifier: params.reservationNumber, typeOf: 'Audience' }
         });
-        // await this.redisClient.del(key);
     }
     async getHolder(ratelimitKey) {
         const key = OfferRateLimitRepo.createKey(ratelimitKey);

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult, mongo } from 'mongoose';
 import { IDocType } from './mongoose/schemas/reservation';
 import { factory } from '../factory';
 export interface IUpdatePartiallyParams {
@@ -77,7 +76,7 @@ export declare class ReservationRepo {
         reservationNumber: string;
         underName?: factory.reservation.IUnderName;
         broker?: factory.reservation.IBroker;
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
     /**
      * 予約取消
      */

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

@@ -0,0 +1,90 @@
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { factory } from '../factory';
+import type { IExecutableTask } from '../taskSettings';
+type ICreatingTaskKeys = 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description';
+/**
+ * リトライ可能なタスク作成属性
+ */
+type ICreatingTask = (Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys>) & {
+    expires: Date;
+};
+/**
+ * 予定タスクリポジトリ
+ */
+export declare class ScheduledTaskRepo {
+    private readonly scheduledTaskModel;
+    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ステータスに変更
+     */
+    runScheduledTaskIfExists(params: {
+        /**
+         * 必ずタスク名指定で実行する
+         */
+        name: {
+            $eq: factory.taskName;
+        };
+        runsAt: {
+            $lt: Date;
+        };
+        executor: {
+            name: string;
+        };
+    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    /**
+     * Running -> findOneするだけ
+     */
+    findRunningScheduledTaskById(params: {
+        id: string;
+    }): Promise<IExecutableTask<factory.taskName> | null>;
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    setExecutionResultAndStatus(params: {
+        /**
+         * タスクID
+         */
+        id: string;
+    }, update: {
+        status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
+        executionResult: factory.task.IExecutionResult;
+    }): Promise<void>;
+    deleteTooOldReadyTasks(params: {
+        project: {
+            id: string;
+        };
+        name: factory.taskName;
+        runsAt: {
+            $lt: Date;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    retryScheduledTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+    /**
+     * $eq:0をAbortedにする(タスク名称に関わらず)
+     * これらは中止されてもhubへ通知しない
+     */
+    abortScheduledTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+}
+export {};

package/lib/chevre/repo/scheduledTask.js

@@ -0,0 +1,223 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduledTaskRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const scheduledTasks_1 = require("./mongoose/schemas/scheduledTasks");
+const executableTaskProjection = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    // 必要最低限にprojection(2024-04-23~)
+    data: 1,
+    name: 1,
+    status: 1,
+    numberOfTried: 1,
+    project: 1,
+    remainingNumberOfTries: 1,
+    runsAt: 1,
+    expires: 1
+};
+/**
+ * 予定タスクリポジトリ
+ */
+class ScheduledTaskRepo {
+    scheduledTaskModel;
+    constructor(connection) {
+        this.scheduledTaskModel = connection.model(scheduledTasks_1.modelName, (0, scheduledTasks_1.createSchema)());
+    }
+    async addScheduledTasks(taskAttributes) {
+        if (taskAttributes.length > 0) {
+            const creatingTasks = taskAttributes;
+            const result = await this.scheduledTaskModel.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.scheduledTaskModel.countDocuments({
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            name: { $eq: nameEq },
+            runsAt: { $lt: params.runsAt.$lt }
+        });
+        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ステータスに変更
+     */
+    async runScheduledTaskIfExists(params) {
+        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' },
+            name: 1
+        };
+        const nameEq = params.name.$eq;
+        const filter = {
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            name: { $eq: nameEq },
+            runsAt: { $lt: params.runsAt.$lt }
+        };
+        const doc = await this.scheduledTaskModel.findOneAndUpdate(filter, {
+            $set: {
+                status: factory_1.factory.taskStatus.Running, // 実行中に変更
+                lastTriedAt: new Date(),
+                executor: params.executor
+            },
+            $inc: {
+                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                numberOfTried: 1 // トライ回数増やす
+            }
+        }, {
+            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()
+            .exec();
+        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;
+    }
+    /**
+     * Running -> findOneするだけ
+     */
+    async findRunningScheduledTaskById(params) {
+        const doc = await this.scheduledTaskModel.findOne({
+            _id: { $eq: params.id },
+            status: { $eq: factory_1.factory.taskStatus.Running },
+        }, executableTaskProjection)
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+        if (doc === null) {
+            return null;
+        }
+        return doc;
+    }
+    /**
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
+     */
+    async setExecutionResultAndStatus(params, update) {
+        const { id } = params;
+        const { status, executionResult } = update;
+        await this.scheduledTaskModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                status,
+                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+            },
+            $push: { executionResults: executionResult }
+        })
+            .exec();
+    }
+    async deleteTooOldReadyTasks(params) {
+        return this.scheduledTaskModel.deleteMany({
+            'project.id': { $eq: params.project.id },
+            name: { $eq: params.name },
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            runsAt: { $lt: params.runsAt.$lt }
+        })
+            .exec();
+    }
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    async retryScheduledTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.scheduledTaskModel.updateMany(
+        // retryOrAbortScheduledTasksインデックスと連動
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            remainingNumberOfTries: { $gte: 1 }, // まだリトライ可能なもの
+            lastTriedAt: {
+                $exists: true,
+                $lt: lastTriedAtShoudBeLessThan
+            },
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+    /**
+     * $eq:0をAbortedにする(タスク名称に関わらず)
+     * これらは中止されてもhubへ通知しない
+     */
+    async abortScheduledTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.scheduledTaskModel.updateMany(
+        // retryOrAbortScheduledTasksインデックスと連動
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            remainingNumberOfTries: { $eq: 0 },
+            lastTriedAt: {
+                $exists: true,
+                $lt: lastTriedAtShoudBeLessThan
+            },
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Aborted,
+                dateAborted: new Date()
+            }
+        })
+            .exec();
+    }
+}
+exports.ScheduledTaskRepo = ScheduledTaskRepo;

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection } from 'mongoose';
+import { Connection, mongo } from 'mongoose';
 import { factory } from '../factory';
 type IMakesOffer = Pick<factory.seller.IMakesOffer, 'typeOf' | 'availableAtOrFrom' | 'eligibleTransactionDuration'>;
 type IMakesOfferAsFindResult = IMakesOffer & {
@@ -51,7 +50,7 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
     /**
      * 販売者とアプリケーションに対してオファーが存在すれば削除する
      */
@@ -67,6 +66,6 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
 }
 export {};

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

@@ -16,7 +16,7 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
     /**
      * 座席をロックする
      */
-    lock(lockKey: ILockKey & {}): Promise<void>;
+    lock(lockKey: ILockKey): Promise<void>;
     /**
      * 座席ロックを解除する
      */