@chevre/domain 20.2.0-alpha.4 → 20.2.0-alpha.40

package/lib/chevre/service/event.js

@@ -89,8 +89,18 @@ function importFromCOA(params) {
                 endpoint: credentials_1.credentials.coa.endpoint,
                 auth: coaAuthClient
             }, { timeout: credentials_1.credentials.coa.timeout });
+            // 同ブランチコードの販売者を検索する
+            const sellersWithSameBranchCode = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                branchCode: { $eq: params.locationBranchCode }
+            });
+            const seller = sellersWithSameBranchCode.shift();
+            if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
+                throw new factory.errors.NotFound('Seller', `Seller with branchCod '${params.locationBranchCode}' not found`);
+            }
             // 施設取得
-            let movieTheater = createMovieTheaterFromCOA(project, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
+            let movieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
             // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
             if (params.saveMovieTheater === true) {
                 movieTheater = yield repos.place.saveMovieTheaterByBranchCode4coa(movieTheater);
@@ -346,8 +356,19 @@ function createScreeningEvents(params) {
 }
 function cancelDeletedEvents(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // distinctでidのみ取得(2023-01-25~)
         // COAから削除されたイベントをキャンセル済ステータスへ変更
-        const ids = yield repos.event.search({
+        // const ids = await repos.event.search<factory.eventType.ScreeningEvent>({
+        //     project: { id: { $eq: params.project.id } },
+        //     typeOf: factory.eventType.ScreeningEvent,
+        //     superEvent: {
+        //         locationBranchCodes: [params.locationBranchCode]
+        //     },
+        //     startFrom: params.targetImportFrom,
+        //     startThrough: params.targetImportThrough
+        // })
+        //     .then((events) => events.map((e) => e.id));
+        const ids = yield repos.event.searchIds({
             project: { id: { $eq: params.project.id } },
             typeOf: factory.eventType.ScreeningEvent,
             superEvent: {
@@ -355,8 +376,7 @@ function cancelDeletedEvents(params) {
             },
             startFrom: params.targetImportFrom,
             startThrough: params.targetImportThrough
-        })
-            .then((events) => events.map((e) => e.id));
+        });
         const idsShouldBe = params.idsShouldBe;
         const cancelledIds = difference(ids, idsShouldBe);
         debug(`cancelling ${cancelledIds.length} events...`);
@@ -539,11 +559,12 @@ function createScreeningEventSeriesFromCOA(params) {
             kanaName: params.movieTheater.kanaName,
             typeOf: params.movieTheater.typeOf
         },
-        organizer: {
-            typeOf: factory.organizationType.Corporation,
-            identifier: params.movieTheater.id,
-            name: params.movieTheater.name
-        },
+        // 不要なので廃止(2023-01-12~)
+        // organizer: {
+        //     typeOf: factory.organizationType.Corporation,
+        //     identifier: params.movieTheater.id,
+        //     name: params.movieTheater.name
+        // },
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
         workPerformed: {
@@ -617,7 +638,7 @@ function createScreeningEventSeriesId(params) {
  */
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */
-function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
+function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromCOA) {
     const id = `MovieTheater-${theaterFromCOA.theaterCode}`;
     return {
         project: { typeOf: project.typeOf, id: project.id },
@@ -663,7 +684,8 @@ function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
                 value: 2678400,
                 unitCode: factory.unitCode.Sec
             }
-        }
+        },
+        parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
 /**
@@ -731,8 +753,7 @@ function updateEvent4ttts(params) {
         try {
             event = yield repos.event.save4ttts({
                 oldEventId: params.oldEventId,
-                attributes: params.attributes,
-                useOldEventId: params.useOldEventId
+                attributes: params.attributes
             });
         }
         catch (error) {
@@ -748,7 +769,7 @@ function updateEvent4ttts(params) {
         }
         // アクション完了
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, offer_1.onEventChanged)(event)({
+        yield (0, offer_1.onEventChanged)({ event, isNew: false })({
             event: repos.event,
             project: repos.project,
             task: repos.task

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
@@ -124,20 +126,16 @@ function validateCreateRequest(params) {
         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 event = yield repos.event.findById({ id: params.object.reservationFor.id });
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.reservationFor.id });
+        const event = yield repos.event.findMinimizedIndividualEventById({
+            id: params.object.reservationFor.id
+        });
         let offeredThrough = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (offeredThrough === undefined) {
             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 };
     });
 }
@@ -164,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,
@@ -205,87 +203,29 @@ 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`);
-            }
-        }
-    }
-}
 /**
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const acceptedOffersWithoutDetail = params.object.acceptedOffer;
+        const offerIds = (Array.isArray(acceptedOffersWithoutDetail))
+            ? [...new Set(acceptedOffersWithoutDetail.map((o) => o.id))]
+            : [];
         // 利用可能なチケットオファーを検索
-        const availableTicketOffers = 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,
-            store: params.store
+            // seller: params.seller,
+            store: params.store,
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
-        const acceptedOffersWithoutDetail = params.object.acceptedOffer;
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))
             ? yield Promise.all(acceptedOffersWithoutDetail.map((offerWithoutDetail) => __awaiter(this, void 0, void 0, function* () {
                 return acceptedOfferWithoutDetail2acceptedOffer({
-                    availableTicketOffers,
+                    availableTicketOffers: ticketOffers,
                     offerWithoutDetail,
                     event: params.event,
                     transaction: params.transaction,
@@ -294,7 +234,6 @@ function validateAcceptedOffers(params) {
             })))
             : [];
         // オファーIDごとにオファー適用条件を確認
-        const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
         offerIds.forEach((offerId) => {
             var _a;
             const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
@@ -324,7 +263,7 @@ function validateAcceptedOffers(params) {
                 }
             }
         });
-        return acceptedOffers;
+        return { acceptedOffers, ticketOffers, unitPriceOffers };
     });
 }
 function acceptedOfferWithoutDetail2acceptedOffer(params) {

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

@@ -37,7 +37,6 @@ function cancel(params) {
                 const transactionNumber = (_a = action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
                 if (typeof transactionNumber === 'string') {
                     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)
-                    // await repos.reserveTransaction.cancel({ transactionNumber: action.object.pendingTransaction?.transactionNumber });
                     yield ReserveTransactionService.cancel({ transactionNumber })(repos);
                 }
         }

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

@@ -1,5 +1,6 @@
 import * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 export declare type IReservationFor = factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
 export declare type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
 export declare type IObjectWithoutDetail = factory.action.authorize.offer.seatReservation.IObjectWithoutDetail4chevre;
@@ -14,7 +15,7 @@ export declare function createReserveTransactionStartParams(params: {
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre[];
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     pendingTransaction?: factory.action.authorize.offer.seatReservation.IPendingTransaction | undefined;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
@@ -25,7 +26,7 @@ export declare function acceptedOffers2amount(params: {
 declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.assetTransaction.reserve.ITransaction;
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     project: {
         id: string;
         typeOf: factory.organizationType.Project;

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

@@ -211,7 +211,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
  */
 // tslint:disable-next-line:max-func-body-length
 function createReservation(params) {
-    var _a;
+    var _a, _b, _c, _d;
     const itemOffered = params.itemOffered;
     const event = params.event;
     let reservationItem;
@@ -243,16 +243,36 @@ function createReservation(params) {
                 .toDate(),
             // 最適化(2022-05-31~)
             superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
-            // 廃止(superEvent.workPerformedへ完全移行)
-            // workPerformed: {},
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor: reservationFor, reservedTicket: reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+            reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
     }
     else if (itemOffered.typeOf === factory.reservationType.BusReservation
         && event.typeOf === factory.eventType.Event) {
-        throw new factory.errors.NotImplemented(`${itemOffered.typeOf} not impelemented`);
+        const tripByEvent = (_c = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.itemOffered.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservationFor;
+        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
+            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
+        }
+        const reservationFor = {
+            typeOf: tripByEvent.typeOf,
+            id: event.id,
+            arrivalBusStop: tripByEvent.arrivalBusStop,
+            departureBusStop: tripByEvent.departureBusStop,
+            name: event.name,
+            departureTime: moment(tripByEvent.departureTime)
+                .toDate(),
+            arrivalTime: moment(tripByEvent.arrivalTime)
+                .toDate(),
+            busName: tripByEvent.busName,
+            busNumber: tripByEvent.busNumber,
+            identifier: tripByEvent.identifier
+        };
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+            reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            ? { programMembershipUsed: itemOffered.programMembershipUsed }
+            : undefined);
     }
     else {
         throw new factory.errors.Argument('itemOffered');

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

@@ -16,7 +16,11 @@ declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTic
 /**
  * 興行オファー検索
  */
-export declare function searchEventTicketOffers(params: {
+declare function searchEventTicketOffers(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     /**
      * どのイベントに対して
      */
@@ -25,12 +29,10 @@ export declare function searchEventTicketOffers(params: {
     };
     /**
      * どの販売者に対して
+     * 不要なので廃止(2023-01-27~)
      */
-    seller?: {
-        id?: string;
-    };
     /**
-     * どの店舗に対して
+     * どのアプリケーションに対して
      */
     store?: {
         id?: string;
@@ -72,5 +74,9 @@ export declare function searchEventTicketOffers(params: {
          */
         kbnEisyahousiki: string;
     };
-}): ISearchEventTicketOffersOperation<factory.product.ITicketOffer[]>;
-export {};
+    sort: boolean;
+}): ISearchEventTicketOffersOperation<{
+    ticketOffers: factory.product.ITicketOffer[];
+    unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];
+}>;
+export { searchEventTicketOffers };