@chevre/domain 22.9.0-alpha.110 → 22.9.0-alpha.111

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

@@ -14,10 +14,13 @@ const today = moment()
     .format('YYYYMMDD');
 const project = { id: String(process.env.PROJECT_ID) };
 const eventId = `sampleEventId${today}:03`;
+// const eventId = 'bma1pcxs0';
 const eventStartDate = new Date('2025-05-01T00:00:00Z');
-const seatSection = 'SampleSectionNameXXXXXXXXXXXXXXXXXXX';
+// const seatSection = 'SampleSectionNameXXXXXXXXXXXXXXXXXXX';
+const seatSection = 'Default';
 // tslint:disable-next-line:no-magic-numbers prefer-array-literal
 const allSeatNumbers = [...Array(10000)].map((__, seatKey) => `SampleSeatNumber-${seatKey}`);
+// const allSeatNumbers = [...Array(10000)].map((__, seatKey) => `A-${seatKey}`);
 
 const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
     socket: {

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

@@ -8,6 +8,7 @@ const today = moment()
     .tz('Asia/Tokyo')
     .format('YYYYMMDD');
 const project = { id: String(process.env.PROJECT_ID) };
+const providerId = 'sampleProviderId';
 const eventId = `sampleEventId${today}:03`;
 const eventStartDate = new Date('2025-05-01T00:00:00Z');
 const expires = moment(eventStartDate)
@@ -140,6 +141,7 @@ async function lockSeatsForcibly(params: {
                     await stockHolderRepo.lockIfNotLimitExceeded(
                         {
                             project: { id: project.id },
+                            provider: { id: providerId },
                             eventId,
                             startDate: eventStartDate,
                             hasTicketedSeat: true,
@@ -160,6 +162,7 @@ async function lockSeatsForcibly(params: {
             } else {
                 await stockHolderRepo.lock({
                     project: { id: project.id },
+                    provider: { id: providerId },
                     eventId,
                     startDate: eventStartDate,
                     hasTicketedSeat: true,

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

@@ -19,8 +19,9 @@ async function main() {
         limit: 10,
         page: 1,
         project: { id: { $eq: project.id } },
-        reservationFor: { id: { $eq: 'bma0cfbc6' } }
-        // reservationNumber: { $eq: '3073981402299' }
+        reservationFor: { id: { $eq: 'bma31zpnv' } },
+        subReservation: { identifier: { $eq: 'Default:A-1' } },
+        reservationNumber: { $eq: '283714519921158' }
     });
     diff = process.hrtime(startTime);
     console.log('result:', result, result.length);

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

@@ -3,11 +3,19 @@ import * as factory from '../../../factory';
 interface ISubReservation {
     identifier: string;
 }
+interface IProvider {
+    /**
+     * 販売者ID
+     */
+    id: string;
+    typeOf: factory.organizationType.Corporation;
+}
 interface IReservationPackage {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
+    provider: IProvider;
     typeOf: factory.reservationType.ReservationPackage;
     bookingTime: Date;
     dateCreated: Date;

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

@@ -9,6 +9,7 @@ const modelName = 'PendingReservation';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    provider: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     numSeats: { type: Number, required: true },
     reservationFor: { type: mongoose_1.SchemaTypes.Mixed, required: true },
@@ -60,6 +61,10 @@ const indexes = [
         { reservationNumber: 1, bookingTime: -1 },
         { name: 'reservationNumber' }
     ],
+    [
+        { 'subReservation.identifier': 1, bookingTime: -1 },
+        { name: 'subReservationIdentifier' }
+    ],
     [
         { reservationNumber: 1 },
         {

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

@@ -1,6 +1,33 @@
 import type { Connection } from 'mongoose';
 import { IReservationPackage } from './mongoose/schemas/pendingReservation';
 import { AbstractStockHolderRepo, IGetHolderResult, ILockKey, IOffer, IUnlockKey } from './stockHolderAbstract';
+interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    provider?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    reservationFor?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    reservationNumber?: {
+        $eq?: string;
+    };
+    subReservation?: {
+        identifier?: {
+            $eq?: string;
+        };
+    };
+}
 type IProjectFieldResult = Pick<IReservationPackage, 'bookingTime' | 'numSeats' | 'dateCreated' | 'dateModified' | 'expires' | 'reservationFor' | 'reservationNumber' | 'typeOf'>;
 /**
  * 保留予約リポジトリ
@@ -44,23 +71,7 @@ export declare class PendingReservationRepo implements AbstractStockHolderRepo {
             $lte: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    projectFields(params: {
-        limit?: number;
-        page?: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        reservationFor?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        reservationNumber?: {
-            $eq?: string;
-        };
-    }): Promise<IProjectFieldResult[]>;
+    projectFields(params: ISearchConditions): Promise<IProjectFieldResult[]>;
     private aggregateNumSeats;
     private createReservationPackageIfPossible;
     private deleteReservationPackage;

package/lib/chevre/repo/pendingReservation.js

@@ -78,6 +78,7 @@ class PendingReservationRepo {
         });
         return {
             project: { id: lockKey.project.id, typeOf: factory.organizationType.Project },
+            provider: { id: lockKey.provider.id, typeOf: factory.organizationType.Corporation },
             typeOf: factory.reservationType.ReservationPackage,
             bookingTime,
             expires,
@@ -232,7 +233,8 @@ class PendingReservationRepo {
                 },
                 {
                     $match: {
-                        'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+                        // 'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+                        'subReservation.identifier': { $in: reservationIdentifiers } // $exists不要か？
                     }
                 }, // unwind後にもmatchがないと、reservationIdentifiers以外のsubReservationもprojectされる
                 {
@@ -372,7 +374,7 @@ class PendingReservationRepo {
     }
     projectFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { limit, page } = params;
             const filterQueries = [
             // { numSeats: { $gte: 1 } }
@@ -381,14 +383,22 @@ class PendingReservationRepo {
             if (typeof projectIdEq === 'string') {
                 filterQueries.push({ 'project.id': { $eq: projectIdEq } });
             }
-            const reservationForIdEq = (_d = (_c = params.reservationFor) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            const providerIdEq = (_d = (_c = params.provider) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof providerIdEq === 'string') {
+                filterQueries.push({ 'provider.id': { $eq: providerIdEq } });
+            }
+            const reservationForIdEq = (_f = (_e = params.reservationFor) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof reservationForIdEq === 'string') {
                 filterQueries.push({ 'reservationFor.id': { $eq: reservationForIdEq } });
             }
-            const reservationNumberEq = (_e = params.reservationNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+            const reservationNumberEq = (_g = params.reservationNumber) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof reservationNumberEq === 'string') {
                 filterQueries.push({ reservationNumber: { $eq: reservationNumberEq } });
             }
+            const subReservationIdentifierEq = (_j = (_h = params.subReservation) === null || _h === void 0 ? void 0 : _h.identifier) === null || _j === void 0 ? void 0 : _j.$eq;
+            if (typeof subReservationIdentifierEq === 'string') {
+                filterQueries.push({ 'subReservation.identifier': { $eq: subReservationIdentifierEq } });
+            }
             const matchStage = (filterQueries.length > 0) ? { $match: { $and: filterQueries } } : undefined;
             let limitStage;
             let skipStage;

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

@@ -14,6 +14,13 @@ export interface ILockKey {
     project: {
         id: string;
     };
+    /**
+     * required(2025-04-30~)
+     * = event.organizer.id
+     */
+    provider: {
+        id: string;
+    };
     eventId: string;
     startDate: Date;
     hasTicketedSeat: boolean;

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -551,6 +551,7 @@ function processLockSeats(params) {
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.stockHolder.lockIfNotLimitExceeded({
                 project: { id: params.event.project.id },
+                provider: { id: params.event.organizer.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
@@ -564,6 +565,7 @@ function processLockSeats(params) {
         else {
             yield repos.stockHolder.lock({
                 project: { id: params.event.project.id },
+                provider: { id: params.event.organizer.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),

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.110"
+  "version": "22.9.0-alpha.111"
 }