@chevre/domain 20.2.0-alpha.2 → 20.2.0-alpha.21

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -468,7 +468,10 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, subReservation: pendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+        const reservationPackage = Object.assign({ reservationFor, reservationNumber: pendingReservations[0].reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+            // 不要なので廃止(2023-01-19~)
+            // subReservation: pendingReservations,
+            typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
         reserveActionAttributes = [{
                 project: transaction.project,
                 typeOf: factory.actionType.ReserveAction,
@@ -550,3 +553,31 @@ function createMoneyTransferActions(params) {
     }
     return moneyTransfer;
 }
+function createPendingReservationAction(params) {
+    const transaction = params.transaction;
+    const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+    let cancelActionAttributes = [];
+    if (pendingReservations.length > 0) {
+        const reservationFor = transaction.object.reservationFor;
+        if (reservationFor === undefined) {
+            throw new factory.errors.NotFound('transaction.object.reservationFor');
+        }
+        // ReservationPackageに対応(2022-12-23~)
+        const reservationPackage = {
+            typeOf: factory.reservationType.ReservationPackage,
+            reservationNumber: transaction.transactionNumber,
+            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            reservationStatus: pendingReservations[0].reservationStatus
+        };
+        cancelActionAttributes = [{
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                purpose: { typeOf: transaction.typeOf, id: transaction.id },
+                agent: transaction.project,
+                object: reservationPackage,
+                potentialActions: {}
+            }];
+    }
+    return cancelActionAttributes;
+}
+exports.createPendingReservationAction = createPendingReservationAction;

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

@@ -54,10 +54,14 @@ export declare type ITaskAndTransactionOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
-export declare type IConfirmOperation<T> = (repos: {
+interface IConfirmRepo {
+    action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-}) => Promise<T>;
+    reservation: ReservationRepo;
+    task: TaskRepo;
+}
+export declare type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
 /**
  * 取引開始
  */
@@ -81,3 +85,4 @@ export declare function cancel(params: {
 export declare function exportTasksById(params: {
     id: string;
 }): ITaskAndTransactionOperation<factory.task.ITask<factory.taskName>[]>;
+export {};

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

@@ -18,6 +18,7 @@ const pecorinoapi = require("../../pecorinoapi");
 const factory = require("../../factory");
 const OfferService = require("../offer");
 const cancelReservation_1 = require("../reserve/cancelReservation");
+const confirmReservation_1 = require("../reserve/confirmReservation");
 const settings_1 = require("../../settings");
 const factory_1 = require("./reserve/factory");
 /**
@@ -571,8 +572,14 @@ function confirm(params) {
             typeOf: factory.assetTransactionType.Reserve,
             id: transaction.id,
             result: result,
-            potentialActions: potentialActions
+            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+                ? { reserve: [] }
+                : potentialActions
         });
+        if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+            // sync対応(2023-01-13~)
+            yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
+        }
     });
 }
 exports.confirm = confirm;
@@ -614,34 +621,9 @@ function cancel(params) {
         });
         // 本来非同期でタスクが実行されるが、同期的に仮予約取消が実行されていないと、サービス利用側が困る可能性があるので、
         // 同期的にもcancelPendingReservationを実行しておく
-        try {
-            const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-            let cancelActionAttributes = [];
-            if (pendingReservations.length > 0) {
-                const reservationFor = transaction.object.reservationFor;
-                if (reservationFor === undefined) {
-                    throw new factory.errors.NotFound('transaction.object.reservationFor');
-                }
-                // ReservationPackageに対応(2022-12-23~)
-                const reservationPackage = {
-                    typeOf: factory.reservationType.ReservationPackage,
-                    reservationNumber: transaction.transactionNumber,
-                    reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-                    reservationStatus: pendingReservations[0].reservationStatus
-                };
-                cancelActionAttributes = [{
-                        project: transaction.project,
-                        typeOf: factory.actionType.CancelAction,
-                        purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                        agent: transaction.project,
-                        object: reservationPackage,
-                        potentialActions: {}
-                    }];
-                yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
-            }
-        }
-        catch (error) {
-            // no op
+        const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
+        if (cancelActionAttributes.length > 0) {
+            yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
         }
     });
 }
@@ -704,29 +686,29 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-            case factory.transactionStatusType.Expired:
-                const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-                let cancelActionAttributes = [];
-                if (pendingReservations.length > 0) {
-                    const reservationFor = transaction.object.reservationFor;
-                    if (reservationFor === undefined) {
-                        throw new factory.errors.NotFound('transaction.object.reservationFor');
-                    }
-                    // ReservationPackageに対応(2022-12-23~)
-                    const reservationPackage = {
-                        typeOf: factory.reservationType.ReservationPackage,
-                        reservationNumber: transaction.transactionNumber,
-                        reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-                        reservationStatus: pendingReservations[0].reservationStatus
-                    };
-                    cancelActionAttributes = [{
+                // sync対応(2023-01-13~)
+                if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
+                    const cancelActionAttributes4canceled = (0, factory_1.createPendingReservationAction)({ transaction });
+                    if (cancelActionAttributes4canceled.length > 0) {
+                        const cancelPendingReservationTask = {
                             project: transaction.project,
-                            typeOf: factory.actionType.CancelAction,
-                            purpose: { typeOf: transaction.typeOf, id: transaction.id },
-                            agent: transaction.project,
-                            object: reservationPackage,
-                            potentialActions: {}
-                        }];
+                            name: factory.taskName.CancelPendingReservation,
+                            status: factory.taskStatus.Ready,
+                            runsAt: new Date(),
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: {
+                                actionAttributes: cancelActionAttributes4canceled
+                            }
+                        };
+                        taskAttributes.push(cancelPendingReservationTask);
+                    }
+                }
+                break;
+            case factory.transactionStatusType.Expired:
+                const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
+                if (cancelActionAttributes.length > 0) {
                     const cancelPendingReservationTask = {
                         project: transaction.project,
                         name: factory.taskName.CancelPendingReservation,

package/lib/chevre/service/delivery/factory.js

@@ -22,6 +22,7 @@ function createOwnershipInfosFromOrder(params) {
         const ownedBy = createOwnedby(params);
         const itemOfferedType = itemOffered.typeOf;
         switch (itemOfferedType) {
+            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
                     project: params.order.project,

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

@@ -3,6 +3,7 @@ import { MongoRepository as CategoryCodeRepo } from '../repo/categoryCode';
 import { MongoRepository as EventRepo } from '../repo/event';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 import { MongoRepository as ProjectRepo } from '../repo/project';
+import { MongoRepository as SellerRepo } from '../repo/seller';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 /**
@@ -32,6 +33,7 @@ export declare function importFromCOA(params: {
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     place: PlaceRepo;
+    seller: SellerRepo;
 }) => Promise<void>;
 /**
  * COA情報からイベントIDを作成する
@@ -49,10 +51,6 @@ export declare function updateEvent4ttts(params: {
      * 旧イベントID
      */
     oldEventId: string;
-    /**
-     * 旧IDを使用しない場合、IDは自動発行される
-     */
-    useOldEventId: boolean;
     /**
      * イベント属性
      */

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);
@@ -539,11 +549,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 +628,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 +674,8 @@ function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
                 value: 2678400,
                 unitCode: factory.unitCode.Sec
             }
-        }
+        },
+        parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
 /**
@@ -731,8 +743,7 @@ function updateEvent4ttts(params) {
         try {
             event = yield repos.event.save4ttts({
                 oldEventId: params.oldEventId,
-                attributes: params.attributes,
-                useOldEventId: params.useOldEventId
+                attributes: params.attributes
             });
         }
         catch (error) {

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.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.js

@@ -13,6 +13,112 @@ exports.searchEventTicketOffers = void 0;
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
 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;
+        const screeningEvent = yield repos.event.findById({ id: params.eventId });
+        const soundFormatTypes = [];
+        const videoFormatTypes = [];
+        let availableOffers = [];
+        // 興行設定があれば興行のカタログを参照する(2022-08-31~)
+        const eventOffers = screeningEvent.offers;
+        if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+            const transportation = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+            if (typeof ((_b = transportation.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    offerCatalog: { id: transportation.hasOfferCatalog.id }
+                });
+            }
+        }
+        else {
+            // hasOfferCatalog参照廃止(2022-09-02~)
+            throw new factory.errors.NotFound('event.offers.itemOffered.id');
+        }
+        const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: screeningEvent.project.id }, soundFormatTypes, videoFormatTypes })(repos);
+        const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
+        // 不許可決済方法があれば、該当オファーを除外
+        if (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0) {
+            availableOffers = availableOffers.filter((o) => {
+                var _a;
+                // 複数決済カード対応(2022-07-11~)
+                const priceSpecificationAppliesToMovieTicket = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
+                if (Array.isArray(priceSpecificationAppliesToMovieTicket)) {
+                    return priceSpecificationAppliesToMovieTicket.every((appliesToMovieTicket) => {
+                        return !unacceptedPaymentMethod.includes(appliesToMovieTicket.serviceOutput.typeOf);
+                    });
+                }
+                else {
+                    // Arrayでないケースは廃止(2022-09-10~)
+                    return true;
+                }
+            });
+        }
+        // 適用決済カード条件がある場合、決済カード加算料金が存在しないオファーは除外する
+        availableOffers = availableOffers.filter((o) => {
+            var _a;
+            // 複数決済カード対応(2022-07-26~)
+            const priceSpecificationAppliesToMovieTicket = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
+            if (Array.isArray(priceSpecificationAppliesToMovieTicket)) {
+                // 適用決済カード数が0であれば除外
+                if (priceSpecificationAppliesToMovieTicket.length === 0) {
+                    return false;
+                }
+                // 上映方式がなければ除外(2022-11-03~)
+                if (videoFormatTypes.length === 0) {
+                    return false;
+                }
+                return priceSpecificationAppliesToMovieTicket.every((appliesToMovieTicket) => {
+                    // すべての上映方式について検証する(2022-10-29~)
+                    return videoFormatTypes.every((videoFormat) => {
+                        return movieTicketTypeChargeSpecs.some((s) => {
+                            var _a, _b, _c, _d;
+                            return ((_b = (_a = s.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.typeOf) === ((_c = appliesToMovieTicket.serviceOutput) === null || _c === void 0 ? void 0 : _c.typeOf)
+                                && ((_d = s.appliesToMovieTicket) === null || _d === void 0 ? void 0 : _d.serviceType) === appliesToMovieTicket.serviceType
+                                && s.appliesToVideoFormat === videoFormat;
+                        });
+                    });
+                });
+            }
+            else {
+                // Arrayでないケースは廃止(2022-09-10~)
+                return true;
+            }
+        });
+        let offers4event = availableOffers.map((availableOffer) => {
+            return (0, factory_1.createCompoundPriceSpec4event)({
+                eligibleQuantity: eventOffers.eligibleQuantity,
+                offer: availableOffer,
+                videoFormatChargeSpecifications,
+                soundFormatChargeSpecifications,
+                movieTicketTypeChargeSpecs,
+                videoFormatTypes
+            });
+        });
+        // レート制限を確認
+        offers4event = yield Promise.all(offers4event.map((offer) => __awaiter(this, void 0, void 0, function* () {
+            return checkAvailability({ event: screeningEvent, offer })(repos);
+        })));
+        // アドオン設定があれば、プロダクトオファーを検索
+        for (const offer of offers4event) {
+            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;
+                    if (typeof productId === 'string') {
+                        const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
+                        offerAddOn.push(...productOffers);
+                    }
+                }
+            }
+            offer.addOn = offerAddOn;
+        }
+        return offers4event;
+    });
+}
 /**
  * 興行オファー全検索
  */
@@ -243,9 +349,7 @@ function searchEventTicketOffers(params) {
         var _a;
         const now = moment();
         let event;
-        event = yield repos.event.findById({
-            id: params.event.id
-        });
+        event = yield repos.event.findById({ id: params.event.id });
         let offers;
         const eventOffers = event.offers;
         if (eventOffers === undefined) {
@@ -259,7 +363,15 @@ function searchEventTicketOffers(params) {
                 throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
             default:
                 // Chevreで券種オファーを検索
-                offers = yield searchScreeningEventTicketOffers({ eventId: params.event.id })(repos);
+                if (event.typeOf === factory.eventType.ScreeningEvent) {
+                    offers = yield searchScreeningEventTicketOffers({ eventId: params.event.id })(repos);
+                }
+                else if (event.typeOf === factory.eventType.Event) {
+                    offers = yield searchTransportationEventTicketOffers({ eventId: params.event.id })(repos);
+                }
+                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') {
                     // アプリケーションが利用可能なオファーに絞る

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

@@ -114,8 +114,6 @@ function processVoidTransaction4chevre(params) {
                 transactionNumber: { $eq: transactionNumber }
             });
             if (assetTransactions.length > 0) {
-                // 予約取引サービスで中止
-                // await repos.reserveTransaction.cancel({ transactionNumber });
                 yield ReserveTransactionService.cancel({ transactionNumber })(repos);
             }
         }

package/lib/chevre/service/offer.js

@@ -67,34 +67,38 @@ function addOffers2Seat(params) {
  */
 function searchEventSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let offers = [];
-        const screeningEvent = yield repos.event.findById({
+        const event = yield repos.event.findById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか
-        const eventOffers = screeningEvent.offers;
+        const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
         if (reservedSeatsAvailable) {
             // 座席タイプ価格仕様を検索
             const priceSpecs = yield repos.priceSpecification.search({
-                project: { id: { $eq: screeningEvent.project.id } },
+                project: { id: { $eq: event.project.id } },
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                 appliesToCategoryCode: {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
+            // const roomBranchCode = event.location.branchCode;
+            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
+            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
             const seats = yield repos.place.searchSeats({
-                project: { id: { $eq: screeningEvent.project.id } },
-                branchCode: { $in: (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$in },
+                project: { id: { $eq: event.project.id } },
+                branchCode: { $in: (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in },
                 containedInPlace: {
                     branchCode: {
-                        $in: (_e = (_d = params.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$in
+                        $in: (_j = (_h = params.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$in
                     },
                     containedInPlace: {
-                        branchCode: { $eq: screeningEvent.location.branchCode },
+                        branchCode: { $eq: roomBranchCode },
                         containedInPlace: {
-                            branchCode: { $eq: screeningEvent.superEvent.location.branchCode }
+                            branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
                 },
@@ -114,7 +118,7 @@ function searchEventSeatOffers(params) {
                 offers = seats.map((seat, index) => {
                     var _a;
                     return addOffers2Seat({
-                        project: screeningEvent.project,
+                        project: event.project,
                         seat: seat,
                         seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
                         unavailableOffers: [],
@@ -133,33 +137,37 @@ exports.searchEventSeatOffers = searchEventSeatOffers;
  */
 function searchEventSeatOffersWithPaging(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
-        const screeningEvent = yield repos.event.findById({
+        const event = yield repos.event.findById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか
-        const eventOffers = screeningEvent.offers;
+        const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
         if (reservedSeatsAvailable) {
             // 座席タイプ価格仕様を検索
             const priceSpecs = yield repos.priceSpecification.search({
-                project: { id: { $eq: screeningEvent.project.id } },
+                project: { id: { $eq: event.project.id } },
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                 appliesToCategoryCode: {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
-            const seats = yield repos.place.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: screeningEvent.project.id } }, containedInPlace: {
+            // const roomBranchCode = event.location.branchCode;
+            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
+            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            const seats = yield repos.place.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, containedInPlace: {
                     branchCode: {
-                        $eq: (typeof ((_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
-                            ? (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$eq
+                        $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
+                            ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
                             : undefined
                     },
                     containedInPlace: {
-                        branchCode: { $eq: screeningEvent.location.branchCode },
+                        branchCode: { $eq: roomBranchCode },
                         containedInPlace: {
-                            branchCode: { $eq: screeningEvent.superEvent.location.branchCode }
+                            branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
                 } }));
@@ -177,7 +185,7 @@ function searchEventSeatOffersWithPaging(params) {
                 offers = seats.map((seat, index) => {
                     var _a;
                     return addOffers2Seat({
-                        project: screeningEvent.project,
+                        project: event.project,
                         seat: seat,
                         seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
                         unavailableOffers: [],

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -184,7 +184,8 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
         ? params.order.acceptedOffers.filter((o) => {
             var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
                 && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
         })
             .map((o) => {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -271,7 +271,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         // 注文アイテムから返却アクションを作成する
         const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
                 const reservation = acceptedOffer.itemOffered;
                 const reservationNumber = reservation.reservationNumber;
                 // 予約番号ごとに返却アクションを作成する