@chevre/domain 20.2.0-alpha.33 → 20.2.0-alpha.35

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -95,6 +95,14 @@ async function main() {
         agregation: aggregationRepo,
         action: actionRepo
     });
+
+    await chevre.service.aggregation.system.aggregateCheckMovieTicketAction({
+        aggregationDays: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        action: actionRepo
+    });
 }
 
 main()

package/example/src/chevre/searchEventTicketOffers.ts

@@ -23,7 +23,8 @@ async function main() {
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'al9ew43f5' },
-        onlyValid: true
+        onlyValid: true,
+        sort: true
         // ...(typeof sellerId === 'string') ? { seller: { id: sellerId } } : undefined,
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({

package/example/src/chevre/searchOffersByCatalog.ts

@@ -15,7 +15,8 @@ async function main() {
         offerCatalog: {
             id: '0001'
             // id: 'xxx'
-        }
+        },
+        sort: true
     });
     console.log(offers.map((o) => o.id));
     console.log(offers.length);

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

@@ -164,5 +164,14 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
+    aggregateCheckMovieTicketAction(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+    }): Promise<IAggregateAction>;
     private agggregateByStatus;
 }

package/lib/chevre/repo/action.js

@@ -762,6 +762,28 @@ class MongoRepository {
             return { statuses };
         });
     }
