@chevre/domain 20.4.0-alpha.22 → 20.4.0-alpha.24

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

@@ -314,9 +314,8 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             addOn: (Array.isArray(offerWithoutDetail.addOn))
                 ? offerWithoutDetail.addOn.map((a) => {
                     return {
-                        // project: offer.project,
                         typeOf: factory.offerType.Offer,
-                        id: a.id,
+                        id: String(a.id),
                         priceCurrency: offer.priceCurrency
                     };
                 })

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

@@ -38,18 +38,25 @@ function searchTicketOffersByItemOffered(params) {
     });
 }
 /**
- * 旅客オファー検索
+ * イベントから興行(旅客)オファーを検索する
  */
-function searchTransportationEventTicketOffers(params) {
+function searchEventTicketOffersByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const screeningEvent = params.event;
-        const soundFormatTypes = [];
-        const videoFormatTypes = [];
-        const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
+        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;
-        const eventOffers = screeningEvent.offers;
+        // 興行設定があれば興行のカタログを参照する(2022-08-31~)
+        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,
@@ -61,120 +68,49 @@ function searchTransportationEventTicketOffers(params) {
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket
         })(repos);
-        const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: screeningEvent.project.id }, soundFormatTypes, videoFormatTypes })(repos);
+        const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: event.project.id }, soundFormatTypes, videoFormatTypes })(repos);
         // 決済カード加算料金が存在しない場合自動補完する(2023-02-21~)
         // if (!settings.useOffersAppliedToMovieTicketWithoutChargeSpecification) {
         // }
-        let offers4event = availableOffers.map((availableOffer) => {
+        const offers4event = [];
+        // 単価オファーから興行オファーを生成(順に処理)
+        for (const availableOffer of availableOffers) {
             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,
-                sortIndex
-            });
-        });
-        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) {
+            let availability;
+            if (params.validateOfferRateLimit) {
+                // レート制限を確認
+                availability = yield checkAvailability({ event, unitPriceOffer: availableOffer })(repos);
+            }
+            // アドオン設定があれば、プロダクトオファーを検索
             const offerAddOn = [];
-            if (Array.isArray(offer.addOn)) {
-                for (const addOn of offer.addOn) {
+            if (Array.isArray(availableOffer.addOn)) {
+                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
+                            store: params.store,
+                            addSortIndex: params.addSortIndex,
+                            onlyValid: params.onlyValid
                         })(repos);
                         offerAddOn.push(...productOffers);
                     }
                 }
             }
-            offer.addOn = offerAddOn;
-        }
-        return {
-            ticketOffers: offers4event,
-            unitPriceOffers: availableOffers
-        };
-    });
-}
-/**
- * 興行オファー全検索
- */
-function searchScreeningEventTicketOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        // イベント取得属性最適化(2023-01-23~)
-        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;
-        // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        const eventOffers = screeningEvent.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,
-            sort: params.sort,
-            onlyValid: params.onlyValid,
-            unacceptedPaymentMethod,
-            excludeAppliesToMovieTicket
-        })(repos);
-        const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: screeningEvent.project.id }, soundFormatTypes, videoFormatTypes })(repos);
-        // 決済カード加算料金が存在しない場合自動補完する(2023-02-21~)
-        // if (!settings.useOffersAppliedToMovieTicketWithoutChargeSpecification) {
-        // }
-        let offers4event = availableOffers.map((availableOffer) => {
-            let sortIndex;
-            if (params.addSortIndex) {
-                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
-            }
-            return (0, factory_1.createCompoundPriceSpec4event)({
+            offers4event.push((0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
                 movieTicketTypeChargeSpecs,
                 videoFormatTypes,
+                availability,
+                addOn: offerAddOn,
                 sortIndex
-            });
-        });
-        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 = (_b = addOn.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
-                    if (typeof productId === 'string') {
-                        const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
-                        offerAddOn.push(...productOffers);
-                    }
-                }
-            }
-            offer.addOn = offerAddOn;
+            }));
         }
         return {
             ticketOffers: offers4event,
@@ -232,10 +168,11 @@ function searchPriceSpecs4event(params) {
 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: {
@@ -255,10 +192,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;
     });
 }
 /**
@@ -267,47 +204,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') {
-                const findOffersByOfferCatalogIdResult = 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 = 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,
-                            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;
@@ -321,95 +265,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,
-                        limit: params.limit,
-                        page: params.page,
-                        sort: params.sort,
-                        addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit,
-                        onlyValid: params.onlyValid === true
-                    })(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,
-                        limit: params.limit,
-                        page: params.page,
-                        sort: params.sort,
-                        addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit,
-                        onlyValid: params.onlyValid === true
-                    })(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);
-                //     });
-                // }
-                // 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;
-                //     });
-                // }
-                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,
+                    sort: params.sort,
+                    addSortIndex: params.addSortIndex,
+                    validateOfferRateLimit: params.validateOfferRateLimit,
+                    onlyValid: params.onlyValid === true
+                })(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 };
     });

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

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

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

@@ -78,14 +78,16 @@ function createCompoundPriceSpec4event(params) {
     };
     // 必要な属性のみに限定(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,
+    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(Object.assign({ 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);
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0",
-    "@cinerino/sdk": "3.140.0-alpha.16",
+    "@chevre/factory": "4.290.0",
+    "@cinerino/sdk": "3.140.0-alpha.18",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.22"
+  "version": "20.4.0-alpha.24"
 }