@chevre/domain 21.2.0-alpha.12 → 21.2.0-alpha.120

package/lib/chevre/repo/stockHolder.js

@@ -13,14 +13,16 @@ exports.StockHolderRepository = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");
+const holdReservation_1 = require("./mongoose/schemas/holdReservation");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:repo');
 /**
  * イベントストックホルダーリポジトリ
  */
 class StockHolderRepository {
-    constructor(redisClient) {
+    constructor(redisClient, connection) {
         this.redisClient = redisClient;
+        this.holdReservationModel = connection.model(holdReservation_1.modelName, holdReservation_1.schema);
     }
     // public static GET_KEY(params: {
     //     eventId: string;
@@ -37,6 +39,25 @@ class StockHolderRepository {
         }
         return `${params.seatSection}:${params.seatNumber}`;
     }
+    static offer2subReservation(params) {
+        var _a, _b;
+        const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
+        if (typeof serviceOutputId === 'string') {
+            return {
+                id: serviceOutputId,
+                identifier: serviceOutputId
+            };
+        }
+        return {
+            identifier: `${params.seatSection}:${params.seatNumber}`,
+            reservedTicket: {
+                ticketedSeat: {
+                    seatSection: params.seatSection,
+                    seatNumber: params.seatNumber
+                }
+            }
+        };
+    }
     static createKey(params) {
         if (!(params.startDate instanceof Date)) {
             throw new factory.errors.Argument('startDate', 'must be Date');
@@ -50,21 +71,62 @@ class StockHolderRepository {
             return `${StockHolderRepository.KEY_PREFIX}:${params.eventId}`;
         }
     }
+    /**
+     * 新リポジトリを使用するかどうか
+     */
+    static useMongoose(params) {
+        if (settings_1.USE_NEW_STOCK_HOLDER_REPO_IDS.includes(params.eventId)) {
+            return true;
+        }
+        return false;
+    }
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            yield this.redisClient.watch(key);
-            const hashCount = yield this.redisClient.hLen(key);
-            // Process result
-            // Heavy and time consuming operation here
-            debug('checking hash count...hashCount:', hashCount);
-            if (hashCount + lockKey.offers.length > maximum) {
-                throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
+            if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
+                // reservationCount<=nであれば$push+$incする
+                yield this.initializeHoldReservation({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                const addedReservationCount = lockKey.offers.length;
+                const reservationCountLte = maximum - addedReservationCount;
+                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const reservationPackage = {
+                    typeOf: factory.reservationType.ReservationPackage,
+                    reservationNumber: lockKey.holder,
+                    subReservation: subReservations
+                };
+                yield this.holdReservationModel.findOneAndUpdate({
+                    reservationCount: { $lte: reservationCountLte },
+                    'reservationFor.id': { $eq: lockKey.eventId },
+                    // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
+                    'reservations.subReservation.identifier': {
+                        $nin: subReservations.map((r) => r.identifier)
+                    }
+                }, {
+                    $inc: { reservationCount: addedReservationCount },
+                    $push: { reservations: reservationPackage }
+                }, { new: true })
+                    .select({ _id: 1 })
+                    .exec()
+                    .then((doc) => {
+                    if (doc === null) {
+                        throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
+                    }
+                });
+            }
+            else {
+                const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                yield this.redisClient.watch(key);
+                const hashCount = yield this.redisClient.hLen(key);
+                // Process result
+                // Heavy and time consuming operation here
+                debug('checking hash count...hashCount:', hashCount);
+                if (hashCount + lockKey.offers.length > maximum) {
+                    throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
+                }
+                yield this.lock(lockKey);
             }
-            yield this.lock(lockKey);
         });
     }
     /**
@@ -72,47 +134,76 @@ class StockHolderRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(lockKey.expires instanceof Date)) {
-                throw new factory.errors.Argument('expires', 'must be Date');
-            }
-            const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            yield this.checkIfConflicted({ key, eventId: lockKey.eventId });
-            const value = lockKey.holder;
-            const multi = this.redisClient.multi();
-            const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
-            fields.forEach((field) => {
-                multi.hSetNX(key, field, value);
-            });
-            const results = yield multi.expireAt(key, moment(lockKey.expires)
-                .unix())
-                .exec();
-            const lockedFields = [];
-            if (Array.isArray(results)) {
-                results.slice(0, fields.length)
-                    .forEach((r, index) => {
-                    if (r === 1 || r === true) {
-                        lockedFields.push(fields[index]);
+            if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
+                yield this.initializeHoldReservation({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                const addedReservationCount = lockKey.offers.length;
+                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const reservationPackage = {
+                    typeOf: factory.reservationType.ReservationPackage,
+                    reservationNumber: lockKey.holder,
+                    subReservation: subReservations
+                };
+                yield this.holdReservationModel.findOneAndUpdate({
+                    'reservationFor.id': { $eq: lockKey.eventId },
+                    // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
+                    'reservations.subReservation.identifier': {
+                        $nin: subReservations.map((r) => r.identifier)
+                    }
+                }, {
+                    $inc: { reservationCount: addedReservationCount },
+                    $push: { reservations: reservationPackage }
+                }, { new: true })
+                    .select({ _id: 1 })
+                    .exec()
+                    .then((doc) => {
+                    if (doc === null) {
+                        throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
                     }
                 });
             }
-            const lockedAll = lockedFields.length === fields.length;
-            debug('lockedAll?', lockedAll);
-            // expireAtReplyの検証も追加する(2023-04-19~)
-            const expiredAll = results.slice(fields.length)
-                .every((r) => (r === 1 || r === true));
-            debug('expiredAll?', expiredAll);
-            if (!lockedAll || !expiredAll) {
-                if (lockedFields.length > 0) {
-                    // 全て仮押さえできなければ仮押さえできたものは解除
-                    yield this.redisClient.multi()
-                        .hDel(key, lockedFields)
-                        .exec();
+            else {
+                if (!(lockKey.expires instanceof Date)) {
+                    throw new factory.errors.Argument('expires', 'must be Date');
                 }
-                if (!lockedAll) {
-                    throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                yield this.checkIfConflicted({ key, eventId: lockKey.eventId });
+                const value = lockKey.holder;
+                const multi = this.redisClient.multi();
+                const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
+                fields.forEach((field) => {
+                    multi.hSetNX(key, field, value);
+                });
+                const results = yield multi.expireAt(key, moment(lockKey.expires)
+                    .unix())
+                    .exec();
+                const lockedFields = [];
+                if (Array.isArray(results)) {
+                    results.slice(0, fields.length)
+                        .forEach((r, index) => {
+                        if (r === 1 || r === true) {
+                            lockedFields.push(fields[index]);
+                        }
+                    });
                 }
-                else {
-                    throw new factory.errors.ServiceUnavailable('timeout cannot be set unexpectedly');
+                const lockedAll = lockedFields.length === fields.length;
+                debug('lockedAll?', lockedAll);
+                // expireAtReplyの検証も追加する(2023-04-19~)
+                const expiredAll = results.slice(fields.length)
+                    .every((r) => (r === 1 || r === true));
+                debug('expiredAll?', expiredAll);
+                if (!lockedAll || !expiredAll) {
+                    if (lockedFields.length > 0) {
+                        // 全て仮押さえできなければ仮押さえできたものは解除
+                        yield this.redisClient.multi()
+                            .hDel(key, lockedFields)
+                            .exec();
+                    }
+                    if (!lockedAll) {
+                        throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                    }
+                    else {
+                        throw new factory.errors.ServiceUnavailable('timeout cannot be set unexpectedly');
+                    }
                 }
             }
         });
@@ -122,55 +213,126 @@ class StockHolderRepository {
      */
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            yield this.checkIfConflicted({ key, eventId: params.eventId });
-            const field = StockHolderRepository.offer2field(params.offer);
-            yield this.redisClient.multi()
-                .hDel(key, field)
-                .exec();
+            if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+                // [id]あるいは[seatNumber+seatSection]でreservations.subReservationsから$pull+$incする
+                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                const subReservation = StockHolderRepository.offer2subReservation(params.offer);
+                yield this.holdReservationModel.findOneAndUpdate({
+                    'reservationFor.id': { $eq: params.eventId },
+                    'reservations.subReservation.identifier': {
+                        $eq: subReservation.identifier
+                    }
+                }, {
+                    $inc: { reservationCount: -1 },
+                    $pull: { 'reservations.subReservation': { identifier: { $eq: subReservation.identifier } } }
+                }, { new: true })
+                    .select({ _id: 1 })
+                    .exec();
+                // docが存在しなくてもよい
+            }
+            else {
+                const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+                yield this.checkIfConflicted({ key, eventId: params.eventId });
+                const field = StockHolderRepository.offer2field(params.offer);
+                yield this.redisClient.multi()
+                    .hDel(key, field)
+                    .exec();
+            }
         });
     }
     /**
      * 空席でない座席を検索する
      */
