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

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchEventTicketOffers = void 0;
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 const factory_1 = require("../factory");
 /**
  * 旅客オファー検索
@@ -23,18 +24,25 @@ function searchTransportationEventTicketOffers(params) {
         const screeningEvent = params.event;
         const soundFormatTypes = [];
         const videoFormatTypes = [];
+        const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
+        // 上映方式がなければMovieTicket除外(2023-02-21~)
+        const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         let availableOffers = [];
+        let sortedOfferIds = [];
         // 興行設定があれば興行のカタログを参照する(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({
-                    ids: params.ids,
-                    offerCatalog: { id: transportation.hasOfferCatalog.id },
-                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
-                    sort: params.sort
-                });
+                const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: transportation.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
+                    ? {
+                        limit: params.limit,
+                        page: params.page
+                    }
+                    : undefined));
+                availableOffers = findOffersByOfferCatalogIdResult.offers;
+                sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
             }
         }
         else {
@@ -42,24 +50,6 @@ function searchTransportationEventTicketOffers(params) {
             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;
@@ -71,9 +61,9 @@ function searchTransportationEventTicketOffers(params) {
                     return false;
                 }
                 // 上映方式がなければ除外(2022-11-03~)
-                if (videoFormatTypes.length === 0) {
-                    return false;
-                }
+                // if (videoFormatTypes.length === 0) {
+                //     return false;
+                // }
                 return priceSpecificationAppliesToMovieTicket.every((appliesToMovieTicket) => {
                     // すべての上映方式について検証する(2022-10-29~)
                     return videoFormatTypes.every((videoFormat) => {
@@ -92,13 +82,18 @@ function searchTransportationEventTicketOffers(params) {
             }
         });
         let offers4event = availableOffers.map((availableOffer) => {
+            let sortIndex;
+            if (params.addSortIndex) {
+                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
+            }
             return (0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
                 movieTicketTypeChargeSpecs,
-                videoFormatTypes
+                videoFormatTypes,
+                sortIndex
             });
         });
         if (params.validateOfferRateLimit) {
@@ -138,24 +133,30 @@ function searchScreeningEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // イベント取得属性最適化(2023-01-23~)
-        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.eventId });
         const screeningEvent = params.event;
         // 取得属性最適化(2023-01-25~)
         const superEvent = yield repos.event.findById({ id: screeningEvent.superEvent.id }, { soundFormat: 1, videoFormat: 1 });
         const soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
         const videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+        const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
+        // 上映方式がなければMovieTicket除外(2023-02-21~)
+        const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         let availableOffers = [];
+        let sortedOfferIds = [];
         // 興行設定があれば興行のカタログを参照する(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 eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                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
-                });
+                const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: eventService.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
+                    ? {
+                        limit: params.limit,
+                        page: params.page
+                    }
+                    : undefined));
+                availableOffers = findOffersByOfferCatalogIdResult.offers;
+                sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
             }
         }
         else {
@@ -163,16 +164,48 @@ function searchScreeningEventTicketOffers(params) {
             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) {
+        // Mongoオファー検索条件へ移行(2023-02-21~)
+        // if (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0) {
+        //     availableOffers = availableOffers.filter((o) => {
+        //         // 複数決済カード対応(2022-07-11~)
+        //         const priceSpecificationAppliesToMovieTicket = o.priceSpecification?.appliesToMovieTicket;
+        //         if (Array.isArray(priceSpecificationAppliesToMovieTicket)) {
+        //             return priceSpecificationAppliesToMovieTicket.every((appliesToMovieTicket) => {
+        //                 return !unacceptedPaymentMethod.includes(appliesToMovieTicket.serviceOutput.typeOf);
+        //             });
+        //         } else {
+        //             // Arrayでないケースは廃止(2022-09-10~)
+        //             return true;
+        //         }
+        //     });
+        // }
+        // 決済カード加算料金が存在しない場合自動補完する(2023-02-21~)
+        if (!settings_1.settings.useOffersAppliedToMovieTicketWithoutChargeSpecification) {
+            // 適用決済カード条件がある場合、決済カード加算料金が存在しないオファーは除外する
             availableOffers = availableOffers.filter((o) => {
                 var _a;
-                // 複数決済カード対応(2022-07-11~)
+                // 複数決済カード対応(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) => {
-                        return !unacceptedPaymentMethod.includes(appliesToMovieTicket.serviceOutput.typeOf);
+                        // すべての上映方式について検証する(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 {
@@ -181,45 +214,19 @@ function searchScreeningEventTicketOffers(params) {
                 }
             });
         }
-        // 適用決済カード条件がある場合、決済カード加算料金が存在しないオファーは除外する
-        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) => {
+            let sortIndex;
+            if (params.addSortIndex) {
+                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
+            }
             return (0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
                 movieTicketTypeChargeSpecs,
-                videoFormatTypes
+                videoFormatTypes,
+                sortIndex
             });
         });
         if (params.validateOfferRateLimit) {
@@ -253,9 +260,6 @@ function getUnacceptedPaymentMethodByEvent(params) {
     const eventOffers = params.event.offers;
     const unacceptedPaymentMethodByEvent = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.unacceptedPaymentMethod;
     // 施設コンテンツを参照する必要はない(2022-10-31~)
-    // if (Array.isArray(unacceptedPaymentMethodBySuperEvent)) {
-    //     unacceptedPaymentMethod = unacceptedPaymentMethodBySuperEvent;
-    // }
     // イベントにunacceptedPaymentMethod設定があれば上書き
     if (Array.isArray(unacceptedPaymentMethodByEvent)) {
         unacceptedPaymentMethod = unacceptedPaymentMethodByEvent;
@@ -342,11 +346,13 @@ function searchAddOns(params) {
             const productWithAddOns = yield repos.product.findById({ id: productId });
             const offerCatalogId = (_b = productWithAddOns.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
             if (typeof offerCatalogId === 'string') {
-                offers = yield repos.offer.findOffersByOfferCatalogId({
+                const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                     offerCatalog: { id: offerCatalogId },
                     availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
+                    excludeAppliesToMovieTicket: false,
                     sort: true
                 });
+                offers = findOffersByOfferCatalogIdResult.offers;
                 offers = offers.map((o) => {
                     return Object.assign(Object.assign({ additionalProperty: Array.isArray(o.additionalProperty) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: {
                             description: productWithAddOns.description,
@@ -394,8 +400,12 @@ function searchEventTicketOffers(params) {
                         ids: params.ids,
                         event,
                         store: params.store,
+                        limit: params.limit,
+                        page: params.page,
                         sort: params.sort,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        addSortIndex: params.addSortIndex,
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -405,8 +415,12 @@ function searchEventTicketOffers(params) {
                         ids: params.ids,
                         event,
                         store: params.store,
+                        limit: params.limit,
+                        page: params.page,
                         sort: params.sort,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        addSortIndex: params.addSortIndex,
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -423,21 +437,22 @@ function searchEventTicketOffers(params) {
                 //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
                 //     });
                 // }
+                // mongo条件へ移行(2023-02-24~)
                 // 有効期間を適用
-                if (params.onlyValid === true) {
-                    offers = offers.filter((o) => {
-                        let isvalid = true;
-                        if (o.validFrom !== undefined && moment(o.validFrom)
-                            .isAfter(now)) {
-                            isvalid = false;
-                        }
-                        if (o.validThrough !== undefined && moment(o.validThrough)
-                            .isBefore(now)) {
-                            isvalid = false;
-                        }
-                        return isvalid;
-                    });
-                }
+                // if (params.onlyValid === true) {
+                //     offers = offers.filter((o) => {
+                //         let isvalid = true;
+                //         if (o.validFrom !== undefined && moment(o.validFrom)
+                //             .isAfter(now)) {
+                //             isvalid = false;
+                //         }
+                //         if (o.validThrough !== undefined && moment(o.validThrough)
+                //             .isBefore(now)) {
+                //             isvalid = false;
+                //         }
+                //         return isvalid;
+                //     });
+                // }
                 for (const offer of offers) {
                     if (Array.isArray(offer.addOn)) {
                         // store.idでのフィルターをmongoに移行(2023-01-27~)

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

@@ -8,5 +8,8 @@ declare function createCompoundPriceSpec4event(params: {
     videoFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     soundFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     videoFormatTypes: string[];
-}): factory.product.ITicketOffer;
+    sortIndex?: number;
+}): factory.product.ITicketOffer & {
+    sortIndex?: number;
+};
 export { createCompoundPriceSpec4event };

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

@@ -1,18 +1,8 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 function categoryCodeChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
@@ -21,6 +11,7 @@ function mvtkChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToVideoFormat: params.appliesToVideoFormat, appliesToMovieTicket: params.appliesToMovieTicket }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
 }
+// tslint:disable-next-line:max-func-body-length
 function createCompoundPriceSpec4event(params) {
     var _a;
     // priceSpecificationはマスタ管理の仕様上必ず存在するはず
@@ -39,19 +30,51 @@ function createCompoundPriceSpec4event(params) {
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
-        unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
-            // すべての上映方式に該当する加算料金を追加(2022-10-29~)
-            const mvtkSpecs4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.filter((s) => {
-                var _a;
-                return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
-                    && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
-                    && params.videoFormatTypes.includes(s.appliesToVideoFormat);
+        // 決済カード加算料金自動補完(2023-02-21~)
+        if (settings_1.settings.useOffersAppliedToMovieTicketWithoutChargeSpecification) {
+            unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
+                // すべての上映方式に該当する加算料金を追加
+                params.videoFormatTypes.forEach((videoFormatType) => {
+                    let existingMvtkSpec4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.find((s) => {
+                        var _a;
+                        return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
+                            && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
+                            && s.appliesToVideoFormat === videoFormatType;
+                    });
+                    // 加算料金が存在しなければprice: 0で自動補完
+                    if (existingMvtkSpec4appliesToMovieTicket === undefined) {
+                        existingMvtkSpec4appliesToMovieTicket = {
+                            typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
+                            price: 0,
+                            priceCurrency: factory.priceCurrency.JPY,
+                            appliesToVideoFormat: videoFormatType,
+                            valueAddedTaxIncluded: true,
+                            project: params.offer.project,
+                            id: '',
+                            name: params.offer.name,
+                            appliesToMovieTicket: {
+                                typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+                                serviceType: appliesToMovieTicket.serviceType,
+                                serviceOutput: { typeOf: appliesToMovieTicket.serviceOutput.typeOf }
+                            }
+                        };
+                    }
+                    mvtkPriceComponents.push(mvtkChargePriceSpec2component(existingMvtkSpec4appliesToMovieTicket));
+                });
             });
-            mvtkPriceComponents.push(...mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component));
-        });
-    }
-    else {
-        // Arrayでないケースは廃止(2022-09-12~)
+        }
+        else {
+            unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
+                // すべての上映方式に該当する加算料金を追加(2022-10-29~)
+                const mvtkSpecs4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.filter((s) => {
+                    var _a;
+                    return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
+                        && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
+                        && params.videoFormatTypes.includes(s.appliesToVideoFormat);
+                });
+                mvtkPriceComponents.push(...mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component));
+            });
+        }
     }
     // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
     const priceComponent = [
@@ -68,8 +91,16 @@ function createCompoundPriceSpec4event(params) {
         valueAddedTaxIncluded: true,
         priceComponent
     };
-    // 不要な属性を除外(2022-11-07~)
-    const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
-    return Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
+    // 必要な属性のみに限定(2023-02-24~)
+    // const { project, ...unitOfferFields4ticketOffer } = params.offer;
+    const { name, description, alternateName, color, typeOf, id, addOn, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered } = params.offer;
+    return Object.assign({ 
+        // ...unitOfferFields4ticketOffer,
+        name, description, alternateName, color, typeOf, id,
+        addOn, availability, availableAtOrFrom, category,
+        eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
+        priceCurrency,
+        validFrom, validThrough, validRateLimit, additionalProperty,
+        identifier, itemOffered, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -158,7 +158,6 @@ function processStartDepositTransaction(params) {
                     description: description,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Deposit,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     }
                 },

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.js

@@ -57,7 +57,6 @@ function returnMoneyTransfer(params) {
                         toLocation: depositTransaction.object.fromLocation,
                         pendingTransaction: {
                             typeOf: factory.account.transactionType.Withdraw,
-                            id: '',
                             transactionNumber: publishTransactionNumber4returnMoneyTransferResult.transactionNumber
                         }
                     }

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -23,7 +23,11 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
-        const offers = yield repos.offer.findOffersByOfferCatalogId({ offerCatalog: { id: offerCatalogId }, sort: params.sort });
+        const { offers } = yield repos.offer.findOffersByOfferCatalogId({
+            offerCatalog: { id: offerCatalogId },
+            excludeAppliesToMovieTicket: false,
+            sort: params.sort
+        });
         return offers.map((o) => {
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {

package/lib/chevre/service/payment/any/factory.js

@@ -13,8 +13,9 @@ function creatPayTransactionStartParams(params) {
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
+    // movieTickets最適化(2023-02-24~)
+    const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
     return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
-            // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
             id: String(params.transaction.seller.id),
             name: (typeof params.transaction.seller.name === 'string')
@@ -38,7 +39,7 @@ function creatPayTransactionStartParams(params) {
             typeOf: params.paymentServiceType,
             // 決済サービスIDを連携(2022-04-12~)
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(params.object.movieTickets)) ? { movieTickets: params.object.movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
         }, expires: expires }, (typeof confirmationNumber === 'string')
         ? {
             purpose: {
@@ -51,6 +52,32 @@ function creatPayTransactionStartParams(params) {
         : undefined);
 }
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
+function createMovieTicket(params) {
+    var _a;
+    const serviceOutput = {
+        reservationFor: {
+            typeOf: params.serviceOutput.reservationFor.typeOf,
+            id: params.serviceOutput.reservationFor.id
+        },
+        reservedTicket: {
+            ticketedSeat: {
+                typeOf: factory.placeType.Seat,
+                seatNumber: params.serviceOutput.reservedTicket.ticketedSeat.seatNumber,
+                seatRow: params.serviceOutput.reservedTicket.ticketedSeat.seatRow,
+                seatSection: params.serviceOutput.reservedTicket.ticketedSeat.seatSection
+            }
+        }
+    };
+    return {
+        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        typeOf: params.typeOf,
+        identifier: params.identifier,
+        accessCode: params.accessCode,
+        category: { codeValue: (typeof ((_a = params.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? params.category.codeValue : '' },
+        serviceType: params.serviceType,
+        serviceOutput
+    };
+}
 function createAuthorizeResult(params) {
     var _a, _b, _c, _d;
     const payTransactionObject = params.payTransaction.object;

package/lib/chevre/service/payment/any.js

@@ -97,10 +97,17 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
  */
 function processVoidPayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findById({
-            typeOf: params.purpose.typeOf,
-            id: params.purpose.id
-        });
+        let transaction;
+        // アクションID指定の場合、進行中取引検証(2023-02-24~)
+        if (typeof params.id === 'string') {
+            transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+        }
+        else {
+            transaction = yield repos.transaction.findById({
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            });
+        }
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -57,9 +57,14 @@ declare function checkByIdentifier(params: {
     project: ProjectRepo;
 }) => Promise<ICheckResult>;
 interface IAuthorizeResult {
-    checkResult: ICheckResult;
-    payAction?: factory.action.IAction<factory.action.IAttributes<factory.actionType.PayAction, any, any>>;
+    accountId: string;
+    checkResult?: ICheckResult;
+    payAction: factory.action.trade.pay.IAction;
 }
+/**
+ * MovieTicket承認
+ * オーソリサービスが存在するわけではないので、実質着券する
+ */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;