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

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

@@ -1,3 +1,4 @@
+import * as factory from '../../../factory';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { IAcceptedOffer4COA } from './factory';
 /**
@@ -13,6 +14,7 @@ declare function validateAcceptedOffers(params: {
     project: {
         id: string;
     };
+    availablePaymentMethodTypes: factory.categoryCode.ICategoryCode[];
 }): (repos: {
     offer: OfferRepo;
 }) => Promise<{

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

@@ -11,7 +11,44 @@ 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;
+    let appliesToMovieTicket;
+    if (isMvtkOrMG) {
+        // kbnMgtkから動的にavailablePaymentMethodを設定
+        let kbnMgtk = params.ticketInfo.kbnMgtk;
+        if (typeof kbnMgtk !== 'string') {
+            kbnMgtk = '';
+        }
+        const availablePaymentMethodType = params.availablePaymentMethodTypes.find((categoryCode) => { var _a, _b; return ((_b = (_a = categoryCode.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === 'kbnMgtk')) === null || _b === void 0 ? void 0 : _b.value) === kbnMgtk; });
+        if (availablePaymentMethodType === undefined) {
+            throw new factory.errors.Argument('offer', `available payment method type not found for kbnMgtk: ${kbnMgtk}`);
+        }
+        const availablePaymentMethod = availablePaymentMethodType.codeValue;
+        movieTicketTypeChargePriceSpec = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
+            name: { ja: params.ticketInfo.ticketName, en: params.ticketInfo.ticketNameEng },
+            price: Number(params.ticketInfo.addPrice),
+            priceCurrency: factory.priceCurrency.JPY,
+            valueAddedTaxIncluded: true,
+            appliesToMovieTicket: {
+                typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+                serviceType: params.ticketInfo.mvtkKbnKensyu,
+                serviceOutput: { typeOf: availablePaymentMethod }
+            },
+            appliesToVideoFormat: params.ticketInfo.kbnEisyahousiki
+        };
+        appliesToMovieTicket = {
+            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+            identifier: params.ticketInfo.mvtkNum,
+            serviceType: params.ticketInfo.mvtkKbnKensyu,
+            serviceOutput: { typeOf: availablePaymentMethod }
+        };
+    }
+    return { movieTicketTypeChargePriceSpec, appliesToMovieTicket };
+}
 /**
  * 受け入れらたオファーの内容を検証
  */
@@ -29,9 +66,9 @@ function validateAcceptedOffers(params) {
                 project: { id: { $eq: params.project.id } }
             });
         }
-        // 利用可能なチケットオファーであれば受け入れる
+        // 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`);
@@ -40,19 +77,33 @@ function validateAcceptedOffers(params) {
             if (priceSpecification === undefined) {
                 throw new factory.errors.NotFound('priceSpecification');
             }
+            const unitPriceSpecByRequest = priceSpecification.priceComponent.find((component) => component.typeOf === factory.priceSpecificationType.UnitPriceSpecification);
+            if (unitPriceSpecByRequest === undefined) {
+                throw new factory.errors.ArgumentNull('offer.priceSpecification.priceComponent');
+            }
+            // appliesToMovieTicket.serviceOutput.typeOfを自動補完(2023-03-13~)
+            const { appliesToMovieTicket, movieTicketTypeChargePriceSpec } = createAppliesToMovieTicket({
+                project: { id: params.project.id },
+                ticketInfo,
+                availablePaymentMethodTypes: params.availablePaymentMethodTypes
+            });
+            let surfrockChargePriceSpec;
+            let appliesToMovieTicket4surfrock;
             // 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');
                 }