-    findUnavailableOffersByEventId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const reply = yield this.redisClient.hGetAll(key);
-            let offers = [];
-            if (reply !== null) {
-                offers = Object.keys(reply)
-                    .map((field) => {
-                    const seatSection = field.split(':')[0];
-                    const seatNumber = field.split(':')[1];
-                    return { seatSection, seatNumber };
-                });
-            }
-            return offers;
-        });
-    }
+    // public async findUnavailableOffersByEventId(params: { eventId: string; startDate: Date }): Promise<IOffer[]> {
+    //     const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+    //     const reply = await this.redisClient.hGetAll(key);
+    //     let offers: IOffer[] = [];
+    //     if (reply !== null) {
+    //         offers = Object.keys(reply)
+    //             .map((field) => {
+    //                 const seatSection = field.split(':')[0];
+    //                 const seatNumber = field.split(':')[1];
+    //                 return { seatSection, seatNumber };
+    //             });
+    //     }
+    //     return offers;
+    // }
     /**
      * 空席でない座席をカウントする
      */
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-            const reply = yield this.redisClient.hLen(key);
-            let fieldCount = 0;
-            if (typeof reply === 'number') {
-                fieldCount = Number(reply);
+            if (StockHolderRepository.useMongoose({ eventId: params.event.id, startDate: params.event.startDate })) {
+                // reservationCountを返す
+                return this.holdReservationModel.findOne({
+                    'reservationFor.id': { $eq: params.event.id }
+                })
+                    .select({ reservationCount: 1 })
+                    .exec()
+                    .then((doc) => {
+                    if (doc === null) {
+                        return 0;
+                    }
+                    else {
+                        return doc.reservationCount;
+                    }
+                });
+            }
+            else {
+                const key = StockHolderRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
+                const reply = yield this.redisClient.hLen(key);
+                let fieldCount = 0;
+                if (typeof reply === 'number') {
+                    fieldCount = Number(reply);
+                }
+                return fieldCount;
             }
-            return fieldCount;
         });
     }
     /**
      * 保持者を取得する
      */
     getHolder(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const field = StockHolderRepository.offer2field(params.offer);
-            return this.redisClient.hGet(key, field);
+            if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+                // [id]あるいは[seatNumber+seatSection]でreservationNumberを返す
+                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                const subReservation = StockHolderRepository.offer2subReservation(params.offer);
+                const matchStages = [
+                    {
+                        $match: { 'reservationFor.id': { $eq: params.eventId } }
+                    },
+                    {
+                        $match: { 'reservations.subReservation.identifier': { $eq: subReservation.identifier } }
+                    }
+                ];
+                const aggregate = this.holdReservationModel.aggregate([
+                    { $unwind: '$reservations' },
+                    { $unwind: '$reservations.subReservation' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            reservationNumber: '$reservations.reservationNumber',
+                            identifier: '$reservations.subReservation.identifier'
+                        }
+                    }
+                ]);
+                const subReservations = yield aggregate.exec();
+                debug('getHolder found subReservations.', subReservation.identifier, subReservations);
+                if (subReservations.length > 0) {
+                    return String((_a = subReservations.shift()) === null || _a === void 0 ? void 0 : _a.reservationNumber);
+                }
+                else {
+                    return;
+                }
+            }
+            else {
+                const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+                const field = StockHolderRepository.offer2field(params.offer);
+                return this.redisClient.hGet(key, field);
+            }
         });
     }
     /**
@@ -207,17 +369,52 @@ class StockHolderRepository {
     // }
     searchHolders(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const fields = params.offers.map((o) => {
-                return StockHolderRepository.offer2field(o);
-            });
-            // Array reply: list of values associated with the given fields, in the same order as they are requested.
-            const result = yield this.redisClient.hmGet(key, fields);
-            if (!Array.isArray(result)) {
-                throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
+            if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+                // [id]あるいは[seatNumber+seatSection]のリストでreservationNumberのリストを返す
+                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                const subReservations = params.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const matchStages = [
+                    {
+                        $match: { 'reservationFor.id': { $eq: params.eventId } }
+                    },
+                    {
+                        $match: { 'reservations.subReservation.identifier': { $in: subReservations.map((r) => r.identifier) } }
+                    }
+                ];
+                const aggregate = this.holdReservationModel.aggregate([
+                    { $unwind: '$reservations' },
+                    { $unwind: '$reservations.subReservation' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            reservationNumber: '$reservations.reservationNumber',
+                            identifier: '$reservations.subReservation.identifier'
+                        }
+                    }
+                ]);
+                const subReservationsByDoc = yield aggregate.exec();
+                return subReservations.map((subReservation) => {
+                    const subReservationByDoc = subReservationsByDoc.find((r) => r.identifier === subReservation.identifier);
+                    return (subReservationByDoc !== undefined)
+                        ? String(subReservationByDoc.reservationNumber)
+                        // tslint:disable-next-line:no-null-keyword
+                        : null;
+                });
+            }
+            else {
+                const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+                const fields = params.offers.map((o) => {
+                    return StockHolderRepository.offer2field(o);
+                });
+                // Array reply: list of values associated with the given fields, in the same order as they are requested.
+                const result = yield this.redisClient.hmGet(key, fields);
+                if (!Array.isArray(result)) {
+                    throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
+                }
+                // そのまま返却(2023-04-17~)
+                return result;
             }
-            // そのまま返却(2023-04-17~)
-            return result;
         });
     }
     // public async migrateKey(params: {
@@ -267,6 +464,28 @@ class StockHolderRepository {
             }
         });
     }
+    initializeHoldReservation(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(params.startDate instanceof Date)) {
+                throw new factory.errors.Argument('startDate', 'must be Date');
+            }
+            const aggregateReservation = {
+                typeOf: 'AggregateReservation',
+                reservationCount: 0,
+                reservationFor: {
+                    id: params.eventId,
+                    startDate: params.startDate
+                },
+                reservations: []
+            };
+            const initializedHoldReservation = yield this.holdReservationModel.findOneAndUpdate({ 'reservationFor.id': { $eq: params.eventId } }, {
+                $setOnInsert: aggregateReservation
+            }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            debug('holdReservation initialized', initializedHoldReservation, params.eventId);
+        });
+    }
 }
 StockHolderRepository.KEY_PREFIX_NEW = 'stockHolder';
 StockHolderRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';

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

@@ -17,6 +17,9 @@ interface IStatus {
 export interface IAggregateTask {
     statuses: IStatus[];
 }
+interface IOptionOnCreate {
+    emitImmediately: boolean;
+}
 /**
  * タスクリポジトリ
  */
@@ -24,13 +27,43 @@ export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
-    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<{
+    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
-    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
+    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
+    executeById(params: {
+        id: string;
+        executor: {
+            name: string;
+        };
+    }): Promise<factory.task.ITask<factory.taskName> | null>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
+        executor: {
+            name: string;
+        };
     }): Promise<factory.task.ITask<T> | null>;
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params: {
+        now: Date;
+        /**
+         * 指定期間遅延しているタスクを実行する
+         */
+        delayInSeconds: number;
+        limit: number;
+        name: {
+            /**
+             * 指定タスクのみ実行する
+             */
+            $in?: factory.taskName[];
+            /**
+             * 指定タスク以外のみ実行する
+             */
+            $nin?: factory.taskName[];
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;
@@ -60,9 +93,19 @@ export declare class MongoRepository {
     }): Promise<void>;
     deleteByName(params: {
         name: factory.taskName;
+        status?: {
+            $eq?: factory.taskStatus;
+        };
+        runsAt?: {
+            $gte: Date;
+            $lte: Date;
+        };
     }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
     }): Promise<number>;
     aggregateTask(params: {
         project?: {