+    aggregateCheckMovieTicketAction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.actionStatusType.CompletedActionStatus,
+                factory.actionStatusType.CanceledActionStatus,
+                factory.actionStatusType.FailedActionStatus
+            ].map((actionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: factory.actionType.CheckAction }, 'object.typeOf': {
+                        $exists: true,
+                        $eq: factory.service.paymentService.PaymentServiceType.MovieTicket
+                    }, actionStatus: { $eq: actionStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, actionStatus });
+            })));
+            return { statuses };
+        });
+    }
     // tslint:disable-next-line:max-func-body-length
     agggregateByStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -4,6 +4,7 @@ export declare enum AggregationType {
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregateCheckMovieTicketAction = "AggregateCheckMovieTicketAction",
     AggregateEvent = "AggregateEvent",
     AggregatePay = "AggregatePay",
     AggregatePlaceOrder = "AggregatePlaceOrder",

package/lib/chevre/repo/aggregation.js

@@ -27,6 +27,7 @@ var AggregationType;
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregateCheckMovieTicketAction"] = "AggregateCheckMovieTicketAction";
     AggregationType["AggregateEvent"] = "AggregateEvent";
     AggregationType["AggregatePay"] = "AggregatePay";
     AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";

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

@@ -20,6 +20,9 @@ export declare class MongoRepository {
         offerCatalog: {
             id: string;
         };
+        availableAtOrFrom?: {
+            id?: string;
+        };
         limit?: number;
         page?: number;
         sort: boolean;

package/lib/chevre/repo/offer.js

@@ -301,6 +301,7 @@ class MongoRepository {
      * カタログに登録されたオファーの順序は保証される
      */
     findOffersByOfferCatalogId(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // aggregateで再実装(2023-01-26~)
             const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
@@ -345,7 +346,9 @@ class MongoRepository {
             // }
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                offers = yield this.search({ id: { $in: sortedOfferIds } });
+                offers = yield this.search(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
+                    : undefined));
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));

package/lib/chevre/service/aggregation/system.d.ts

@@ -59,6 +59,13 @@ declare function aggregateUseAction(params: {
     agregation: AggregationRepo;
     action: ActionRepo;
 }) => Promise<void>;
+declare function aggregateCheckMovieTicketAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
 declare function aggregatePayTransaction(params: {
     aggregationDays: number;
     excludedProjectId?: string;
@@ -83,4 +90,4 @@ declare function aggregateTask(params: {
     agregation: AggregationRepo;
     task: TasKRepo;
 }) => Promise<void>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateEvent, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregateEvent = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregateEvent = exports.aggregateCheckMovieTicketAction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -242,6 +242,38 @@ function aggregateUseAction(params) {
     });
 }
 exports.aggregateUseAction = aggregateUseAction;
+function aggregateCheckMovieTicketAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateCheckMovieTicketAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough
+            });
+            debug('aggregateCheckMovieTicketAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateCheckMovieTicketAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateCheckMovieTicketAction = aggregateCheckMovieTicketAction;
 function aggregatePayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -0,0 +1,16 @@
+import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
+declare function validateStartRequest(params: {
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    validateEventOfferPeriod?: boolean;
+    validateEvent?: boolean;
+    now: Date;
+    store?: {
+        /**
+         * 販売アプリケーションID
+         */
+        id?: string;
+    };
+}): void;
+export { validateStartRequest };

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateStartRequest = void 0;
+const moment = require("moment");
+const factory = require("../../../factory");
+function validateStartRequest(params) {
+    var _a;
+    const now = params.now;
+    const event = params.event;
+    if (params.validateEventOfferPeriod === true) {
+        if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
+            throw new factory.errors.NotFound('store.id');
+        }
+        validateEventOfferPeriod({ event, now, availableAt: { id: params.store.id } });
+    }
+    if (params.validateEvent === true) {
+        validateEvent({ event, object: params.object });
+    }
+}
+exports.validateStartRequest = validateStartRequest;
+/**
+ * イベントのオファー有効期間を検証する
+ */
+function validateEventOfferPeriod(params) {
+    const acceptedDate = moment(params.now);
+    const eventOffers = params.event.offers;
+    // アプリケーションごとの設定を参照する(2022-11-19~)
+    const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
+        return Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom[0].id === params.availableAt.id;
+    });
+    if (makesOfferOnApplication === undefined) {
+        throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+    }
+    const validFrom = makesOfferOnApplication.validFrom;
+    const validThrough = makesOfferOnApplication.validThrough;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
+    if (validFrom !== undefined && validFrom !== null) {
+        if (acceptedDate.isBefore(moment(validFrom))) {
+            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
+        }
+    }
+    if (validThrough !== undefined && validThrough !== null) {
+        if (acceptedDate.isAfter(moment(validThrough))) {
+            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
+        }
+    }
+}
+/**
+ * イベントの上限座席数を検証する
+ */
+function validateEvent(params) {
+    var _a, _b;
+    // const acceptedDate = moment(params.now);
+    const eventOffers = params.event.offers;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
+    // if (validFrom !== undefined && validFrom !== null) {
+    //     if (acceptedDate.isBefore(moment(validFrom))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid from ${validFrom}`
+    //         );
+    //     }
+    // }
+    // if (validThrough !== undefined && validThrough !== null) {
+    //     if (acceptedDate.isAfter(moment(validThrough))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid through ${validThrough}`
+    //         );
+    //     }
+    // }
+    // イベントのmaxValueを検証
+    const maxValue = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+    if (typeof maxValue === 'number') {
+        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
+        if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
+            if (numAcceptedOffers > maxValue) {
+                throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
+            }
+        }
+    }
+}

package/lib/chevre/service/assetTransaction/reserve.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
 import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
@@ -62,12 +62,39 @@ interface IConfirmRepo {
     task: TaskRepo;
 }
 export declare type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+declare type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
+    /**
+     * 承認アクションを介した場合に検索済のイベント
+     */
+    preSearchedEvent?: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    /**
+     * 承認アクションを介した場合に検索済のオファーリスト
+     */
+    preSearchedTicketOffers?: factory.product.ITicketOffer[];
+    /**
+     * 承認アクションを介した場合に検索済の単価オファーリスト
+     */
+    preSearchedUnitPriceOffers?: factory.unitPriceOffer.IUnitPriceOffer[];
+    /**
+     * 販売アプリケーション
+     */
+    availableAtOrFrom?: {
+        id?: string;
+    };
+    /**
+     * イベントの販売期間を検証するかどうか
+     */
+    validateEventOfferPeriod: boolean;
+    /**
+     * イベントのオファー(最大予約座席数)を検証するかどうか
+     */
+    validateEvent: boolean;
+    validateAppliesToMovieTicket: boolean;
+};
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
-    validateAppliesToMovieTicket: boolean;
-}): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
+export declare function start(params: IStartParams): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
 /**
  * 取引確定
  */

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

