@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/repo/stockHolder.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolderRepo = void 0;
 // import type { RedisClientType } from 'redis';
@@ -18,6 +9,9 @@ const SEARCH_OFFERS_MAX_LENGTH = 100;
  * 保留予約リポジトリ
  */
 class StockHolderRepo {
+    // public static KEY_PREFIX_NEW: string = 'stockHolder';
+    // private readonly redisClient: RedisClientType | undefined;
+    pendingReservationRepo;
     constructor(params) {
         const { connection } = params;
         // this.redisClient = redisClient;
@@ -48,215 +42,203 @@ class StockHolderRepo {
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
-    lockIfNotLimitExceeded(lockKey, maximum) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const useMongoose = this.useMongoose({
-                project: { id: lockKey.project.id },
-                eventId: lockKey.eventId,
-                startDate: lockKey.startDate,
-                hasTicketedSeat: lockKey.hasTicketedSeat
-            });
-            if (useMongoose) {
-                return this.pendingReservationRepo.lockIfNotLimitExceeded(lockKey, maximum);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-                // await this.redisClient.watch(key);
-                // const hashCount = await this.redisClient.hLen(key);
-                // if (hashCount + lockKey.offers.length > maximum) {
-                //     throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
-                // }
-                // await this.lock(lockKey);
-            }
+    async lockIfNotLimitExceeded(lockKey, maximum) {
+        const useMongoose = this.useMongoose({
+            project: { id: lockKey.project.id },
+            eventId: lockKey.eventId,
+            startDate: lockKey.startDate,
+            hasTicketedSeat: lockKey.hasTicketedSeat
         });
+        if (useMongoose) {
+            return this.pendingReservationRepo.lockIfNotLimitExceeded(lockKey, maximum);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            // await this.redisClient.watch(key);
+            // const hashCount = await this.redisClient.hLen(key);
+            // if (hashCount + lockKey.offers.length > maximum) {
+            //     throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
+            // }
+            // await this.lock(lockKey);
+        }
     }
     /**
      * 座席をロックする
      */
     // tslint:disable-next-line:max-func-body-length
-    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 useMongoose = this.useMongoose({
-                project: { id: lockKey.project.id },
-                eventId: lockKey.eventId,
-                startDate: lockKey.startDate,
-                hasTicketedSeat: lockKey.hasTicketedSeat
-            });
-            // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            // await this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
-            if (useMongoose) {
-                return this.pendingReservationRepo.lock(lockKey);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const value = lockKey.holder;
-                // const multi = this.redisClient.multi();
-                // const fields = lockKey.offers.map((offer) => StockHolderRepo.offer2field(offer, lockKey.hasTicketedSeat));
-                // // check uniqueness(2025-04-20~)
-                // const uniqueFields = [...new Set(fields)];
-                // if (uniqueFields.length !== fields.length) {
-                //     throw new factory.errors.Argument('offers', 'offers must be unique');
-                // }
-                // fields.forEach((field) => {
-                //     multi.hSetNX(key, field, value);
-                // });
-                // const results = await multi.expireAt(
-                //     key,
-                //     moment(lockKey.expires)
-                //         .unix()
-                // )
-                //     .exec();
-                // const lockedFields: string[] = [];
-                // if (Array.isArray(results)) {
-                //     results.slice(0, fields.length)
-                //         .forEach((r, index) => {
-                //             if (r === 1 || (<any>r) === true) {
-                //                 lockedFields.push(fields[index]);
-                //             }
-                //         });
-                // }
-                // const lockedAll = lockedFields.length === fields.length;
-                // // expireAtReplyの検証も追加する(2023-04-19~)
-                // const expiredAll = results.slice(fields.length)
-                //     .every((r) => (r === 1 || (<any>r) === true));
-                // if (!lockedAll || !expiredAll) {
-                //     if (lockedFields.length > 0) {
-                //         // 全て仮押さえできなければ仮押さえできたものは解除
-                //         await 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.Internal('timeout cannot be set unexpectedly');
-                //     }
-                // }
-            }
+    async lock(lockKey) {
+        if (!(lockKey.expires instanceof Date)) {
+            throw new factory.errors.Argument('expires', 'must be Date');
+        }
+        const useMongoose = this.useMongoose({
+            project: { id: lockKey.project.id },
+            eventId: lockKey.eventId,
+            startDate: lockKey.startDate,
+            hasTicketedSeat: lockKey.hasTicketedSeat
         });
+        // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+        // await this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
+        if (useMongoose) {
+            return this.pendingReservationRepo.lock(lockKey);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const value = lockKey.holder;
+            // const multi = this.redisClient.multi();
+            // const fields = lockKey.offers.map((offer) => StockHolderRepo.offer2field(offer, lockKey.hasTicketedSeat));
+            // // check uniqueness(2025-04-20~)
+            // const uniqueFields = [...new Set(fields)];
+            // if (uniqueFields.length !== fields.length) {
+            //     throw new factory.errors.Argument('offers', 'offers must be unique');
+            // }
+            // fields.forEach((field) => {
+            //     multi.hSetNX(key, field, value);
+            // });
+            // const results = await multi.expireAt(
+            //     key,
+            //     moment(lockKey.expires)
+            //         .unix()
+            // )
+            //     .exec();
+            // const lockedFields: string[] = [];
+            // if (Array.isArray(results)) {
+            //     results.slice(0, fields.length)
+            //         .forEach((r, index) => {
+            //             if (r === 1 || (<any>r) === true) {
+            //                 lockedFields.push(fields[index]);
+            //             }
+            //         });
+            // }
+            // const lockedAll = lockedFields.length === fields.length;
+            // // expireAtReplyの検証も追加する(2023-04-19~)
+            // const expiredAll = results.slice(fields.length)
+            //     .every((r) => (r === 1 || (<any>r) === true));
+            // if (!lockedAll || !expiredAll) {
+            //     if (lockedFields.length > 0) {
+            //         // 全て仮押さえできなければ仮押さえできたものは解除
+            //         await 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.Internal('timeout cannot be set unexpectedly');
+            //     }
+            // }
+        }
     }
     /**
      * 座席ロックを解除する
      */
-    unlock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const useMongoose = this.useMongoose({
-                project: { id: params.project.id },
-                eventId: params.eventId,
-                startDate: params.startDate,
-                hasTicketedSeat: params.hasTicketedSeat
-            });
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // await this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
-            if (useMongoose) {
-                return this.pendingReservationRepo.unlock(params);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-                // await this.redisClient.multi()
-                //     .hDel(key, field)
-                //     .exec();
-            }
+    async unlock(params) {
+        const useMongoose = this.useMongoose({
+            project: { id: params.project.id },
+            eventId: params.eventId,
+            startDate: params.startDate,
+            hasTicketedSeat: params.hasTicketedSeat
         });
+        // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
+        // await this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
+        if (useMongoose) {
+            return this.pendingReservationRepo.unlock(params);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
+            // await this.redisClient.multi()
+            //     .hDel(key, field)
+            //     .exec();
+        }
     }
     /**
      * 空席でない座席をカウントする
      */
-    countUnavailableOffers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.useMongoose({
-                project: { id: params.project.id },
-                eventId: params.event.id,
-                startDate: params.event.startDate,
-                hasTicketedSeat: params.event.hasTicketedSeat
-            })) {
-                return this.pendingReservationRepo.countUnavailableOffers(params);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const key = StockHolderRepo.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-                // const reply = await this.redisClient.hLen(key);
-                // let fieldCount: number = 0;
-                // if (typeof reply === 'number') {
-                //     fieldCount = Number(reply);
-                // }
-                // return fieldCount;
-            }
-        });
+    async countUnavailableOffers(params) {
+        if (this.useMongoose({
+            project: { id: params.project.id },
+            eventId: params.event.id,
+            startDate: params.event.startDate,
+            hasTicketedSeat: params.event.hasTicketedSeat
+        })) {
+            return this.pendingReservationRepo.countUnavailableOffers(params);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const key = StockHolderRepo.createKey({ eventId: params.event.id, startDate: params.event.startDate });
+            // const reply = await this.redisClient.hLen(key);
+            // let fieldCount: number = 0;
+            // if (typeof reply === 'number') {
+            //     fieldCount = Number(reply);
+            // }
+            // return fieldCount;
+        }
     }
     /**
      * 保持者を取得する
      */
