@chevre/domain 20.4.0-alpha.8 → 20.4.0

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

@@ -13,234 +13,116 @@ 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
+function searchTicketOffersByItemOffered(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const screeningEvent = params.event;
-        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({
-                    ids: params.ids,
-                    offerCatalog: { id: transportation.hasOfferCatalog.id },
-                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
-                    sort: params.sort
-                });
+        let catalogId;
+        if (typeof ((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id });
+            if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
+                catalogId = eventService.hasOfferCatalog.id;
             }
         }
-        else {
-            // hasOfferCatalog参照廃止(2022-09-02~)
-            throw new factory.errors.NotFound('event.offers.itemOffered.id');
+        if (typeof catalogId !== 'string') {
+            throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        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
-            });
+        const { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
+            ids: params.ids,
+            offerCatalog: { id: catalogId },
+            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+            excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+            onlyValid: params.onlyValid === true,
+            // Mongoのpagingを利用するオプション(2023-02-21~)
+            limit: params.limit,
+            page: params.page,
+            sort: false
         });
-        if (params.validateOfferRateLimit) {
-            // レート制限を確認
-            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 = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
-                    if (typeof productId === 'string') {
-                        const productOffers = yield searchAddOns({
-                            product: { id: productId },
-                            store: params.store
-                        })(repos);
-                        offerAddOn.push(...productOffers);
-                    }
-                }
-            }
-            offer.addOn = offerAddOn;
-        }
-        return {
-            ticketOffers: offers4event,
-            unitPriceOffers: availableOffers
-        };
+        return { availableOffers: offers, sortedOfferIds };
     });
 }
 /**
- * 興行オファー全検索
+ * イベントから興行(旅客)オファーを検索する
  */
-function searchScreeningEventTicketOffers(params) {
+function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     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) : [];
-        let availableOffers = [];
+        var _a, _b;
+        const event = params.event;
+        let soundFormatTypes = [];
+        let videoFormatTypes = [];
+        if (event.typeOf === factory.eventType.ScreeningEvent) {
+            // 取得属性最適化(2023-01-25~)
+            const superEvent = yield repos.event.findById({ id: event.superEvent.id }, { soundFormat: 1, videoFormat: 1 });
+            soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+        }
+        const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
+        // 上映方式がなければMovieTicket除外(2023-02-21~)
+        const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         // 興行設定があれば興行のカタログを参照する(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 eventOffers = event.offers;
+        const { availableOffers, sortedOfferIds } = yield searchTicketOffersByItemOffered({
+            itemOffered: { id: (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id },
+            ids: params.ids,
+            store: params.store,
+            limit: params.limit,
+            page: params.page,
+            onlyValid: params.onlyValid,
+            unacceptedPaymentMethod,
+            excludeAppliesToMovieTicket
+        })(repos);
+        // 冗長な検索について最適化(2023-03-03~)
+        const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
+            project: { id: event.project.id },
+            soundFormatTypes,
+            videoFormatTypes,
+            availableOffers
+        })(repos);
+        const offers4event = [];
+        // 単価オファーから興行オファーを生成(順に処理)
+        for (const availableOffer of availableOffers) {
+            let sortIndex;
+            if (params.addSortIndex) {
+                sortIndex = sortedOfferIds.indexOf(String(availableOffer.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);
-                    });
+            let availability;
+            if (params.validateOfferRateLimit) {
+                // レート制限を確認
+                availability = yield checkAvailability({ event, unitPriceOffer: availableOffer })(repos);
+            }
+            // アドオン設定があれば、プロダクトオファーを検索
+            let offerAddOn = [];
+            if (Array.isArray(availableOffer.addOn)) {
+                if (params.searchAddOns) {
+                    for (const addOn of availableOffer.addOn) {
+                        const productId = (_b = addOn.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
+                        if (typeof productId === 'string') {
+                            const productOffers = yield searchAddOns({
+                                product: { id: productId },
+                                store: params.store,
+                                addSortIndex: params.addSortIndex,
+                                onlyValid: params.onlyValid
+                            })(repos);
+                            offerAddOn.push(...productOffers);
+                        }
+                    }
                 }
                 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;
+                    offerAddOn = availableOffer.addOn;
                 }
-                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)({
+            offers4event.push((0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
-                videoFormatChargeSpecifications,
-                soundFormatChargeSpecifications,
+                videoFormatChargeSpecs,
+                soundFormatChargeSpecs,
                 movieTicketTypeChargeSpecs,
-                videoFormatTypes
-            });
-        });
-        if (params.validateOfferRateLimit) {
-            // レート制限を確認
-            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 = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
-                    if (typeof productId === 'string') {
-                        const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
-                        offerAddOn.push(...productOffers);
-                    }
-                }
-            }
-            offer.addOn = offerAddOn;
+                videoFormatTypes,
+                availability,
+                addOn: offerAddOn,
+                sortIndex
+            }));
         }
         return {
             ticketOffers: offers4event,
@@ -253,10 +135,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;
     }
