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

package/example/src/chevre/deleteTasksByName.ts

@@ -11,7 +11,7 @@ async function main() {
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const result = await taskRepo.deleteByName({
-        name: <any>'DeleteAuthorization'
+        name: <any>'deleteAuthorization'
     });
 
     console.log('deleted', result);

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,12 +22,13 @@ 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,
         limit: 100,
-        page: 1
+        page: 1,
+        searchAddOns: true
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({
         event: eventRepo,

package/example/src/chevre/searchProductOffers.ts

@@ -0,0 +1,38 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const productRepo = new chevre.repository.Product(mongoose.connection);
+
+    const { offers } = await chevre.service.offer.product.search({
+        ids: ['7k7bbepxp', 'yyyyyy'],
+        project: { id: String(PROJECT_ID) },
+        itemOffered: { id: '62b90fef5b3eb4000b75150f' },
+        // seller?: {
+        //     id: string;
+        // },
+        // availableAt?: {
+        //     id: string;
+        // },
+        onlyValid: true,
+        // limit?: number,
+        // page?: number,
+        addSortIndex: false
+    })({
+        offer: offerRepo,
+        product: productRepo
+    });
+    console.log(offers.map((o) => `${o.sortIndex} ${o.id}`));
+    console.log(offers.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -120,7 +120,7 @@ function addReservations(params) {
                 onlyValid: true,
                 addSortIndex: false,
                 validateOfferRateLimit: true,
-                searchAddOns: true
+                searchAddOns: false // false化(2023-03-02~)
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -310,12 +310,16 @@ function createReservations4transactionObject(params) {
             let acceptedAddOns = [];
             let availableAddOns;
             const acceptedAddOnParams = acceptedOffer.addOn;
-            // availableAddOns = await searchAvailableAddOns({
-            //     project: { id: params.transaction.project.id },
-            //     ticketOffer,
-            //     availableAtOrFrom: params.availableAtOrFrom
-            // })(repos);
-            availableAddOns = ticketOffer.addOn;
+            if (Array.isArray(acceptedAddOnParams) && acceptedAddOnParams.length > 0) {
+                // アドオンオファー検索(2023-03-02~)
+                availableAddOns = yield searchAvailableAddOns({
+                    ids: acceptedAddOnParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
+                    project: { id: params.transaction.project.id },
+                    ticketOffer,
+                    availableAtOrFrom: params.availableAtOrFrom
+                })(repos);
+            }
+            // availableAddOns = <factory.product.ITicketAddOn[] | undefined>ticketOffer.addOn;
             if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
                 acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
             }
@@ -345,63 +349,37 @@ function createReservations4transactionObject(params) {
         return reservations;
     });
 }
-// function searchAvailableAddOns(params: {
-//     project: { id: string };
-//     ticketOffer: factory.product.ITicketOffer;
-//     availableAtOrFrom?: { id?: string };
-// }) {
-//     return async (repos: {
-//         offer: OfferRepo;
-//         product: ProductRepo;
-//     }) => {
-//         const availableAddOns: factory.product.ITicketAddOn[] = [];
-//         if (Array.isArray(params.ticketOffer.addOn)) {
-//             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
-//             for (const addOnProductId of addOnProductIds) {
-//                 const { offers, product } = await OfferService.product.search({
-//                     // ids?: string[];
-//                     project: { id: params.project.id },
-//                     itemOffered: { id: addOnProductId },
-//                     onlyValid: true,
-//                     addSortIndex: false,
-//                     ...(typeof params.availableAtOrFrom?.id === 'string')
-//                         ? { availableAt: { id: params.availableAtOrFrom.id } }
-//                         : undefined
-//                 })(repos);
-//                 availableAddOns.push(...offers.map<factory.product.ITicketAddOn>((o) => {
-//                     const itemOffered4addOn: factory.offer.IItemOffered4addOn = {
-//                         description: product.description,
-//                         id: product.id,
-//                         name: product.name,
-//                         productID: product.productID,
-//                         typeOf: product.typeOf
-//                     };
-//                     const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
-//                         return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
-//                     });
-//                     if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
-//                         throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
-//                     }
-//                     return {
-//                         alternateName: o.alternateName,
-//                         availability: o.availability,
-//                         description: o.description,
-//                         id: String(o.id),
-//                         identifier: o.identifier,
-//                         itemOffered: itemOffered4addOn,
-//                         name: o.name,
-//                         priceCurrency: o.priceCurrency,
-//                         priceSpecification: unitPriceSpec,
-//                         typeOf: o.typeOf,
-//                         ...(o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined,
-//                         ...(o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined
-//                     };
-//                 }));
-//             }
-//         }
-//         return availableAddOns;
-//     };
-// }
+function searchAvailableAddOns(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const availableAddOns = [];
+        if (Array.isArray(params.ticketOffer.addOn)) {
+            const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
+            for (const addOnProductId of addOnProductIds) {
+                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    ? { availableAt: { id: params.availableAtOrFrom.id } }
+                    : undefined))(repos);
+                availableAddOns.push(...offers.map((o) => {
+                    const itemOffered4addOn = {
+                        description: product.description,
+                        id: product.id,
+                        name: product.name,
+                        productID: product.productID,
+                        typeOf: product.typeOf
+                    };
+                    const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
+                        return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
+                    });
+                    if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                        throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
+                    }
+                    return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+                }));
+            }
+        }
+        return availableAddOns;
+    });
+}
 function getAcceptedSeatNumbersAndSeatSections(params) {
     const acceptedSeatNumbers = [];
     const acceptedSeatSections = [];

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

@@ -227,7 +227,7 @@ function validateAcceptedOffers(params) {
             onlyValid: true,
             addSortIndex: false,
             validateOfferRateLimit: true,
-            searchAddOns: true
+            searchAddOns: false // false化(2023-03-02~)
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))

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.33"
+  "version": "20.4.0-alpha.35"
 }