@chevre/domain 20.2.0-alpha.31 → 20.2.0-alpha.32

package/example/src/chevre/searchEventTicketOffers.ts

@@ -21,7 +21,7 @@ async function main() {
     const offerRateLimitRepo = new chevre.repository.rateLimit.Offer(client);
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
-    const offers = await chevre.service.offer.event.searchEventTicketOffers({
+    const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'al9ew43f5' },
         onlyValid: true
         // ...(typeof sellerId === 'string') ? { seller: { id: sellerId } } : undefined,
@@ -33,8 +33,7 @@ async function main() {
         priceSpecification: priceSpecificationRepo,
         product: productRepo
     });
-    // console.log(offers);
-    console.log(offers.length);
+    console.log(ticketOffers.length);
 }
 
 main()

package/example/src/chevre/searchOffersByCatalog.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console
+// import * as redis from 'redis';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+
+    const offers = await offerRepo.findOffersByOfferCatalogId({
+        ids: ['al96nqj7z', 'xxx', '1001'],
+        // ids: ['xx', 'xxx'],
+        offerCatalog: {
+            id: '0001'
+            // id: 'xxx'
+        }
+    });
+    console.log(offers.map((o) => o.id));
+    console.log(offers.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/updateTransaction.ts

@@ -10,7 +10,7 @@ async function main() {
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
     const transactionId = '63ce4d501c45c2000bdb2f9d';
     let update = {
-        'object.modifiedTime': new Date()
+        $set: { 'object.modifiedTime': new Date() }
     };
 
     let now = moment();
@@ -22,7 +22,7 @@ async function main() {
         .diff(now));
 
     update = {
-        'object.modifiedTime': new Date()
+        $set: { 'object.modifiedTime': new Date() }
     };
     now = moment();
     // await transactionRepo.updateById({

package/lib/chevre/repo/mongoose/model/offer.js

@@ -41,7 +41,8 @@ const schema = new mongoose.Schema({
     eligibleRegion: mongoose.SchemaTypes.Mixed,
     eligibleSeatingType: mongoose.SchemaTypes.Mixed,
     eligibleSubReservation: mongoose.SchemaTypes.Mixed,
-    // eligibleMovieTicketType: String,
+    // settings追加(2023-01-26~)
+    settings: mongoose.SchemaTypes.Mixed,
     validFrom: Date,
     validThrough: Date,
     validRateLimit: mongoose.SchemaTypes.Mixed

package/lib/chevre/repo/offer.d.ts

@@ -13,6 +13,10 @@ export declare class MongoRepository {
      * カタログに登録されたオファーの順序は保証される
      */
     findOffersByOfferCatalogId(params: {
+        /**
+         * 指定したIDのオファーだけ取得する場合
+         */
+        ids?: string[];
         offerCatalog: {
             id: string;
         };

package/lib/chevre/repo/offer.js

@@ -302,21 +302,47 @@ class MongoRepository {
      */
     findOffersByOfferCatalogId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const offerCatalog = yield this.offerCatalogModel.findById(params.offerCatalog.id, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+            // aggregateで再実装(2023-01-26~)
+            const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
+            if (Array.isArray(params.ids)) {
+                matchStages.push({
+                    $match: { 'itemListElement.id': { $exists: true, $in: params.ids } }
+                });
+            }
+            const aggregate = this.offerCatalogModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$itemListElement.id'
+                    }
                 }
-                return doc.toObject();
-            });
-            const sortedOfferIds = (Array.isArray(offerCatalog.itemListElement))
-                ? offerCatalog.itemListElement.map((element) => element.id)
+            ]);
+            const itemListElements = yield aggregate.exec();
+            const sortedOfferIds = (Array.isArray(itemListElements))
+                ? itemListElements.map((element) => element.id)
                 : [];
+            // const offerCatalog = await this.offerCatalogModel.findById(
+            //     params.offerCatalog.id,
+            //     {
+            //         itemListElement: 1
+            //     }
+            // )
+            //     .exec()
+            //     .then((doc) => {
+            //         if (doc === null) {
+            //             throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+            //         }
+            //         return <Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>doc.toObject();
+            //     });
+            // let sortedOfferIds: string[] = (Array.isArray(offerCatalog.itemListElement))
+            //     ? offerCatalog.itemListElement.map((element) => element.id)
+            //     : [];
+            // const filteredIds = params.ids;
+            // if (Array.isArray(filteredIds)) {
+            //     sortedOfferIds = sortedOfferIds.filter((id) => filteredIds.includes(id));
+            // }
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 offers = yield this.search({ id: { $in: sortedOfferIds } });

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

@@ -64,7 +64,7 @@ exports.start = start;
 function addReservations(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         const now = new Date();
         let transaction = yield repos.assetTransaction.findById({ typeOf: factory.assetTransactionType.Reserve, id: params.id });
         // イベント存在確認
@@ -88,26 +88,33 @@ function addReservations(params) {
         if (event.typeOf === factory.eventType.ScreeningEvent || event.typeOf === factory.eventType.Event) {
             validateEvent({ now, event });
         }
+        // 受け入れたオファーIDだけ取得する(2023-01-26~)
+        const acceptedOfferIds = [...new Set(acceptedOffers.map((o) => String(o.id)))];
         // イベントオファー検索
-        const ticketOffers = yield OfferService.event.searchEventTicketOffers({ event: { id: event.id } })(repos);
-        let availableOffers = [];
-        // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        const eventOffers = event.offers;
-        if (typeof ((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
-            if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
-                availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                    offerCatalog: { id: eventService.hasOfferCatalog.id }
-                });
-            }
-        }
-        else {
-            throw new factory.errors.NotFound('event.offers.itemOffered.id');
-        }
+        const { ticketOffers, unitPriceOffers } = yield OfferService.event.searchEventTicketOffers({
+            ids: acceptedOfferIds,
+            event: { id: event.id }
+        })(repos);
+        // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
+        const availableOffers = unitPriceOffers;
+        // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
+        // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
+        // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;
+        // if (typeof eventOffers?.itemOffered?.id === 'string') {
+        //     const eventService = <factory.product.IProduct>await repos.product.findById({ id: eventOffers.itemOffered.id });
+        //     if (typeof eventService.hasOfferCatalog?.id === 'string') {
+        //         availableOffers = await repos.offer.findOffersByOfferCatalogId({
+        //             offerCatalog: { id: eventService.hasOfferCatalog.id }
+        //         });
+        //     }
+        // } else {
+        //     throw new factory.errors.NotFound('event.offers.itemOffered.id');
+        // }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
-            acceptedOffers, ticketOffers,
+            acceptedOffers,
+            ticketOffers,
             availableOffers, now,
             event, availableSeatOffers,
             transaction,
@@ -221,10 +228,10 @@ function createAcceptedOffers4transactionObject(params) {
         return { acceptedOffers4transactionObject, objectSubReservations };
     });
 }
-// tslint:disable-next-line:max-func-body-length
 function createReservations4transactionObject(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // 予約番号
         const reservationNumber = params.transaction.object.reservationNumber;
         if (typeof reservationNumber !== 'string') {
@@ -264,18 +271,22 @@ function createReservations4transactionObject(params) {
             const additionalProperty = (0, factory_1.createAdditionalProperty)({ acceptedOffer });
             // 座席指定であれば、座席タイプチャージを検索する
             const seatPriceComponent = [];
-            const seatSection = (_c = reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatSection;
-            const seatNumber = (_d = reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber;
-            if (typeof seatSection === 'string' && typeof seatNumber === 'string') {
-                const offersOnSeat = (_e = params.availableSeatOffers.find((o) => {
-                    var _a;
-                    return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection;
-                })) === null || _e === void 0 ? void 0 : _e.offers;
-                if (Array.isArray(offersOnSeat)) {
-                    const availableSeatOffer = offersOnSeat[0];
-                    const seatPriceSpecs = (_f = availableSeatOffer === null || availableSeatOffer === void 0 ? void 0 : availableSeatOffer.priceSpecification) === null || _f === void 0 ? void 0 : _f.priceComponent;
-                    if (Array.isArray(seatPriceSpecs)) {
-                        seatPriceComponent.push(...seatPriceSpecs);
+            // 区分加算料金を適用しないオプションを追加(2023-01-26~)
+            const ignoreCategoryCodeChargeSpec = ((_c = ticketType.settings) === null || _c === void 0 ? void 0 : _c.ignoreCategoryCodeChargeSpec) === true;
+            if (!ignoreCategoryCodeChargeSpec) {
+                const seatSection = (_d = reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection;
+                const seatNumber = (_e = reservedTicket.ticketedSeat) === null || _e === void 0 ? void 0 : _e.seatNumber;
+                if (typeof seatSection === 'string' && typeof seatNumber === 'string') {
+                    const offersOnSeat = (_f = params.availableSeatOffers.find((o) => {
+                        var _a;
+                        return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection;
+                    })) === null || _f === void 0 ? void 0 : _f.offers;
+                    if (Array.isArray(offersOnSeat)) {
+                        const availableSeatOffer = offersOnSeat[0];
+                        const seatPriceSpecs = (_g = availableSeatOffer === null || availableSeatOffer === void 0 ? void 0 : availableSeatOffer.priceSpecification) === null || _g === void 0 ? void 0 : _g.priceComponent;
+                        if (Array.isArray(seatPriceSpecs)) {
+                            seatPriceComponent.push(...seatPriceSpecs);
+                        }
                     }
                 }
             }
@@ -286,7 +297,7 @@ function createReservations4transactionObject(params) {
             if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
                 acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
             }
-            const subReservation = (_h = (_g = acceptedOffer.itemOffered) === null || _g === void 0 ? void 0 : _g.serviceOutput) === null || _h === void 0 ? void 0 : _h.subReservation;
+            const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             const reservationId = `${reservationNumber}-${reservationIndex}`;
             reservations.push((0, factory_1.createReservation)({
                 project: params.transaction.project,
@@ -305,7 +316,7 @@ function createReservations4transactionObject(params) {
                 subReservation: subReservation,
                 programMembershipUsed,
                 availableOffer: ticketType,
-                appliesToMovieTicket: (_j = acceptedOffer.priceSpecification) === null || _j === void 0 ? void 0 : _j.appliesToMovieTicket,
+                appliesToMovieTicket: (_k = acceptedOffer.priceSpecification) === null || _k === void 0 ? void 0 : _k.appliesToMovieTicket,
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             }));
         }

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

@@ -278,18 +278,23 @@ function validateEvent(params) {
  */
 function validateAcceptedOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const acceptedOffersWithoutDetail = params.object.acceptedOffer;
+        const offerIds = (Array.isArray(acceptedOffersWithoutDetail))
+            ? [...new Set(acceptedOffersWithoutDetail.map((o) => o.id))]
+            : [];
         // 利用可能なチケットオファーを検索
-        const availableTicketOffers = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
+        const { ticketOffers } = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
+            // 受け入れたオファーIDだけ取得する(2023-01-26~)
+            ids: offerIds,
             event: { id: params.event.id },
             seller: params.seller,
             store: params.store
         })(repos);
-        const acceptedOffersWithoutDetail = params.object.acceptedOffer;
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))
             ? yield Promise.all(acceptedOffersWithoutDetail.map((offerWithoutDetail) => __awaiter(this, void 0, void 0, function* () {
                 return acceptedOfferWithoutDetail2acceptedOffer({
-                    availableTicketOffers,
+                    availableTicketOffers: ticketOffers,
                     offerWithoutDetail,
                     event: params.event,
                     transaction: params.transaction,
@@ -298,7 +303,6 @@ function validateAcceptedOffers(params) {
             })))
             : [];
         // オファーIDごとにオファー適用条件を確認
-        const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
         offerIds.forEach((offerId) => {
             var _a;
             const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -17,6 +17,10 @@ declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTic
  * 興行オファー検索
  */
 declare function searchEventTicketOffers(params: {
+    /**
+     * 指定したIDのオファーだけ取得する場合
+     */
+    ids?: string[];
     /**
      * どのイベントに対して
      */
@@ -72,5 +76,8 @@ declare function searchEventTicketOffers(params: {
          */
         kbnEisyahousiki: string;
     };
-}): ISearchEventTicketOffersOperation<factory.product.ITicketOffer[]>;
+}): ISearchEventTicketOffersOperation<{
+    ticketOffers: factory.product.ITicketOffer[];
+    unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];
+}>;
 export { searchEventTicketOffers };

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

@@ -30,6 +30,7 @@ function searchTransportationEventTicketOffers(params) {
             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 }
                 });
             }
@@ -116,7 +117,10 @@ function searchTransportationEventTicketOffers(params) {
             }
             offer.addOn = offerAddOn;
         }
-        return offers4event;
+        return {
+            ticketOffers: offers4event,
+            unitPriceOffers: availableOffers
+        };
     });
 }
 /**
@@ -140,6 +144,7 @@ function searchScreeningEventTicketOffers(params) {
             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 }
                 });
             }
@@ -226,7 +231,10 @@ function searchScreeningEventTicketOffers(params) {
             }
             offer.addOn = offerAddOn;
         }
-        return offers4event;
+        return {
+            ticketOffers: offers4event,
+            unitPriceOffers: availableOffers
+        };
     });
 }
 function getUnacceptedPaymentMethodByEvent(params) {
@@ -342,8 +350,8 @@ function searchAddOns(params) {
 /**
  * 興行オファー検索
  */
-// tslint:disable-next-line:max-func-body-length
 function searchEventTicketOffers(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = moment();
@@ -354,6 +362,7 @@ function searchEventTicketOffers(params) {
             id: params.event.id
         });
         let offers;
+        let unitPriceOffers;
         const eventOffers = event.offers;
         if (eventOffers === undefined) {
             throw new factory.errors.NotFound('EventOffers', 'Event offers undefined');
@@ -367,10 +376,14 @@ function searchEventTicketOffers(params) {
             default:
                 // Chevreで券種オファーを検索
                 if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    offers = yield searchScreeningEventTicketOffers({ event })(repos);
+                    const searchOffersResult = yield searchScreeningEventTicketOffers({ ids: params.ids, event })(repos);
+                    offers = searchOffersResult.ticketOffers;
+                    unitPriceOffers = searchOffersResult.unitPriceOffers;
                 }
                 else if (event.typeOf === factory.eventType.Event) {
-                    offers = yield searchTransportationEventTicketOffers({ event })(repos);
+                    const searchOffersResult = yield searchTransportationEventTicketOffers({ ids: params.ids, event })(repos);
+                    offers = searchOffersResult.ticketOffers;
+                    unitPriceOffers = searchOffersResult.unitPriceOffers;
                 }
                 else {
                     throw new factory.errors.NotImplemented(`'${event.typeOf}' not implemented`);
@@ -426,7 +439,7 @@ function searchEventTicketOffers(params) {
                     }
                 }
         }
-        return offers;
+        return { ticketOffers: offers, unitPriceOffers };
     });
 }
 exports.searchEventTicketOffers = searchEventTicketOffers;

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

@@ -22,13 +22,20 @@ function mvtkChargePriceSpec2component(params) {
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToVideoFormat: params.appliesToVideoFormat, appliesToMovieTicket: params.appliesToMovieTicket }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
 }
 function createCompoundPriceSpec4event(params) {
+    var _a;
     // priceSpecificationはマスタ管理の仕様上必ず存在するはず
     if (params.offer.priceSpecification === undefined) {
         throw new factory.errors.NotFound(`priceSpecification of the offer: ${params.offer.id}`);
     }
     const unitPriceSpec = Object.assign(Object.assign({}, params.offer.priceSpecification), { name: params.offer.name });
-    const videoFormatChargeSpecComponents = params.videoFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
-    const soundFormatChargeSpecComponents = params.soundFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
+    let videoFormatChargeSpecComponents = [];
+    let soundFormatChargeSpecComponents = [];
+    // 区分加算料金を適用しないオプションを追加(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);
+    }
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
@@ -62,7 +69,7 @@ function createCompoundPriceSpec4event(params) {
         priceComponent
     };
     // 不要な属性を除外(2022-11-07~)
-    const _a = params.offer, { project } = _a, unitOfferFields4ticketOffer = __rest(_a, ["project"]);
+    const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
     return Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.283.0",
+    "@chevre/factory": "4.284.0-alpha.0",
     "@cinerino/sdk": "3.136.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.31"
+  "version": "20.2.0-alpha.32"
 }