-    getHolder(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.useMongoose({
-                project: { id: params.project.id },
-                eventId: params.eventId,
-                startDate: params.startDate,
-                hasTicketedSeat: params.hasTicketedSeat
-            })) {
-                return this.pendingReservationRepo.getHolder(params);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-                // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-                // return this.redisClient.hGet(key, field);
-            }
-        });
+    async getHolder(params) {
+        if (this.useMongoose({
+            project: { id: params.project.id },
+            eventId: params.eventId,
+            startDate: params.startDate,
+            hasTicketedSeat: params.hasTicketedSeat
+        })) {
+            return this.pendingReservationRepo.getHolder(params);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
+            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
+            // return this.redisClient.hGet(key, field);
+        }
     }
-    searchHolders(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // validate offers.length(2025-04-18~)
-            if (params.offers.length > SEARCH_OFFERS_MAX_LENGTH) {
-                throw new factory.errors.Argument('offers', `offers.length must be <= ${SEARCH_OFFERS_MAX_LENGTH}`);
-            }
-            if (this.useMongoose({
-                project: { id: params.project.id },
-                eventId: params.eventId,
-                startDate: params.startDate,
-                hasTicketedSeat: params.hasTicketedSeat
-            })) {
-                return this.pendingReservationRepo.searchHolders(params);
-            }
-            else {
-                throw new factory.errors.NotImplemented('useRedis discontinued.');
-                // if (this.redisClient === undefined) {
-                //     throw new factory.errors.Internal('redisClient required');
-                // }
-                // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-                // const fields = params.offers.map((o) => {
-                //     return StockHolderRepo.offer2field(o, params.hasTicketedSeat);
-                // });
-                // // Array reply: list of values associated with the given fields, in the same order as they are requested.
-                // const result = await this.redisClient.hmGet(key, fields);
-                // if (!Array.isArray(result)) {
-                //     throw new factory.errors.Internal(`searchAvailability got non-array: ${typeof result}`);
-                // }
-                // // そのまま返却(2023-04-17~)
-                // return result;
-            }
-        });
+    async searchHolders(params) {
+        // validate offers.length(2025-04-18~)
+        if (params.offers.length > SEARCH_OFFERS_MAX_LENGTH) {
+            throw new factory.errors.Argument('offers', `offers.length must be <= ${SEARCH_OFFERS_MAX_LENGTH}`);
+        }
+        if (this.useMongoose({
+            project: { id: params.project.id },
+            eventId: params.eventId,
+            startDate: params.startDate,
+            hasTicketedSeat: params.hasTicketedSeat
+        })) {
+            return this.pendingReservationRepo.searchHolders(params);
+        }
+        else {
+            throw new factory.errors.NotImplemented('useRedis discontinued.');
+            // if (this.redisClient === undefined) {
+            //     throw new factory.errors.Internal('redisClient required');
+            // }
+            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
+            // const fields = params.offers.map((o) => {
+            //     return StockHolderRepo.offer2field(o, params.hasTicketedSeat);
+            // });
+            // // Array reply: list of values associated with the given fields, in the same order as they are requested.
+            // const result = await this.redisClient.hmGet(key, fields);
+            // if (!Array.isArray(result)) {
+            //     throw new factory.errors.Internal(`searchAvailability got non-array: ${typeof result}`);
+            // }
+            // // そのまま返却(2023-04-17~)
+            // return result;
+        }
     }
     // public async checkIfConflicted(params: {
     //     eventId: string;

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

@@ -34,7 +34,7 @@ type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | '
 export declare class TaskRepo {
     readonly taskModel: IModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<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/createAccountingReport").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deletePerson").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceDeleted").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").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>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<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/createAccountingReport").ITask | import("@chevre/factory/lib/task/deletePerson").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceDeleted").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").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>[];
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'expires' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;