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

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 },
@@ -52,6 +53,10 @@ const indexes = [
         { 'project.id': 1, bookingTime: -1 },
         { name: 'projectId' }
     ],
+    [
+        { 'provider.id': 1, bookingTime: -1 },
+        { name: 'providerId' }
+    ],
     [
         { 'reservationFor.id': 1, bookingTime: -1 },
         { name: 'reservationForId' }
@@ -60,6 +65,10 @@ const indexes = [
         { reservationNumber: 1, bookingTime: -1 },
         { name: 'reservationNumber' }
     ],
+    [
+        { 'subReservation.identifier': 1, bookingTime: -1 },
+        { name: 'subReservationIdentifier' }
+    ],
     [
         { reservationNumber: 1 },
         {

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

@@ -173,33 +173,17 @@ const indexes = [
     ]
     // [
     //     {
-    //         'containsPlace.branchCode': 1,
-    //         'containsPlace.containsPlace.branchCode': 1
-    //     },
-    //     {
-    //         name: 'searchSeatsSort'
-    //     }
-    // ],
-    // [
-    //     {
+    //         typeOf: 1,
+    //         'project.id': 1,
     //         'containedInPlace.branchCode': 1,
-    //         'containsPlace.branchCode': 1,
-    //         'containsPlace.containsPlace.branchCode': 1
-    //     },
-    //     {
-    //         name: 'searchSeatsWithSort2'
-    //     }
-    // ],
-    // [
-    //     {
     //         branchCode: 1,
     //         'containsPlace.branchCode': 1,
     //         'containsPlace.containsPlace.branchCode': 1
     //     },
     //     {
-    //         name: 'searchSeatsWithSort3'
+    //         name: 'projectSeatsUsingSort'
     //     }
-    // ],
+    // ]
 ];
 exports.indexes = indexes;
 /**

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/lib/chevre/service/task/checkResource.js

@@ -14,17 +14,22 @@ const factory = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
+const setting_1 = require("../../repo/setting");
+const stockHolder_1 = require("../../repo/stockHolder");
+const task_1 = require("../../repo/task");
+const validateEvent_1 = require("../validation/validateEvent");
 const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        const acceptedOfferRepo = new acceptedOffer_1.AcceptedOfferRepo(connection);
+    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
         const actionRepo = new action_1.ActionRepo(connection);
-        const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
-        const orderRepo = new order_1.OrderRepo(connection);
         const actionAttributes = {
             agent: { id: data.project.id, typeOf: factory.organizationType.Project },
             object: data.object,
@@ -32,20 +37,33 @@ function call(data) {
             typeOf: factory.actionType.CheckAction
         };
         const action = yield actionRepo.start(actionAttributes);
+        const objectTypeOf = data.object.typeOf;
         try {
-            switch (data.object.typeOf) {
+            switch (objectTypeOf) {
                 case factory.order.OrderType.Order:
                     yield (0, validateOrder_1.validateOrder)({
                         orderNumber: data.object.orderNumber,
                         project: { id: data.project.id }
                     })({
-                        acceptedOffer: acceptedOfferRepo,
-                        assetTransaction: assetTransactionRepo,
-                        order: orderRepo
+                        acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+                        assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                        order: new order_1.OrderRepo(connection),
+                        setting: new setting_1.SettingRepo(connection),
+                        task: new task_1.TaskRepo(connection)
+                    });
+                    break;
+                // support ScreeningEvent(2025-05-01~)
+                case factory.eventType.ScreeningEvent:
+                    yield (0, validateEvent_1.validateEvent)({
+                        id: data.object.id,
+                        project: { id: data.project.id }
+                    })({
+                        event: new event_1.EventRepo(connection),
+                        stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection)
                     });
                     break;
                 default:
-                    throw new factory.errors.NotImplemented(`${data.object.typeOf} not implemented`);
+                    throw new factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
             }
         }
         catch (error) {

package/lib/chevre/service/validation/validateEvent.d.ts

@@ -0,0 +1,11 @@
+import type { EventRepo } from '../../repo/event';
+import type { StockHolderRepo } from '../../repo/stockHolder';
+export declare function validateEvent(params: {
+    id: string;
+    project: {
+        id: string;
+    };
+}): (repos: {
+    event: EventRepo;
+    stockHolder: StockHolderRepo;
+}) => Promise<void>;

package/lib/chevre/service/validation/validateEvent.js

@@ -0,0 +1,23 @@
+"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.validateEvent = validateEvent;
+function validateEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['startDate']);
+        // tslint:disable-next-line:no-console
+        console.log('conflicted?', params.project.id, event.id, event.startDate);
+        yield repos.stockHolder.checkIfConflicted({
+            eventId: event.id,
+            startDate: event.startDate
+        });
+    });
+}

package/lib/chevre/service/validation/validateOrder.d.ts

@@ -1,6 +1,8 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OrderRepo } from '../../repo/order';
+import type { SettingRepo } from '../../repo/setting';
+import type { TaskRepo } from '../../repo/task';
 export declare function validateOrder(params: {
     orderNumber: string;
     project: {
@@ -10,4 +12,6 @@ export declare function validateOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
+    setting: SettingRepo;
+    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/validation/validateOrder.js

@@ -12,11 +12,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrder = validateOrder;
 // import * as createDebug from 'debug';
 const moment = require("moment");
+const util = require("util");
 const factory = require("../../factory");
 const factory_1 = require("../offer/event/authorize/factory");
 const factory_2 = require("../offer/product/factory");
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-// const debug = createDebug('chevre-domain:service:validation');
+function createCheckEventTasks(params) {
+    const { project, reservationForIds } = params;
+    const runsAt = new Date();
+    return reservationForIds.map((reservationForId) => {
+        const object = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
+        const data = {
+            object,
+            project: { id: project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CheckAction
+        };
+        const description = util.format('%s:%s:%s:%s', project.id, factory.taskName.CheckResource, factory.eventType.ScreeningEvent, reservationForId);
+        return {
+            description,
+            project: { id: project.id, typeOf: factory.organizationType.Project },
+            name: factory.taskName.CheckResource,
+            status: factory.taskStatus.Ready,
+            runsAt,
+            remainingNumberOfTries: 3,
+            numberOfTried: 0,
+            executionResults: [],
+            data
+        };
+    });
+}
 function validateOrder(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -192,5 +216,17 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
+        // add check event task(2025-05-01~)
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
+        const useMongoAsStockHolderProjects = setting === null || setting === void 0 ? void 0 : setting.useMongoAsStockHolderProjects;
+        if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
+            const creatingCheckResourceTask = createCheckEventTasks({
+                project: { id: params.project.id },
+                reservationForIds
+            });
+            if (creatingCheckResourceTask.length > 0) {
+                yield repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
+            }
+        }
     });
 }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.48",
-    "@cinerino/sdk": "10.21.0-alpha.30",
+    "@chevre/factory": "4.393.0-alpha.49",
+    "@cinerino/sdk": "10.21.0-alpha.33",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -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.112"
 }