@chevre/domain 20.10.0-alpha.0 → 20.10.0

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -15,6 +15,7 @@ declare function validateAcceptedOffers(params: {
         id: string;
     };
     availablePaymentMethodTypes: factory.categoryCode.ICategoryCode[];
+    screeningEvent: Pick<factory.event.screeningEvent.IEvent, 'id' | 'superEvent'>;
 }): (repos: {
     offer: OfferRepo;
 }) => Promise<{

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.js

@@ -50,7 +50,7 @@ function createAppliesToMovieTicket(params) {
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPriceComponent(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const acceptedOffer = params.acceptedOffer;
     const availableUnitPriceOffer = params.availableUnitPriceOffer;
     const { name, ticketInfo } = acceptedOffer;
@@ -130,15 +130,26 @@ function createPriceComponent(params) {
     // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く
     if (movieTicketTypeChargePriceSpec === undefined) {
         if (ticketInfo.addPrice > 0) {
+            const kbnJoueihousiki = (_h = params.screeningEvent.superEvent.coaInfo) === null || _h === void 0 ? void 0 : _h.kbnJoueihousiki;
             categoryCodeChargeSpecs.push({
                 name: {
-                    en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                    ja: '加算単価'
+                    en: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunNameEng) === 'string')
+                        ? kbnJoueihousiki.kubunNameEng
+                        : factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    ja: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunName) === 'string') ? kbnJoueihousiki.kubunName : '加算単価'
                 },
                 price: ticketInfo.addPrice,
                 priceCurrency: factory.priceCurrency.JPY,
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: [],
+                appliesToCategoryCode: [{
+                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        typeOf: 'CategoryCode',
+                        codeValue: String(kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode),
+                        inCodeSet: {
+                            typeOf: 'CategoryCodeSet',
+                            identifier: factory.categoryCode.CategorySetIdentifier.VideoFormatType
+                        }
+                    }],
                 valueAddedTaxIncluded: true
             });
         }
@@ -152,7 +163,15 @@ function createPriceComponent(params) {
             price: ticketInfo.spseatAdd1,
             priceCurrency: factory.priceCurrency.JPY,
             typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-            appliesToCategoryCode: [],
+            appliesToCategoryCode: [{
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    typeOf: 'CategoryCode',
+                    codeValue: ticketInfo.spseatKbn,
+                    inCodeSet: {
+                        typeOf: 'CategoryCodeSet',
+                        identifier: factory.categoryCode.CategorySetIdentifier.SeatingType
+                    }
+                }],
             valueAddedTaxIncluded: true
         });
     }
@@ -245,9 +264,11 @@ function validateAcceptedOffers(params) {
             }
             // priceComponentを再生成(2023-03-14~)
             const { priceComponent, eligibleMonetaryAmount } = createPriceComponent({
+                project: { id: params.project.id },
                 availablePaymentMethodTypes: params.availablePaymentMethodTypes,
                 acceptedOffer,
-                availableUnitPriceOffer
+                availableUnitPriceOffer,
+                screeningEvent: params.screeningEvent
             });
             priceSpecification.priceComponent = priceComponent;
             return Object.assign(Object.assign({ additionalProperty,

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

@@ -42,7 +42,8 @@ function authorize(params) {
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
             project: { id: transaction.project.id },
-            availablePaymentMethodTypes
+            availablePaymentMethodTypes,
+            screeningEvent
         })(repos);
         const updTmpReserveSeatArgs = params.result.requestBody;
         const updTmpReserveSeatResult = params.result.responseBody;
@@ -148,20 +149,6 @@ function changeOffers(params) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         validate4changeOffer({ action: authorizeAction, object: params.object });
-        // 座席情報に関しては元のacceptedOffersで自動補完する(リクエストでは指定されないので注意)(2023-03-17~)
-        params.object.acceptedOffer = params.object.acceptedOffer.map((offer) => {
-            const originalOffer = authorizeAction.object.acceptedOffer.find((o) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-                return ((_d = (_c = (_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection)
-                    === ((_g = (_f = (_e = offer.itemOffered.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket) === null || _f === void 0 ? void 0 : _f.ticketedSeat) === null || _g === void 0 ? void 0 : _g.seatSection)
-                    && ((_k = (_j = (_h = o.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatNumber)
-                        === ((_o = (_m = (_l = offer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber);
-            });
-            if (originalOffer === undefined) {
-                throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
-            }
-            return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalOffer.ticketInfo.spseatAdd1, spseatAdd2: originalOffer.ticketInfo.spseatAdd2, spseatKbn: originalOffer.ticketInfo.spseatKbn }) });
-        });
         // イベント取得属性最適化(2023-01-23~)
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.event.id
@@ -176,7 +163,8 @@ function changeOffers(params) {
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
             project: { id: transaction.project.id },
-            availablePaymentMethodTypes
+            availablePaymentMethodTypes,
+            screeningEvent
         })(repos);
         // 供給情報と価格を変更してからDB更新
         authorizeAction.object.acceptedOffer = acceptedOffers;

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.10.0-alpha.0"
+  "version": "20.10.0"
 }