@chevre/domain 20.11.0-alpha.0 → 20.11.0-alpha.2

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -2,28 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
-const order_1 = require("../../../factory/order");
+// import { createMaskedCustomer } from '../../../factory/order';
 function createPayActions(params) {
     var _a;
     const payActions = [];
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
-        const simpleOrder = {
+        // const maskedCustomer = createMaskedCustomer(params.order);
+        // const simpleOrder: factory.order.ISimpleOrder = {
+        //     typeOf: params.order.typeOf,
+        //     seller: params.order.seller,
+        //     // mask
+        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+        //     orderNumber: params.order.orderNumber,
+        //     price: params.order.price,
+        //     priceCurrency: params.order.priceCurrency,
+        //     orderDate: params.order.orderDate
+        // };
+        const payPurpose = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
-            // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
+            confirmationNumber: params.order.confirmationNumber,
+            orderNumber: params.order.orderNumber
         };
         const payAction = Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
                 add2report: true,
                 informPayment: informPaymentActions
-            }, purpose: simpleOrder, recipient: {
+            }, 
+            // optimize(2023-03-20~)
+            // purpose: simpleOrder,
+            purpose: payPurpose, recipient: {
                 id: params.transaction.recipient.id,
                 name: params.transaction.recipient.name,
                 typeOf: params.transaction.recipient.typeOf
@@ -135,6 +143,7 @@ function createPayObjectServiceOutput(params) {
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
     var _a, _b;
     let ticketToken;
+    let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
     const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
@@ -176,6 +185,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
         if (typeof ticketTokenByReservationOffer === 'string' && ticketTokenByReservationOffer.length > 0) {
             ticketToken = ticketTokenByReservationOffer;
         }
+        reservationNumber = reservationOffer.itemOffered.reservationNumber;
         const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
         if (Array.isArray(priceComponent)) {
             priceComponents4invoice = priceComponent.map((component) => {
@@ -200,7 +210,9 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     return Object.assign({ priceSpecification: {
             typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
             priceComponent: priceComponents4invoice
-        } }, (typeof ticketToken === 'string')
+        }, 
+        // add reservationNumber(2023-03-20~)
+        reservationNumber }, (typeof ticketToken === 'string')
         ? { reservedTicket: { ticketToken } }
         : undefined);
 }

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

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

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

@@ -37,7 +37,7 @@ function createAppliesToMovieTicket(params) {
                 serviceType: params.ticketInfo.mvtkKbnKensyu,
                 serviceOutput: { typeOf: availablePaymentMethod }
             },
-            appliesToVideoFormat: params.ticketInfo.kbnEisyahousiki
+            appliesToVideoFormat: params.appliesToVideoFormat
         };
         appliesToMovieTicket = {
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
@@ -50,35 +50,35 @@ function createAppliesToMovieTicket(params) {
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPriceComponent(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     const acceptedOffer = params.acceptedOffer;
     const availableUnitPriceOffer = params.availableUnitPriceOffer;
+    const kbnJoueihousiki = (_a = params.screeningEvent.superEvent.coaInfo) === null || _a === void 0 ? void 0 : _a.kbnJoueihousiki;
+    const appliesToVideoFormat = (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode) === 'string')
+        ? kbnJoueihousiki.kubunCode
+        : 'Default';
     const { name, ticketInfo } = acceptedOffer;
     // appliesToMovieTicket.serviceOutput.typeOfを自動補完(2023-03-13~)
     const { appliesToMovieTicket, movieTicketTypeChargePriceSpec } = createAppliesToMovieTicket({
         ticketInfo,
-        availablePaymentMethodTypes: params.availablePaymentMethodTypes
+        availablePaymentMethodTypes: params.availablePaymentMethodTypes,
+        appliesToVideoFormat
     });
     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;
-    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;
+    const surfrockIdentifier = (_c = (_b = acceptedOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.appliesToSurfrock) === null || _c === void 0 ? void 0 : _c.identifier;
+    const surfrockPaymentMethodType = (_f = (_e = (_d = acceptedOffer.priceSpecification) === null || _d === void 0 ? void 0 : _d.appliesToSurfrock) === null || _e === void 0 ? void 0 : _e.serviceOutput) === null || _f === void 0 ? void 0 : _f.typeOf;
     if (typeof surfrockIdentifier === 'string' && surfrockIdentifier.length > 0
         && typeof surfrockPaymentMethodType === 'string' && surfrockPaymentMethodType.length > 0) {
-        // serviceTypeはticketCode
-        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: surfrockPaymentMethodType },
-                serviceType
+                serviceType: ticketInfo.ticketCode // serviceTypeはticketCode
             },
-            appliesToVideoFormat: 'Default',
+            appliesToVideoFormat,
             name,
             price: 0,
             priceCurrency: factory.priceCurrency.JPY,
@@ -89,7 +89,7 @@ function createPriceComponent(params) {
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
             identifier: surfrockIdentifier,
             serviceOutput: { typeOf: surfrockPaymentMethodType },
-            serviceType
+            serviceType: ticketInfo.ticketCode // serviceTypeはticketCode
         };
     }
     else {
@@ -130,7 +130,6 @@ 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: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunNameEng) === 'string')
@@ -274,6 +273,7 @@ function validateAcceptedOffers(params) {
                 project: { id: params.project.id },
                 availablePaymentMethodTypes: params.availablePaymentMethodTypes,
                 seatingTypes: params.seatingTypes,
+                videoFormatTypes: params.videoFormatTypes,
                 acceptedOffer,
                 availableUnitPriceOffer,
                 screeningEvent: params.screeningEvent

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

@@ -40,15 +40,18 @@ function authorize(params) {
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         });
+        const videoFormatTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
+        });
         // 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 },
-            availablePaymentMethodTypes,
             screeningEvent,
-            seatingTypes
+            availablePaymentMethodTypes,
+            seatingTypes,
+            videoFormatTypes
         })(repos);
         const updTmpReserveSeatArgs = params.result.requestBody;
         const updTmpReserveSeatResult = params.result.responseBody;
@@ -180,15 +183,18 @@ function changeOffers(params) {
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         });
+        const videoFormatTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
+        });
         // 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 },
-            availablePaymentMethodTypes,
             screeningEvent,
-            seatingTypes
+            availablePaymentMethodTypes,
+            seatingTypes,
+            videoFormatTypes
         })(repos);
         // 供給情報と価格を変更してからDB更新
         authorizeAction.object.acceptedOffer = acceptedOffers;

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -11,9 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createDeleteTasks = exports.createInformTasks = exports.getOrderWithToken = void 0;
-/**
- * 注文ステータス変更時処理
- */
 const google_libphonenumber_1 = require("google-libphonenumber");
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
@@ -246,10 +243,18 @@ function createConfirmReservationActionObject4COAByOrder(params) {
             throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
         }
         const listTicket = coaReservations.map((r) => {
-            if (r.reservedTicket.coaTicketInfo === undefined) {
+            var _a;
+            if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
                 throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
             }
-            return r.reservedTicket.coaTicketInfo;
+            // 冗長な属性を排除(2023-03-20~)
+            const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
+            return {
+                ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
+                disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
+                seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
+                mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
+            };
         });
         return {
             theaterCode: reservationForCOAInfo.theaterCode,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.304.0",
-    "@cinerino/sdk": "3.150.0",
+    "@chevre/factory": "4.305.0",
+    "@cinerino/sdk": "3.151.0-alpha.1",
     "@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.11.0-alpha.0"
+  "version": "20.11.0-alpha.2"
 }