-                const surfrockChargePriceSpec = {
+                surfrockChargePriceSpec = {
                     appliesToMovieTicket: {
                         typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
-                        serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
+                        serviceOutput: { typeOf: surfrockPaymentMethodType },
                         serviceType
                     },
                     appliesToVideoFormat: 'Default',
@@ -62,22 +113,12 @@ function validateAcceptedOffers(params) {
                     typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
                     valueAddedTaxIncluded: true
                 };
-                // priceComponentに追加
-                priceSpecification.priceComponent = priceSpecification.priceComponent.map((component) => {
-                    if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
-                        if (!Array.isArray(component.appliesToMovieTicket)) {
-                            component.appliesToMovieTicket = [];
-                        }
-                        component.appliesToMovieTicket.push({
-                            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
-                            identifier: surfrockIdentifier,
-                            serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
-                            serviceType
-                        });
-                    }
-                    return component;
-                });
-                priceSpecification.priceComponent.push(surfrockChargePriceSpec);
+                appliesToMovieTicket4surfrock = {
+                    typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+                    identifier: surfrockIdentifier,
+                    serviceOutput: { typeOf: surfrockPaymentMethodType },
+                    serviceType
+                };
             }
             else {
                 // appliesToSurfrockの指定がなければ単価オファーの適用通貨条件を強制適用
@@ -85,6 +126,21 @@ function validateAcceptedOffers(params) {
                     eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
                 }
             }
+            const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: unitPriceSpecByRequest.name, price: unitPriceSpecByRequest.price, priceCurrency: factory.priceCurrency.JPY, referenceQuantity: unitPriceSpecByRequest.referenceQuantity, valueAddedTaxIncluded: true }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
+                ? {
+                    appliesToMovieTicket: [
+                        ...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
+                        ...(appliesToMovieTicket4surfrock !== undefined) ? [appliesToMovieTicket4surfrock] : []
+                    ]
+                }
+                : undefined);
+            // priceComponentを再生成
+            const priceComponent = [
+                unitPriceSpec,
+                ...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
+                ...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : []
+            ];
+            priceSpecification.priceComponent = priceComponent;
             return Object.assign(Object.assign({ additionalProperty,
                 itemOffered,
                 name,
@@ -95,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/lib/chevre/service/offer/eventServiceByCOA.d.ts

@@ -1,16 +1,19 @@
 import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as CategoryCodeRepo } from '../../repo/categoryCode';
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import { IAcceptedOffer4COA } from './eventServiceByCOA/factory';
 import * as factory from '../../factory';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-export declare type IAuthorizeOperation<T> = (repos: {
+interface IAuthorizeRepos {
     action: ActionRepo;
+    categoryCode: CategoryCodeRepo;
     event: EventRepo;
     offer: OfferRepo;
     transaction: TransactionRepo;
-}) => Promise<T>;
+}
+export declare type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 export declare type IAuthorizeOfferAction = factory.action.authorize.offer.seatReservation.IAction<WebAPIIdentifier.COA>;
 /**
  * COA興行オファー承認

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

@@ -29,16 +29,20 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // イベント取得属性最適化(2023-01-23~)
-        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.event.id });
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.event.id
         });
+        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
+        });
         // COA仮予約後にリクエストが来る前提
         // validate acceptedOffer(2023-03-09~)
         // const acceptedOffer = params.object.acceptedOffer;
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
-            project: { id: transaction.project.id }
+            project: { id: transaction.project.id },
+            availablePaymentMethodTypes
         })(repos);
         const updTmpReserveSeatArgs = params.result.requestBody;
         const updTmpReserveSeatResult = params.result.responseBody;
@@ -145,16 +149,20 @@ function changeOffers(params) {
         }
         validate4changeOffer({ action: authorizeAction, object: params.object });
         // イベント取得属性最適化(2023-01-23~)
-        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.event.id });
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.event.id
         });
+        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
+        });
         // COA仮予約後にリクエストが来る前提
         // validate acceptedOffer(2023-03-09~)
         // const acceptedOffer = params.object.acceptedOffer;
         const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
-            project: { id: transaction.project.id }
+            project: { id: transaction.project.id },
+            availablePaymentMethodTypes
         })(repos);
         // 供給情報と価格を変更してからDB更新
         authorizeAction.object.acceptedOffer = 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.7"
+  "version": "20.7.0-alpha.9"
 }