@@ -21,17 +21,39 @@ const cancelReservation_1 = require("../reserve/cancelReservation");
 const confirmReservation_1 = require("../reserve/confirmReservation");
 const settings_1 = require("../../settings");
 const factory_1 = require("./reserve/factory");
+const validateStartRequest_1 = require("./reserve/validateStartRequest");
 /**
  * 取引開始
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c, _d, _e;
+        const now = new Date();
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
         if (typeof reservationNumber !== 'string' || reservationNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
+        // eventをfix
+        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+            throw new factory.errors.ArgumentNull('object.reservationFor.id');
+        }
+        let event;
+        if (typeof ((_b = params.preSearchedEvent) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+            event = params.preSearchedEvent;
+        }
+        else {
+            event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+        }
+        // validationを承認アクション開始前から移行(2023-01-27~)
+        (0, validateStartRequest_1.validateStartRequest)({
+            object: params.object,
+            event,
+            validateEventOfferPeriod: params.validateEventOfferPeriod,
+            validateEvent: params.validateEvent,
+            now,
+            store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
+        });
         const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { reservationNumber: reservationNumber }));
         // 取引作成
         let transaction;
@@ -47,10 +69,14 @@ function start(params) {
             throw error;
         }
         // 指定があれば予約追加
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
             transaction = yield addReservations({
                 id: transaction.id,
                 object: params.object,
+                event,
+                preSearchedTicketOffers: params.preSearchedTicketOffers,
+                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+                availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             })(repos);
         }
@@ -67,21 +93,8 @@ function addReservations(params) {
         var _a;
         const now = new Date();
         let transaction = yield repos.assetTransaction.findById({ typeOf: factory.assetTransactionType.Reserve, id: params.id });
-        // イベント存在確認
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
-            throw new factory.errors.ArgumentNull('object.reservationFor.id');
-        }
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
-        // const event = await repos.event.findById(
-        //     { id: params.object.reservationFor.id },
-        //     {
-        //         // 予約データに不要な属性は取得しない
-        //         aggregateReservation: 0, aggregateOffer: 0, attendeeCount: 0,
-        //         checkInCount: 0, maximumAttendeeCapacity: 0, remainingAttendeeCapacity: 0
-        //     }
-        // );
+        const event = params.event;
         if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }
@@ -90,14 +103,26 @@ function addReservations(params) {
         }
         // 受け入れたオファーIDだけ取得する(2023-01-26~)
         const acceptedOfferIds = [...new Set(acceptedOffers.map((o) => String(o.id)))];
-        // イベントオファー検索
-        const { ticketOffers, unitPriceOffers } = yield OfferService.event.searchEventTicketOffers({
-            ids: acceptedOfferIds,
-            event: { id: event.id },
-            sort: false // ソート不要(2023-01-27~)
-        })(repos);
+        let ticketOffers;
+        let availableOffers;
+        // 承認アクションを介した予約取引開始時の冗長なオファー検索処理について最適化(2023-01-27~)
+        if (Array.isArray(params.preSearchedTicketOffers) && Array.isArray(params.preSearchedUnitPriceOffers)) {
+            ticketOffers = params.preSearchedTicketOffers;
+            availableOffers = params.preSearchedUnitPriceOffers;
+        }
+        else {
+            // イベントオファー検索
+            const searchEventTicketOffersResult = yield OfferService.event.searchEventTicketOffers({
+                ids: acceptedOfferIds,
+                event: { id: event.id },
+                // 対応アプリケーション条件追加(2023-01-27~)
+                store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
+                sort: false // ソート不要(2023-01-27~)
+            })(repos);
+            ticketOffers = searchEventTicketOffersResult.ticketOffers;
+            availableOffers = searchEventTicketOffersResult.unitPriceOffers;
+        }
         // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
-        const availableOffers = unitPriceOffers;
         // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
         // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -37,7 +37,7 @@ declare type IAuthorizeOfferAction = factory.action.authorize.offer.seatReservat
 /**
  * イベントオファー承認
  */
