@chevre/domain 22.9.0-alpha.101 → 22.9.0-alpha.103

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,7 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
+    await chevre.repository.Setting.createInstance(mongoose.connection);
     console.log('success!');
 }
 

package/example/src/chevre/stockHolder/getSize.ts

@@ -8,9 +8,12 @@ import { PendingReservationRepo } from '../../../../lib/chevre/repo/pendingReser
 const today = moment()
     .tz('Asia/Tokyo')
     .format('YYYYMMDD');
-// const project = { id: String(process.env.PROJECT_ID) };
-const eventId = `sampleEventId${today}:01`;
+const project = { id: String(process.env.PROJECT_ID) };
+const eventId = `sampleEventId${today}:02`;
 const eventStartDate = new Date('2025-05-01T00:00:00Z');
+const seatSection = 'SampleSectionNameXXXXXXXXXXXXXXXXXXX';
+// tslint:disable-next-line:no-magic-numbers prefer-array-literal
+const allSeatNumbers = [...Array(10000)].map((__, seatKey) => `SampleSeatNumber-${seatKey}`);
 
 const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
     socket: {
@@ -38,15 +41,14 @@ async function main() {
     // const stockHolderRepo = await chevre.repository.StockHolder.createInstance(client, mongoose.connection);
     const pendingReservationRepo = new PendingReservationRepo(mongoose.connection);
 
-    result = await pendingReservationRepo.countUnavailableOffers(
-        {
-            event: {
-                id: eventId,
-                startDate: eventStartDate,
-                hasTicketedSeat: true
-            }
+    result = await pendingReservationRepo.countUnavailableOffers({
+        project: { id: project.id },
+        event: {
+            id: eventId,
+            startDate: eventStartDate,
+            hasTicketedSeat: true
         }
-    );
+    });
     console.log('countUnavailableOffersResult:', result);
 
     startTime = process.hrtime();
@@ -66,15 +68,37 @@ async function main() {
     console.log('countUnavailableOffersByNumSeatsResult:', result);
     console.log('diff:', [diff[0], formatter.format(diff[1])]);
 
-    // const size = await pendingReservationRepo.getSize({
-    //     project: {
-    //         id: project.id
-    //     },
+    startTime = process.hrtime();
+    const searchHoldersResult = await pendingReservationRepo.searchHolders({
+        project: { id: project.id },
+        eventId,
+        startDate: eventStartDate,
+        hasTicketedSeat: true,
+        offers: [
+            // tslint:disable-next-line:no-magic-numbers
+            ...allSeatNumbers.slice(0, 10)
+                .map((seatNumber) => ({ seatSection, seatNumber }))
+        ]
+    });
+    diff = process.hrtime(startTime);
+    console.log('searchHoldersResult:', searchHoldersResult, searchHoldersResult.length);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+
+    // startTime = process.hrtime();
+    // const searchHolders2Result = await pendingReservationRepo.searchHolders2({
+    //     project: { id: project.id },
     //     eventId,
     //     startDate: eventStartDate,
-    //     hasTicketedSeat: true
+    //     hasTicketedSeat: true,
+    //     offers: [
+    //         // tslint:disable-next-line:no-magic-numbers
+    //         ...allSeatNumbers.slice(0, 10)
+    //             .map((seatNumber) => ({ seatSection, seatNumber }))
+    //     ]
     // });
-    // console.log('size:', size);
+    // diff = process.hrtime(startTime);
+    // console.log('searchHolders2:', searchHolders2Result, searchHolders2Result.length);
+    // console.log('diff:', [diff[0], formatter.format(diff[1])]);
 }
 
 main()

package/example/src/chevre/stockHolder/playAroundStockHolder.ts

@@ -8,7 +8,7 @@ const today = moment()
     .tz('Asia/Tokyo')
     .format('YYYYMMDD');
 const project = { id: String(process.env.PROJECT_ID) };
-const eventId = `sampleEventId${today}:01`;
+const eventId = `sampleEventId${today}:02`;
 const eventStartDate = new Date('2025-05-01T00:00:00Z');
 const seatSection = 'SampleSectionNameXXXXXXXXXXXXXXXXXXX';
 // tslint:disable-next-line:no-magic-numbers prefer-array-literal
@@ -59,13 +59,13 @@ async function lockSeatsForcibly(params: {
 
     const stockHolderRepo = await chevre.repository.StockHolder.createInstance(
         client,
-        mongoose.connection,
-        { useMongooseForce: true }
+        mongoose.connection
     );
 
     startTime = process.hrtime();
     console.log('counting unavailableOffers...');
     let countUnavailableOffersResult = await stockHolderRepo.countUnavailableOffers({
+        project: { id: project.id },
         event: {
             id: eventId,
             startDate: eventStartDate,
@@ -79,9 +79,7 @@ async function lockSeatsForcibly(params: {
     startTime = process.hrtime();
     console.log('counting searching holders...');
     const searchHoldersResult = await stockHolderRepo.searchHolders({
-        project: {
-            id: project.id
-        },
+        project: { id: project.id },
         eventId,
         startDate: eventStartDate,
         hasTicketedSeat: true,
@@ -89,14 +87,10 @@ async function lockSeatsForcibly(params: {
             // tslint:disable-next-line:no-magic-numbers
             ...allSeatNumbers.slice(0, 100)
                 .map((seatNumber) => ({ seatSection, seatNumber }))
-            // { seatNumber: 'invalid', seatSection: 'invalid' }
         ]
     });
     diff = process.hrtime(startTime);
-    // console.log('searchHoldersResult:', searchHoldersResult);
-    console.log(
-        'searchHoldersResult.length:', searchHoldersResult.length
-    );
+    console.log('searchHoldersResult.length:', searchHoldersResult.length);
     console.log('diff:', [diff[0], formatter.format(diff[1])]);
 
     // select 2 seats
@@ -117,9 +111,7 @@ async function lockSeatsForcibly(params: {
         const currentHolders: string[] = [];
         for (const seatNumber of seatNumbers) {
             const currentHolder = await stockHolderRepo.getHolder({
-                project: {
-                    id: project.id
-                },
+                project: { id: project.id },
                 eventId,
                 startDate: eventStartDate,
                 hasTicketedSeat: true,
@@ -192,9 +184,7 @@ async function lockSeatsForcibly(params: {
                 startTime = process.hrtime();
                 console.log('unlocking...', currentHolder, seatSection, seatNumber);
                 const unlockResult = await stockHolderRepo.unlock({
-                    project: {
-                        id: project.id
-                    },
+                    project: { id: project.id },
                     eventId,
                     startDate: eventStartDate,
                     hasTicketedSeat: true,
@@ -210,6 +200,7 @@ async function lockSeatsForcibly(params: {
 
     await sleep(OPERATION_INTERVAL);
     countUnavailableOffersResult = await stockHolderRepo.countUnavailableOffers({
+        project: { id: project.id },
         event: {
             id: eventId,
             startDate: eventStartDate,
@@ -221,34 +212,11 @@ async function lockSeatsForcibly(params: {
 }
 
 async function main() {
-    // const stockHolderRepo = await chevre.repository.StockHolder.createInstance(
-    //     client,
-    //     mongoose.connection,
-    //     { useMongooseForce: true }
-    // );
-    // const newHolder = Date.now()
-    //     .toString();
-    // // tslint:disable-next-line:no-magic-numbers
-    // const seatNumbers = allSeatNumbers.slice(0, 1000);
-    // const lockResult = await stockHolderRepo.lock({
-    //     project: {
-    //         id: project.id
-    //     },
-    //     eventId,
-    //     startDate: eventStartDate,
-    //     hasTicketedSeat: true,
-    //     offers: seatNumbers.map((seatNumber) => ({ seatSection, seatNumber })),
-    //     expires: new Date(),
-    //     holder: newHolder
-    // });
-    // console.log(lockResult);
-    // return;
-
     // tslint:disable-next-line:no-magic-numbers
-    const maximumCapacity = (typeof process.argv[2] === 'string') ? Number(process.argv[2]) : undefined;
+    const numLock = (typeof process.argv[2] === 'string') ? Number(process.argv[2]) : 1;
+    // tslint:disable-next-line:no-magic-numbers
+    const maximumCapacity = (typeof process.argv[3] === 'string') ? Number(process.argv[3]) : undefined;
 
-    // const NUM_LOCK = 1;
-    const NUM_LOCK = 2000;
     const LOCK_INTERVAL = 300;
     let i = 0;
     let lockedCount = 0;
@@ -262,7 +230,7 @@ async function main() {
 
     timeout = setInterval(
         () => {
-            if (i >= NUM_LOCK) {
+            if (i >= numLock) {
                 clearInterval(timeout);
 
                 return;

package/lib/chevre/errorHandler.js

@@ -177,6 +177,10 @@ function handleMvtkReserveError(error) {
             case http_status_1.TOO_MANY_REQUESTS: // 429
                 handledError = new factory_1.errors.RateLimitExceeded(message);
                 break;
+            // handle 504(2025-04-25~)
+            case http_status_1.GATEWAY_TIMEOUT: // 504
+                handledError = new factory_1.errors.GatewayTimeout(message);
+                break;
             default:
                 handledError = new factory_1.errors.Internal(message);
         }

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -121,6 +121,7 @@ export interface ISetting {
     userPoolIdNew?: string;
     waiter?: IWaiterSettings;
     useMongoAsStockHolder?: boolean;
+    useMongoAsStockHolderProjects?: string[];
 }
 type IDocType = ISetting;
 type IModel = Model<IDocType>;

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

@@ -23,7 +23,8 @@ const schemaDefinition = {
     userPoolIdOld: String,
     userPoolIdNew: String,
     waiter: mongoose_1.SchemaTypes.Mixed,
-    useMongoAsStockHolder: Boolean
+    useMongoAsStockHolder: Boolean,
+    useMongoAsStockHolderProjects: [String]
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -15,6 +15,9 @@ export declare class PendingReservationRepo implements AbstractStockHolderRepo {
      * 現時点での保留予約数を集計する
      */
     countUnavailableOffers(params: {
+        project: {
+            id: string;
+        };
         event: {
             id: string;
             startDate: Date;

package/lib/chevre/repo/pendingReservation.js

@@ -235,22 +235,29 @@ class PendingReservationRepo {
             const { eventId, offers, hasTicketedSeat } = params;
             const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
             const aggregate = this.pendingReservationModel.aggregate([
+                // unwind,matchの順序
+                // unwind->matchでは遅い？
+                // match->unwind->matchにする
+                {
+                    $match: {
+                        'reservationFor.id': { $eq: eventId },
+                        'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+                    }
+                },
                 {
                     $unwind: {
                         path: '$subReservation'
-                        // includeArrayIndex: 'xxx'
                     }
                 },
                 {
                     $match: {
-                        'reservationFor.id': { $eq: eventId },
                         'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
                     }
                 },
                 {
                     $project: {
                         _id: 0,
-                        reservationNumber: '$reservationNumber',
+                        // reservationNumber: '$reservationNumber',
                         identifier: '$subReservation.identifier'
                     }
                 }
@@ -259,13 +266,86 @@ class PendingReservationRepo {
                 .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
             debug('searchHolders: aggregated.', docs, docs.length, 'docs');
+            // reservationNumberを正確に返す必要はなく、存在しているかどうかだけ分かればよい(stringを返せばよい)
             return reservationIdentifiers.map((reservationIdentifier) => {
                 const doc = docs.find(({ identifier }) => identifier === reservationIdentifier);
                 // tslint:disable-next-line:no-null-keyword
-                return (doc !== undefined) ? doc.reservationNumber : null;
+                // return (doc !== undefined) ? doc.reservationNumber : null;
+                // tslint:disable-next-line:no-null-keyword
+                return (doc !== undefined) ? doc.identifier : null;
             });
         });
     }
+    // public async searchHolders2(params: {
+    //     project: { id: string };
+    //     eventId: string;
+    //     startDate: Date;
+    //     hasTicketedSeat: boolean;
+    //     offers: IOffer[];
+    // }): Promise<IGetHolderResult[]> {
+    //     const { eventId, offers, hasTicketedSeat } = params;
+    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
+    //     const aggregate = this.pendingReservationModel.aggregate<{
+    //         // reservationNumber: string;
+    //         identifier: string;
+    //     }>([
+    //         // unwind,matchの順序
+    //         // unwind->matchでは遅い？
+    //         // match->limit->unwind->matchにする
+    //         {
+    //             $unwind: {
+    //                 path: '$subReservation'
+    //             }
+    //         },
+    //         {
+    //             $match: {
+    //                 'reservationFor.id': { $eq: eventId },
+    //                 'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+    //             }
+    //         },
+    //         { $limit: reservationIdentifiers.length },
+    //         {
+    //             $project: {
+    //                 _id: 0,
+    //                 // reservationNumber: '$reservationNumber',
+    //                 identifier: '$subReservation.identifier'
+    //             }
+    //         }
+    //     ]);
+    //     const docs = await aggregate
+    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    //     debug('searchHolders: aggregated.', docs, docs.length, 'docs');
+    //     // reservationNumberを正確に返す必要はなく、存在しているかどうかだけ分かればよい(stringを返せばよい)
+    //     return reservationIdentifiers.map((reservationIdentifier) => {
+    //         const doc = docs.find(({ identifier }) => identifier === reservationIdentifier);
+    //         // tslint:disable-next-line:no-null-keyword
+    //         // return (doc !== undefined) ? doc.reservationNumber : null;
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return (doc !== undefined) ? doc.identifier : null;
+    //     });
+    // }
+    // public async searchHoldersByDistinct(params: {
+    //     project: { id: string };
+    //     eventId: string;
+    //     startDate: Date;
+    //     hasTicketedSeat: boolean;
+    //     offers: IOffer[];
+    // }) {
+    //     const { eventId, offers, hasTicketedSeat } = params;
+    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
+    //     const doc = await this.pendingReservationModel.distinct(
+    //         'subReservation.identifier',
+    //         {
+    //             'reservationFor.id': { $eq: eventId },
+    //             'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+    //         }
+    //     )
+    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    //     debug('searchHolders: distinct.', doc);
+    //     return doc;
+    // }
     // public async getSize(params: Omit<IUnlockKey, 'holder' | 'offer'>) {
     //     const { eventId } = params;
     //     const aggregate = this.aggregateReservationModel.aggregate([

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

@@ -10,10 +10,7 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
     private readonly redisClient;
     private readonly settingModel;
     private readonly pendingReservationRepo;
-    private readonly useMongooseForce;
-    constructor(redisClient: RedisClientType, connection: Connection, options?: {
-        useMongooseForce: boolean;
-    });
+    constructor(redisClient: RedisClientType, connection: Connection);
     private static offer2field;
     private static createKey;
     /**
@@ -32,6 +29,9 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
      * 空席でない座席をカウントする
      */
     countUnavailableOffers(params: {
+        project: {
+            id: string;
+        };
         event: {
             id: string;
             startDate: Date;
@@ -55,4 +55,6 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
      * 新リポジトリを使用するかどうか
      */
     private useMongoose;
+    private useMongoAsStockHolderBySettings;
+    private redisKeyExists;
 }

package/lib/chevre/repo/stockHolder.js

@@ -21,11 +21,10 @@ const SEARCH_OFFERS_MAX_LENGTH = 100;
  * イベントストックホルダーリポジトリ
  */
 class StockHolderRepo {
-    constructor(redisClient, connection, options) {
+    constructor(redisClient, connection) {
         this.redisClient = redisClient;
         this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
         this.pendingReservationRepo = new pendingReservation_1.PendingReservationRepo(connection);
-        this.useMongooseForce = (options === null || options === void 0 ? void 0 : options.useMongooseForce) === true;
     }
     static offer2field(params, hasTicketedSeat) {
         var _a, _b;
@@ -55,6 +54,7 @@ class StockHolderRepo {
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
             const useMongoose = yield this.useMongoose({
+                project: { id: lockKey.project.id },
                 eventId: lockKey.eventId,
                 startDate: lockKey.startDate,
                 hasTicketedSeat: lockKey.hasTicketedSeat
@@ -87,6 +87,7 @@ class StockHolderRepo {
                 throw new factory.errors.Argument('expires', 'must be Date');
             }
             const useMongoose = yield this.useMongoose({
+                project: { id: lockKey.project.id },
                 eventId: lockKey.eventId,
                 startDate: lockKey.startDate,
                 hasTicketedSeat: lockKey.hasTicketedSeat
@@ -150,6 +151,7 @@ class StockHolderRepo {
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const useMongoose = yield this.useMongoose({
+                project: { id: params.project.id },
                 eventId: params.eventId,
                 startDate: params.startDate,
                 hasTicketedSeat: params.hasTicketedSeat
@@ -174,6 +176,7 @@ class StockHolderRepo {
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.useMongoose({
+                project: { id: params.project.id },
                 eventId: params.event.id,
                 startDate: params.event.startDate,
                 hasTicketedSeat: params.event.hasTicketedSeat
@@ -198,6 +201,7 @@ class StockHolderRepo {
     getHolder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.useMongoose({
+                project: { id: params.project.id },
                 eventId: params.eventId,
                 startDate: params.startDate,
                 hasTicketedSeat: params.hasTicketedSeat
@@ -219,6 +223,7 @@ class StockHolderRepo {
                 throw new factory.errors.Argument('offers', `offers.length must be <= ${SEARCH_OFFERS_MAX_LENGTH}`);
             }
             if (yield this.useMongoose({
+                project: { id: params.project.id },
                 eventId: params.eventId,
                 startDate: params.startDate,
                 hasTicketedSeat: params.hasTicketedSeat
@@ -251,17 +256,10 @@ class StockHolderRepo {
             }
             let useMongoose = false;
             // useMongoAsStockHolder設定有の場合のみmongo利用(2025-04-18~)
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongoAsStockHolder: 1
-            })
-                .lean()
-                .exec();
-            if ((setting === null || setting === void 0 ? void 0 : setting.useMongoAsStockHolder) === true) {
-                const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-                const existingRedisKeyCount = yield this.redisClient.exists(key);
-                // console.log('existingRedisKeyCount:', existingRedisKeyCount);
-                if (typeof existingRedisKeyCount === 'number' && existingRedisKeyCount > 0) {
+            const useMongoAsStockHolderBySettings = yield this.useMongoAsStockHolderBySettings({ project: { id: params.project.id } });
+            if (useMongoAsStockHolderBySettings) {
+                const redisKeyExists = yield this.redisKeyExists(params);
+                if (redisKeyExists) {
                     useMongoose = false;
                 }
                 else {
@@ -269,14 +267,34 @@ class StockHolderRepo {
                     useMongoose = true;
                 }
             }
-            else {
-                if (this.useMongooseForce) {
-                    useMongoose = true;
-                }
-            }
             return useMongoose;
         });
     }
+    useMongoAsStockHolderBySettings(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // useMongoAsStockHolder設定有の場合のみmongo利用(2025-04-18~)
+            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
+                _id: 0,
+                useMongoAsStockHolder: 1,
+                useMongoAsStockHolderProjects: 1
+            })
+                .lean()
+                .exec();
+            const useMongoGlobally = (setting === null || setting === void 0 ? void 0 : setting.useMongoAsStockHolder) === true;
+            const useMongoAsStockHolderProjects = setting === null || setting === void 0 ? void 0 : setting.useMongoAsStockHolderProjects;
+            const useMongoByProject = Array.isArray(useMongoAsStockHolderProjects)
+                && useMongoAsStockHolderProjects.includes(params.project.id);
+            return useMongoGlobally || useMongoByProject;
+        });
+    }
+    redisKeyExists(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = StockHolderRepo.createKey(params);
+            const existingRedisKeyCount = yield this.redisClient.exists(key);
+            // console.log('existingRedisKeyCount:', existingRedisKeyCount);
+            return typeof existingRedisKeyCount === 'number' && existingRedisKeyCount > 0;
+        });
+    }
 }
 exports.StockHolderRepo = StockHolderRepo;
 StockHolderRepo.KEY_PREFIX_NEW = 'stockHolder';

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

@@ -57,6 +57,9 @@ export declare abstract class AbstractStockHolderRepo {
      * 空席でない座席をカウントする
      */
     abstract countUnavailableOffers(params: {
+        project: {
+            id: string;
+        };
         event: {
             id: string;
             startDate: Date;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -252,6 +252,7 @@ function aggregateReservationByEvent(params) {
         if (typeof maximumAttendeeCapacity === 'number') {
             // 残席数を座席ロック数から計算
             const unavailableOfferCount = yield repos.stockHolder.countUnavailableOffers({
+                project: { id: params.event.project.id },
                 event: {
                     id: params.event.id,
                     startDate: moment(params.event.startDate)

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.101"
+  "version": "22.9.0-alpha.103"
 }