@@ -264,47 +142,67 @@ function getUnacceptedPaymentMethodByEvent(params) {
 }
 function searchPriceSpecs4event(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const soundFormatChargeSpecifications = (params.soundFormatTypes.length > 0)
-            ? yield repos.priceSpecification.search({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: {
-                    $elemMatch: {
-                        codeValue: { $in: params.soundFormatTypes },
-                        'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.SoundFormatType }
-                    }
+        let soundFormatChargeSpecs = [];
+        let videoFormatChargeSpecs = [];
+        let movieTicketTypeChargeSpecs = [];
+        const movieTicketServiceTypes = [...new Set(params.availableOffers.reduce((a, b) => {
+                if (!Array.isArray(b.priceSpecification.appliesToMovieTicket)) {
+                    return a;
                 }
-            })
-            : [];
-        const videoFormatChargeSpecifications = (params.videoFormatTypes.length > 0)
-            ? yield repos.priceSpecification.search({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: {
-                    $elemMatch: {
-                        codeValue: { $in: params.videoFormatTypes },
-                        'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType }
+                return [
+                    ...a,
+                    ...b.priceSpecification.appliesToMovieTicket.map((movieTicket) => movieTicket.serviceType)
+                ];
+            }, []))];
+        if (params.soundFormatTypes.length > 0) {
+            soundFormatChargeSpecs =
+                yield repos.priceSpecification.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    appliesToCategoryCode: {
+                        $elemMatch: {
+                            codeValue: { $in: params.soundFormatTypes },
+                            'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.SoundFormatType }
+                        }
                     }
-                }
-            })
-            : [];
-        const movieTicketTypeChargeSpecs = (params.videoFormatTypes.length > 0)
-            ? yield repos.priceSpecification.search({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
-                appliesToVideoFormats: params.videoFormatTypes
-            })
-            : [];
-        return { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs };
+                });
+        }
+        if ((params.videoFormatTypes.length > 0)) {
+            videoFormatChargeSpecs =
+                yield repos.priceSpecification.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    appliesToCategoryCode: {
+                        $elemMatch: {
+                            codeValue: { $in: params.videoFormatTypes },
+                            'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType }
+                        }
+                    }
+                });
+            // 存在する適用決済カード区分の分だけ検索する(2023-03-03~)
+            if (movieTicketServiceTypes.length > 0) {
+                movieTicketTypeChargeSpecs =
+                    yield repos.priceSpecification.search({
+                        project: { id: { $eq: params.project.id } },
+                        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
+                        appliesToVideoFormats: params.videoFormatTypes,
+                        appliesToMovieTicket: {
+                            serviceTypes: movieTicketServiceTypes
+                        }
+                    });
+            }
+        }
+        return { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs };
     });
 }
 function checkAvailability(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const offer4event = params.offer;
+        const unitPriceOffer = params.unitPriceOffer;
+        let availability;
         // レート制限を確認
-        const scope = (_a = offer4event.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope;
-        const unitInSeconds = (_b = offer4event.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
+        const scope = (_a = unitPriceOffer.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope;
+        const unitInSeconds = (_b = unitPriceOffer.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 reservedTicket: {
@@ -324,10 +222,10 @@ function checkAvailability(params) {
             const holder = yield repos.offerRateLimit.getHolder(rateLimitKey);
             // ロックされていればOutOfStock
             if (typeof holder === 'string' && holder.length > 0) {
-                offer4event.availability = factory.itemAvailability.OutOfStock;
+                availability = factory.itemAvailability.OutOfStock;
             }
         }
-        return offer4event;
+        return availability;
     });
 }
 /**
@@ -336,45 +234,54 @@ function checkAvailability(params) {
 function searchAddOns(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        let offers = [];
+        let addOns = [];
         const productId = (_a = params.product) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof productId === 'string') {
             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 { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
                     offerCatalog: { id: offerCatalogId },
                     availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
+                    excludeAppliesToMovieTicket: false,
+                    onlyValid: params.onlyValid === true,
                     sort: true
                 });
-                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,
-                            id: productWithAddOns.id,
-                            name: productWithAddOns.name,
-                            productID: productWithAddOns.productID,
-                            project: productWithAddOns.project,
-                            typeOf: productWithAddOns.typeOf
-                        }, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: o.priceSpecification, project: o.project, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+                const unitPriceOffers = offers;
+                addOns = unitPriceOffers.map((o) => {
+                    let sortIndex;
+                    if (params.addSortIndex) {
+                        sortIndex = sortedOfferIds.indexOf(String(o.id));
+                    }
+                    const itemOffered4addOn = {
+                        description: productWithAddOns.description,
+                        id: productWithAddOns.id,
+                        name: productWithAddOns.name,
+                        productID: productWithAddOns.productID,
+                        // project: productWithAddOns.project,
+                        typeOf: productWithAddOns.typeOf
+                    };
+                    return Object.assign(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: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: o.priceSpecification, 
+                        // project: o.project,
+                        typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
                 });
             }
         }
-        return offers;
+        return addOns;
     });
 }
 /**
  * 興行オファー検索
  */
 function searchEventTicketOffers(params) {
-    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = moment();
-        let event;
-        // イベント取得属性最適化(2023-01-23~)
-        // event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({ id: params.event.id });
-        event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.event.id
-        });
+        // const now = moment();
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
         let offers;
         let unitPriceOffers;
         const eventOffers = event.offers;
@@ -388,86 +295,55 @@ function searchEventTicketOffers(params) {
             case factory.service.webAPI.Identifier.COA:
                 throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
             default:
-                // Chevreで券種オファーを検索
-                if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    const searchOffersResult = yield searchScreeningEventTicketOffers({
-                        ids: params.ids,
-                        event,
-                        store: params.store,
-                        sort: params.sort,
-                        validateOfferRateLimit: params.validateOfferRateLimit
-                    })(repos);
-                    offers = searchOffersResult.ticketOffers;
-                    unitPriceOffers = searchOffersResult.unitPriceOffers;
-                }
-                else if (event.typeOf === factory.eventType.Event) {
-                    const searchOffersResult = yield searchTransportationEventTicketOffers({
-                        ids: params.ids,
-                        event,
-                        store: params.store,
-                        sort: params.sort,
-                        validateOfferRateLimit: params.validateOfferRateLimit
-                    })(repos);
-                    offers = searchOffersResult.ticketOffers;
-                    unitPriceOffers = searchOffersResult.unitPriceOffers;
-                }
-                else {
-                    throw new factory.errors.NotImplemented(`'${event.typeOf}' not implemented`);
-                }
-                // store.idでのフィルターをmongoに移行(2023-01-27~)
-                // const specifiedStoreId = params.store?.id;
-                // if (typeof specifiedStoreId === 'string') {
-                //     // アプリケーションが利用可能なオファーに絞る
-                //     offers = offers.filter((o) => {
-                //         return Array.isArray(o.availableAtOrFrom)
-                //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
-                //     });
-                // }
-                // 有効期間を適用
-                if (params.onlyValid === true) {
-                    offers = offers.filter((o) => {
-                        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~)
-                        // addOnsに対しても利用可能アプリケーション設定を適用
-                        // if (typeof specifiedStoreId === 'string') {
-                        //     // アプリケーションが利用可能なオファーに絞る
-                        //     offer.addOn = offer.addOn.filter((offer4addOn) => {
-                        //         return Array.isArray(offer4addOn.availableAtOrFrom)
-                        //             && offer4addOn.availableAtOrFrom.some(
-                        //                 (availableApplication) => availableApplication.id === specifiedStoreId
-                        //             );
-                        //     });
-                        // }
-                        // addOnsに対しても有効期間を適用
-                        if (params.onlyValid === true) {
-                            offer.addOn = offer.addOn.filter((offer4addOn) => {
-                                let isvalid = true;
-                                if (offer4addOn.validFrom !== undefined && moment(offer4addOn.validFrom)
-                                    .isAfter(now)) {
-                                    isvalid = false;
-                                }
-                                if (offer4addOn.validThrough !== undefined && moment(offer4addOn.validThrough)
-                                    .isBefore(now)) {
-                                    isvalid = false;
-                                }
-                                return isvalid;
-                            });
-                        }
-                    }
-                }
+                const searchOffersResult = yield searchEventTicketOffersByEvent({
+                    ids: params.ids,
+                    event,
+                    store: params.store,
+                    limit: params.limit,
+                    page: params.page,
+                    addSortIndex: params.addSortIndex,
+                    validateOfferRateLimit: params.validateOfferRateLimit,
+                    onlyValid: params.onlyValid === true,
+                    searchAddOns: params.searchAddOns
+                })(repos);
+                offers = searchOffersResult.ticketOffers;
+                unitPriceOffers = searchOffersResult.unitPriceOffers;
+            // 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;
+            //     });
+            // }
+            // mongo条件へ移行(2023-02-27~)
+            // for (const offer of offers) {
+            //     if (Array.isArray(offer.addOn)) {
+            //         // addOnsに対しても有効期間を適用
+            //         if (params.onlyValid === true) {
+            //             offer.addOn = offer.addOn.filter((offer4addOn) => {
+            //                 let isvalid = true;
+            //                 if (offer4addOn.validFrom !== undefined && moment(offer4addOn.validFrom)
+            //                     .isAfter(now)) {
+            //                     isvalid = false;
+            //                 }
+            //                 if (offer4addOn.validThrough !== undefined && moment(offer4addOn.validThrough)
+            //                     .isBefore(now)) {
+            //                     isvalid = false;
+            //                 }
+            //                 return isvalid;
+            //             });
+            //         }
+            //     }
+            // }
         }
         return { ticketOffers: offers, unitPriceOffers };
     });