@chevre/domain 20.7.0-alpha.8 → 20.7.0-alpha.9

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAcceptedOffers = void 0;
 const factory = require("../../../factory");
-const MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE = 'MembershipCoupon'; // ひとまず固定
 function createAppliesToMovieTicket(params) {
     const isMvtkOrMG = typeof params.ticketInfo.mvtkNum === 'string' && params.ticketInfo.mvtkNum.length > 0;
     let movieTicketTypeChargePriceSpec;
@@ -69,7 +68,7 @@ function validateAcceptedOffers(params) {
         }
         // tslint:disable-next-line:max-func-body-length
         const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => unitPriceOffer.id === acceptedOffer.id);
             if (availableUnitPriceOffer === undefined) {
                 throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.identifier} not found`);
@@ -93,16 +92,18 @@ function validateAcceptedOffers(params) {
             // appliesToSurfrockの指定があれば強制的にMovieTicket決済
             let eligibleMonetaryAmount;
             const surfrockIdentifier = (_b = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToSurfrock) === null || _b === void 0 ? void 0 : _b.identifier;
-            if (typeof surfrockIdentifier === 'string') {
+            const surfrockPaymentMethodType = (_e = (_d = (_c = acceptedOffer.priceSpecification) === null || _c === void 0 ? void 0 : _c.appliesToSurfrock) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.typeOf;
+            if (typeof surfrockIdentifier === 'string' && surfrockIdentifier.length > 0
+                && typeof surfrockPaymentMethodType === 'string' && surfrockPaymentMethodType.length > 0) {
                 // serviceTypeはticketCode
-                const serviceType = (_d = (_c = availableUnitPriceOffer.additionalProperty) === null || _c === void 0 ? void 0 : _c.find((p) => p.name === 'ticketCode')) === null || _d === void 0 ? void 0 : _d.value;
+                const serviceType = (_g = (_f = availableUnitPriceOffer.additionalProperty) === null || _f === void 0 ? void 0 : _f.find((p) => p.name === 'ticketCode')) === null || _g === void 0 ? void 0 : _g.value;
                 if (typeof serviceType !== 'string') {
                     throw new factory.errors.NotFound('ticketCode of unitPriceOffer');
                 }
                 surfrockChargePriceSpec = {
                     appliesToMovieTicket: {
                         typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
-                        serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
+                        serviceOutput: { typeOf: surfrockPaymentMethodType },
                         serviceType
                     },
                     appliesToVideoFormat: 'Default',
@@ -115,7 +116,7 @@ function validateAcceptedOffers(params) {
                 appliesToMovieTicket4surfrock = {
                     typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
                     identifier: surfrockIdentifier,
-                    serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
+                    serviceOutput: { typeOf: surfrockPaymentMethodType },
                     serviceType
                 };
             }
@@ -150,10 +151,10 @@ function validateAcceptedOffers(params) {
                 priceCurrency: availableUnitPriceOffer.priceCurrency, id: String(availableUnitPriceOffer.id), identifier: String(availableUnitPriceOffer.identifier), typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), {
                 // tslint:disable-next-line:no-suspicious-comment
                 // TODO itemOfferedに完全置き換え
-                seatNumber: (_g = (_f = (_e = 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.seatNumber,
+                seatNumber: (_k = (_j = (_h = 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,
                 // tslint:disable-next-line:no-suspicious-comment
                 // TODO itemOfferedに完全置き換え
-                seatSection: (_k = (_j = (_h = 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.seatSection
+                seatSection: (_o = (_m = (_l = 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.seatSection
             });
         });
         return { acceptedOffers };

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.301.0-alpha.1",
-    "@cinerino/sdk": "3.149.0-alpha.2",
+    "@chevre/factory": "4.301.0-alpha.2",
+    "@cinerino/sdk": "3.149.0-alpha.4",
     "@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.7.0-alpha.8"
+  "version": "20.7.0-alpha.9"
 }