-export declare function authorize(params: {
+declare function authorize(params: {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
@@ -49,11 +49,8 @@ export declare function authorize(params: {
     transaction: {
         id: string;
     };
-    validateEventOfferPeriod?: boolean;
-    validateEvent?: boolean;
-    /**
-     * どの店舗に対して
-     */
+    validateEventOfferPeriod: boolean;
+    validateEvent: boolean;
     store: {
         /**
          * 販売アプリケーションID
@@ -61,4 +58,4 @@ export declare function authorize(params: {
         id: string;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
-export {};
+export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
-const moment = require("moment");
 const factory = require("../../../factory");
 const ReserveTransactionService = require("../../assetTransaction/reserve");
 const CodeService = require("../../code");
@@ -22,9 +21,8 @@ const factory_1 = require("./factory");
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = new Date();
-        const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(Object.assign(Object.assign({}, params), { now, store: params.store }))({ event: repos.event, transaction: repos.transaction });
-        const acceptedOffers = yield validateAcceptedOffers({
+        const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(params)({ event: repos.event, transaction: repos.transaction });
+        const { acceptedOffers, ticketOffers, unitPriceOffers } = yield validateAcceptedOffers({
             object: params.object,
             event,
             seller: { typeOf: transaction.seller.typeOf, id: String(transaction.seller.id) },
@@ -63,7 +61,12 @@ function authorize(params) {
                         action,
                         event,
                         transactionNumber,
-                        transaction
+                        transaction,
+                        availableAtOrFrom: { id: params.store.id },
+                        ticketOffers,
+                        unitPriceOffers,
+                        validateEvent: params.validateEvent === true,
+                        validateEventOfferPeriod: params.validateEventOfferPeriod === true
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -113,7 +116,6 @@ exports.authorize = authorize;
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const now = params.now;
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -134,14 +136,6 @@ function validateCreateRequest(params) {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
         }
         const bookingServiceIdentifire = offeredThrough.identifier;
-        if (bookingServiceIdentifire === factory.service.webAPI.Identifier.Chevre) {
-            if (params.validateEventOfferPeriod === true) {
-                validateEventOfferPeriod({ event, now, availableAt: { id: params.store.id } });
-            }
-            if (params.validateEvent === true) {
-                validateEvent({ event, object: params.object });
-            }
-        }
         return { transaction, event, bookingServiceIdentifire };
     });
 }
@@ -168,7 +162,7 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, validateAppliesToMovieTicket: true }))(repos);
+        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true }))(repos);
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: responseBody,
@@ -209,70 +203,6 @@ function validateObjectWithoutDetail(params) {
         return objectWithoutDetail;
     });
 }
-/**
- * イベントのオファー有効期間を検証する
- */
-function validateEventOfferPeriod(params) {
-    const acceptedDate = moment(params.now);
-    const eventOffers = params.event.offers;
-    // アプリケーションごとの設定を参照する(2022-11-19~)
-    const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
-        return Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom[0].id === params.availableAt.id;
-    });
-    if (makesOfferOnApplication === undefined) {
-        throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
-    }
-    const validFrom = makesOfferOnApplication.validFrom;
-    const validThrough = makesOfferOnApplication.validThrough;
-    // const validFrom = eventOffers?.validFrom;
-    // const validThrough = eventOffers?.validThrough;
-    if (validFrom !== undefined && validFrom !== null) {
-        if (acceptedDate.isBefore(moment(validFrom))) {
-            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
-        }
-    }
-    if (validThrough !== undefined && validThrough !== null) {
-        if (acceptedDate.isAfter(moment(validThrough))) {
-            throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
-        }
-    }
-}
-/**
- * イベントの上限座席数を検証する
- */
-function validateEvent(params) {
-    var _a, _b;
-    // const acceptedDate = moment(params.now);
-    const eventOffers = params.event.offers;
-    // const validFrom = eventOffers?.validFrom;
-    // const validThrough = eventOffers?.validThrough;
-    // if (validFrom !== undefined && validFrom !== null) {
-    //     if (acceptedDate.isBefore(moment(validFrom))) {
-    //         throw new factory.errors.Argument(
-    //             'reservationFor.id',
-    //             `Offer of ${params.event.id} is valid from ${validFrom}`
-    //         );
-    //     }
-    // }
-    // if (validThrough !== undefined && validThrough !== null) {
-    //     if (acceptedDate.isAfter(moment(validThrough))) {
-    //         throw new factory.errors.Argument(
-    //             'reservationFor.id',
-    //             `Offer of ${params.event.id} is valid through ${validThrough}`
-    //         );
-    //     }
-    // }
-    // イベントのmaxValueを検証
-    const maxValue = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
-    if (typeof maxValue === 'number') {
-        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
-        if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
-            if (numAcceptedOffers > maxValue) {
-                throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
-            }
-        }
-    }
-}
 /**
  * 受け入れらたオファーの内容を検証
  */
@@ -283,11 +213,11 @@ function validateAcceptedOffers(params) {
             ? [...new Set(acceptedOffersWithoutDetail.map((o) => o.id))]
             : [];
         // 利用可能なチケットオファーを検索
-        const { ticketOffers } = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
+        const { ticketOffers, unitPriceOffers } = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
             // 受け入れたオファーIDだけ取得する(2023-01-26~)
             ids: offerIds,
             event: { id: params.event.id },
-            seller: params.seller,
+            // seller: params.seller,
             store: params.store,
             sort: false // ソート不要(2023-01-27~)
         })(repos);
@@ -333,7 +263,7 @@ function validateAcceptedOffers(params) {
                 }
             }
         });
