@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = validateMovieTicket;
 const createDebug = require("debug");
@@ -18,9 +9,8 @@ function validateMovieTicket(params, paymentServiceId,
 // useCheckByIdentifierIfNotYet: boolean,
 checkedAction, purpose) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
+    return async (repos, settings) => {
+        const movieTickets = params.object.paymentMethod?.movieTickets;
         if (!Array.isArray(movieTickets)) {
             throw new factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
         }
@@ -41,17 +31,17 @@ checkedAction, purpose) {
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
         }
         // ムビチケ系統の決済方法タイプは動的
-        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+        const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.projectEventFieldsById({ id: eventIds[0] }, [
+        const screeningEvent = await repos.event.projectEventFieldsById({ id: eventIds[0] }, [
             'typeOf', 'project', 'coaInfo', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
         ] // optimize(2024-07-18~)
         );
         // 販売者からムビチケ決済情報取得
-        const sellerId = (_c = params.recipient) === null || _c === void 0 ? void 0 : _c.id;
+        const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
@@ -69,14 +59,14 @@ checkedAction, purpose) {
         //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
         // }
         // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
-        const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+        const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
             seller: { id: sellerId },
             codeValue: paymentMethodType
         });
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
         }
-        const checkResult = yield checkByIdentifierIfNotYet({
+        const checkResult = await checkByIdentifierIfNotYet({
             movieTicketIdentifier,
             movieTickets: movieTickets,
             seller: { id: sellerId },
@@ -90,12 +80,11 @@ checkedAction, purpose) {
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            var _a, _b;
             const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
             let availableMovieTicketsCountByServiceType = 0;
-            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifier)) === null || _b === void 0 ? void 0 : _b.ykknInfo;
-            const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
-            const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
+            const ykknInfos = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut?.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifier)?.ykknInfo;
+            const ykknInfoOfServiceType = ykknInfos?.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
+            const ykknKnshbtsmiNum = ykknInfoOfServiceType?.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -104,32 +93,46 @@ checkedAction, purpose) {
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
             // checkResultから計上金額を取得
-            const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
-            accountsReceivablesByServiceType.push(Object.assign({ serviceType }, (typeof accountsReceivableByResponse === 'string')
-                ? { accountsReceivable: Number(accountsReceivableByResponse) }
-                : undefined));
+            const accountsReceivableByResponse = ykknInfoOfServiceType?.kijUnip;
+            accountsReceivablesByServiceType.push({
+                serviceType,
+                ...(typeof accountsReceivableByResponse === 'string')
+                    ? { accountsReceivable: Number(accountsReceivableByResponse) }
+                    : undefined
+            });
         });
         return { accountsReceivablesByServiceType };
-    });
+    };
 }
 function checkByIdentifierIfNotYet(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos, settings) => {
         let checkResult;
         let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
         const placeOrderId = params.purpose.id;
         if (typeof placeOrderId === 'string') {
             // no op
         }
-        const specifiedCheckedActionId = (_a = params.checkedAction) === null || _a === void 0 ? void 0 : _a.id;
+        const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, id: { $in: [specifiedCheckedActionId] }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
+            alreadyCheckedAction = (await repos.action.search({
+                limit: 1,
+                page: 1,
+                id: { $in: [specifiedCheckedActionId] },
+                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+            }, ['id'])).shift();
             if (alreadyCheckedAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.CheckAction);
             }
         }
         else {
-            alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, sort: { startDate: factory.sortType.Descending }, typeOf: { $eq: factory.actionType.CheckAction }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, object: {
+            alreadyCheckedAction = (await repos.action.search({
+                limit: 1,
+                page: 1,
+                sort: { startDate: factory.sortType.Descending },
+                typeOf: { $eq: factory.actionType.CheckAction },
+                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
                     movieTickets: {
@@ -138,14 +141,16 @@ function checkByIdentifierIfNotYet(params) {
                             reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
-                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
+                },
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+            }, ['id'])).shift();
         }
         if (alreadyCheckedAction !== undefined) {
-            const recipe = yield repos.action.findRecipeByAction({
+            const recipe = await repos.action.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });
-            const directionPurchaseNumberAuth = (_c = (_b = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0];
+            const directionPurchaseNumberAuth = recipe?.step[0]?.itemListElement[0]?.itemListElement[0];
             if (directionPurchaseNumberAuth !== undefined) {
                 const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
                 if (beforeMedia !== undefined && afterMedia !== undefined) {
@@ -155,8 +160,8 @@ function checkByIdentifierIfNotYet(params) {
         }
         if (checkResult === undefined) {
             debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
-            checkResult = yield (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)(params)(repos, settings);
+            checkResult = await (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)(params)(repos, settings);
         }
         return checkResult;
-    });
+    };
 }

package/lib/chevre/service/payment/movieTicket/voidTransaction.js

@@ -1,22 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = voidTransaction;
 const factory = require("../../../factory");
 const refundMovieTicket_1 = require("./refundMovieTicket");
 function voidTransaction(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos, settings) => {
         const transaction = params.object;
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = transaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
@@ -27,7 +17,7 @@ function voidTransaction(params) {
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = yield repos.action.findPayAction({
+        const payAction = await repos.action.findPayAction({
             project: { id: transaction.project.id },
             paymentMethodId,
             actionStatus: {
@@ -41,7 +31,7 @@ function voidTransaction(params) {
         if (payAction !== undefined) {
             let refundAction;
             const seller = transaction.recipient;
-            if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
+            if (typeof seller?.id !== 'string') {
                 throw new factory.errors.NotFound('payTransaction.recipient');
             }
             if (payAction.purpose.typeOf !== factory.order.OrderType.Order) {
@@ -56,7 +46,7 @@ function voidTransaction(params) {
                         paymentMethod: {
                             paymentMethodId: paymentMethodId,
                             typeOf: paymentMethodType,
-                            name: (typeof ((_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.name) === 'string')
+                            name: (typeof transaction.object.paymentMethod?.name === 'string')
                                 ? transaction.object.paymentMethod.name
                                 : paymentMethodType,
                             additionalProperty: []
@@ -64,7 +54,7 @@ function voidTransaction(params) {
                     }],
                 agent: {
                     id: seller.id,
-                    name: (typeof seller.name === 'string') ? seller.name : String((_c = seller.name) === null || _c === void 0 ? void 0 : _c.ja),
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
                     typeOf: seller.typeOf
                 },
                 recipient: transaction.recipient,
@@ -72,7 +62,7 @@ function voidTransaction(params) {
                 instrument: []
             };
             // callOnPayActionCompleted: false(2025-02-10~)
-            yield (0, refundMovieTicket_1.refundMovieTicket)(refundAction, { callOnPayActionCompleted: false })(repos, settings);
+            await (0, refundMovieTicket_1.refundMovieTicket)(refundAction, { callOnPayActionCompleted: false })(repos, settings);
         }
-    });
+    };
 }