@chevre/domain 20.4.0-alpha.34 → 20.4.0-alpha.35

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,7 +22,7 @@ async function main() {
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
-        event: { id: 'ale6qiedi' },
+        event: { id: 'ale6qiedq' },
         onlyValid: true,
         validateOfferRateLimit: true,
         addSortIndex: true,

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

@@ -26,7 +26,7 @@ function searchTicketOffersByItemOffered(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
+        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 },
@@ -38,9 +38,7 @@ function searchTicketOffersByItemOffered(params) {
             page: params.page,
             sort: false
         });
-        const availableOffers = findOffersByOfferCatalogIdResult.offers;
-        const sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
-        return { availableOffers, sortedOfferIds };
+        return { availableOffers: offers, sortedOfferIds };
     });
 }
 /**
@@ -74,10 +72,13 @@ function searchEventTicketOffersByEvent(params) {
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket
         })(repos);
-        const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: event.project.id }, soundFormatTypes, videoFormatTypes })(repos);
-        // 決済カード加算料金が存在しない場合自動補完する(2023-02-21~)
-        // if (!settings.useOffersAppliedToMovieTicketWithoutChargeSpecification) {
-        // }
+        // 冗長な検索について最適化(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) {
@@ -114,8 +115,8 @@ function searchEventTicketOffersByEvent(params) {
             offers4event.push((0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
-                videoFormatChargeSpecifications,
-                soundFormatChargeSpecifications,
+                videoFormatChargeSpecs,
+                soundFormatChargeSpecs,
                 movieTicketTypeChargeSpecs,
                 videoFormatTypes,
                 availability,
@@ -134,7 +135,6 @@ function getUnacceptedPaymentMethodByEvent(params) {
     const eventOffers = params.event.offers;
     const unacceptedPaymentMethodByEvent = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.unacceptedPaymentMethod;
     // 施設コンテンツを参照する必要はない(2022-10-31~)
-    // イベントにunacceptedPaymentMethod設定があれば上書き
     if (Array.isArray(unacceptedPaymentMethodByEvent)) {
         unacceptedPaymentMethod = unacceptedPaymentMethodByEvent;
     }
@@ -142,38 +142,57 @@ 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) {

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

@@ -5,8 +5,8 @@ declare function createCompoundPriceSpec4event(params: {
     eligibleQuantity: factory.quantitativeValue.IQuantitativeValue<factory.unitCode.C62>;
     offer: factory.unitPriceOffer.IUnitPriceOffer;
     movieTicketTypeChargeSpecs: IMovieTicketTypeChargeSpecification[];
-    videoFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
-    soundFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
+    videoFormatChargeSpecs: ICategoryCodeChargeSpecification[];
+    soundFormatChargeSpecs: ICategoryCodeChargeSpecification[];
     videoFormatTypes: string[];
     availability?: factory.itemAvailability;
     addOn: factory.product.ITicketAddOn[] | factory.product.IMinimizedTicketAddOn[];

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

@@ -23,8 +23,8 @@ function createCompoundPriceSpec4event(params) {
     // 区分加算料金を適用しないオプションを追加(2023-01-26~)
     const ignoreCategoryCodeChargeSpec = ((_a = params.offer.settings) === null || _a === void 0 ? void 0 : _a.ignoreCategoryCodeChargeSpec) === true;
     if (!ignoreCategoryCodeChargeSpec) {
-        videoFormatChargeSpecComponents = params.videoFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
-        soundFormatChargeSpecComponents = params.soundFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
+        videoFormatChargeSpecComponents = params.videoFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
+        soundFormatChargeSpecComponents = params.soundFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
     }
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)

package/package.json

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