-        return acceptedOffers;
+        return { acceptedOffers, ticketOffers, unitPriceOffers };
     });
 }
 function acceptedOfferWithoutDetail2acceptedOffer(params) {

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -29,12 +29,10 @@ declare function searchEventTicketOffers(params: {
     };
     /**
      * どの販売者に対して
+     * 不要なので廃止(2023-01-27~)
      */
-    seller?: {
-        id?: string;
-    };
     /**
-     * どの店舗に対して
+     * どのアプリケーションに対して
      */
     store?: {
         id?: string;

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -19,7 +19,7 @@ const factory_1 = require("../factory");
 function searchTransportationEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const screeningEvent = params.event;
         const soundFormatTypes = [];
         const videoFormatTypes = [];
@@ -32,6 +32,7 @@ function searchTransportationEventTicketOffers(params) {
                 availableOffers = yield repos.offer.findOffersByOfferCatalogId({
                     ids: params.ids,
                     offerCatalog: { id: transportation.hasOfferCatalog.id },
+                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
                     sort: params.sort
                 });
             }
@@ -109,9 +110,12 @@ function searchTransportationEventTicketOffers(params) {
             const offerAddOn = [];
             if (Array.isArray(offer.addOn)) {
                 for (const addOn of offer.addOn) {
-                    const productId = (_c = addOn.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
+                    const productId = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
                     if (typeof productId === 'string') {
-                        const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
+                        const productOffers = yield searchAddOns({
+                            product: { id: productId },
+                            store: params.store
+                        })(repos);
                         offerAddOn.push(...productOffers);
                     }
                 }
@@ -130,7 +134,7 @@ function searchTransportationEventTicketOffers(params) {
 function searchScreeningEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         // イベント取得属性最適化(2023-01-23~)
         // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.eventId });
         const screeningEvent = params.event;
@@ -147,6 +151,7 @@ function searchScreeningEventTicketOffers(params) {
                 availableOffers = yield repos.offer.findOffersByOfferCatalogId({
                     ids: params.ids,
                     offerCatalog: { id: eventService.hasOfferCatalog.id },
+                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
                     sort: params.sort
                 });
             }
@@ -224,7 +229,7 @@ function searchScreeningEventTicketOffers(params) {
             const offerAddOn = [];
             if (Array.isArray(offer.addOn)) {
                 for (const addOn of offer.addOn) {
-                    const productId = (_c = addOn.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
+                    const productId = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
                     if (typeof productId === 'string') {
                         const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
                         offerAddOn.push(...productOffers);
@@ -326,7 +331,7 @@ function checkAvailability(params) {
  */
 function searchAddOns(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         let offers = [];
         const productId = (_a = params.product) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof productId === 'string') {
@@ -335,6 +340,7 @@ function searchAddOns(params) {
             if (typeof offerCatalogId === 'string') {
                 offers = yield repos.offer.findOffersByOfferCatalogId({
                     offerCatalog: { id: offerCatalogId },
+                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
                     sort: true
                 });
                 offers = offers.map((o) => {
@@ -358,7 +364,6 @@ function searchAddOns(params) {
 function searchEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = moment();
         let event;
         // イベント取得属性最適化(2023-01-23~)
@@ -384,6 +389,7 @@ function searchEventTicketOffers(params) {
                     const searchOffersResult = yield searchScreeningEventTicketOffers({
                         ids: params.ids,
                         event,
+                        store: params.store,
                         sort: params.sort
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
@@ -393,6 +399,7 @@ function searchEventTicketOffers(params) {
                     const searchOffersResult = yield searchTransportationEventTicketOffers({
                         ids: params.ids,
                         event,
+                        store: params.store,
                         sort: params.sort
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
@@ -401,14 +408,15 @@ function searchEventTicketOffers(params) {
                 else {
                     throw new factory.errors.NotImplemented(`'${event.typeOf}' not implemented`);
                 }
-                const specifiedStoreId = (_a = params.store) === null || _a === void 0 ? void 0 : _a.id;
-                if (typeof specifiedStoreId === 'string') {
-                    // アプリケーションが利用可能なオファーに絞る
-                    offers = offers.filter((o) => {
-                        return Array.isArray(o.availableAtOrFrom)
-                            && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
-                    });
-                }
+                // store.idでのフィルターをmongoに移行(2023-01-27~)
+                // const specifiedStoreId = params.store?.id;
+                // if (typeof specifiedStoreId === 'string') {
+                //     // アプリケーションが利用可能なオファーに絞る
+                //     offers = offers.filter((o) => {
+                //         return Array.isArray(o.availableAtOrFrom)
+                //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
+                //     });
+                // }
                 // 有効期間を適用
                 if (params.onlyValid === true) {
                     offers = offers.filter((o) => {
@@ -426,14 +434,17 @@ function searchEventTicketOffers(params) {
                 }
                 for (const offer of offers) {
                     if (Array.isArray(offer.addOn)) {
+                        // store.idでのフィルターをmongoに移行(2023-01-27~)
                         // addOnsに対しても利用可能アプリケーション設定を適用
-                        if (typeof specifiedStoreId === 'string') {
-                            // アプリケーションが利用可能なオファーに絞る
-                            offer.addOn = offer.addOn.filter((offer4addOn) => {
-                                return Array.isArray(offer4addOn.availableAtOrFrom)
-                                    && offer4addOn.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
-                            });
-                        }
+                        // if (typeof specifiedStoreId === 'string') {
+                        //     // アプリケーションが利用可能なオファーに絞る
+                        //     offer.addOn = offer.addOn.filter((offer4addOn) => {
+                        //         return Array.isArray(offer4addOn.availableAtOrFrom)
+                        //             && offer4addOn.availableAtOrFrom.some(
+                        //                 (availableApplication) => availableApplication.id === specifiedStoreId
+                        //             );
+                        //     });
+                        // }
                         // addOnsに対しても有効期間を適用
                         if (params.onlyValid === true) {
                             offer.addOn = offer.addOn.filter((offer4addOn) => {

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.33"
+  "version": "20.2.0-alpha.35"
 }