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

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -1,24 +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());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundCreditCard = refundCreditCard;
 const GMO = require("@motionpicture/gmo-service");
@@ -36,12 +16,11 @@ function refundCreditCard(params
 //     requirePayAction: boolean;
 // }
 ) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    return async (repos, settings) => {
         const { purpose } = params;
-        const paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf;
-        const paymentMethodId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.paymentMethodId;
-        const paymentServiceId = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.id;
+        const paymentMethodType = params.object[0]?.paymentMethod.typeOf;
+        const paymentMethodId = params.object[0]?.paymentMethod.paymentMethodId;
+        const paymentServiceId = params.object[0]?.id;
         let requirePayAction = false;
         const requirePaymentAccepted = false;
         if (purpose.typeOf === factory.actionType.ReturnAction) {
@@ -52,27 +31,30 @@ function refundCreditCard(params
         let payAction;
         let alterTranResultByPayAction;
         if (requirePayAction) {
-            payAction = yield repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+            payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
             if (payAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.PayAction);
             }
-            const payRecipe = yield repos.action.findRecipeByAction({
+            const payRecipe = await repos.action.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: payAction.id }
             });
-            alterTranResultByPayAction = (_f = (_e = (_d = payRecipe === null || payRecipe === void 0 ? void 0 : payRecipe.step[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[1]) === null || _e === void 0 ? void 0 : _e.itemListElement[0]) === null || _f === void 0 ? void 0 : _f.afterMedia;
+            alterTranResultByPayAction = payRecipe?.step[0]?.itemListElement[1]?.itemListElement[0]?.afterMedia;
         }
         const sellerId = params.agent.id;
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted
         })(repos);
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: params.project,
             id: paymentServiceId
         });
-        const { sameAs } = params, startingActionParams = __rest(params, ["sameAs"]);
-        const action = yield repos.action.start(Object.assign(Object.assign({}, startingActionParams), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
+        const { sameAs, ...startingActionParams } = params;
+        const action = await repos.action.start({
+            ...startingActionParams,
+            ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+        });
         let processAlterTranResult;
         let recipe;
         try {
@@ -80,13 +62,13 @@ function refundCreditCard(params
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: settings.gmo.useFetch
             }, { timeout: settings.gmo.timeout });
-            processAlterTranResult = yield processAlterTran({
+            processAlterTranResult = await processAlterTran({
                 availableChannel,
                 alterTranResultByPayAction,
                 paymentMethodId: paymentMethodId,
                 shopId: shopId,
                 shopPass: shopPass,
-                refundFee: (_h = params.object[0]) === null || _h === void 0 ? void 0 : _h.refundFee,
+                refundFee: params.object[0]?.refundFee,
                 purpose
             })({ creditService });
             recipe = (0, factory_1.processAlterTranResult2refundRecipe)({ processAlterTranResult, project: { id: params.project.id } });
@@ -102,7 +84,10 @@ function refundCreditCard(params
         }
         catch (error) {
             try {
-                yield repos.action.giveUp(Object.assign({ typeOf: action.typeOf, id: action.id, error }, (recipe !== undefined) ? { recipe } : undefined));
+                await repos.action.giveUp({
+                    typeOf: action.typeOf, id: action.id, error,
+                    ...(recipe !== undefined) ? { recipe } : undefined
+                });
             }
             catch (__) {
                 // no op
@@ -111,8 +96,8 @@ function refundCreditCard(params
         }
         const actionResult = {}; // optimize(2024-06-10~)
         // add recipe(2024-06-04~)
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
-        yield (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: startingActionParams.object,
@@ -121,12 +106,11 @@ function refundCreditCard(params
             purpose: startingActionParams.purpose,
             typeOf: action.typeOf
         })(repos);
-    });
+    };
 }
 function processAlterTran(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         let searchTradeArgs;
         let searchTradeResult;
         let searchTradeResultAsError;
@@ -139,10 +123,10 @@ function processAlterTran(params) {
             searchTradeArgs = {
                 shopId, shopPass,
                 orderId: params.paymentMethodId,
-                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
+                siteId: params.availableChannel.credentials?.siteId,
+                sitePass: params.availableChannel.credentials?.sitePass
             };
-            searchTradeResult = yield repos.creditService.searchTrade(searchTradeArgs);
+            searchTradeResult = await repos.creditService.searchTrade(searchTradeArgs);
         }
         catch (error) {
             let throwsError = true;
@@ -175,7 +159,7 @@ function processAlterTran(params) {
                 let alreadyRefunded = false;
                 if (purpose.typeOf === factory.actionType.ReturnAction) {
                     // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
-                    if (typeof (creditCardSalesBefore === null || creditCardSalesBefore === void 0 ? void 0 : creditCardSalesBefore.tranId) === 'string') {
+                    if (typeof creditCardSalesBefore?.tranId === 'string') {
                         if (tranId !== creditCardSalesBefore.tranId) {
                             alreadyRefunded = true;
                         }
@@ -208,10 +192,10 @@ function processAlterTran(params) {
                         alterTranArgs = {
                             shopId, shopPass, accessId, accessPass,
                             jobCd: GMO.utils.util.JobCd.Void,
-                            siteId: (_c = params.availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                            sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                            siteId: params.availableChannel.credentials?.siteId,
+                            sitePass: params.availableChannel.credentials?.sitePass
                         };
-                        alterTranResult = yield repos.creditService.alterTran(alterTranArgs);
+                        alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     }
                     catch (error) {
                         let throwsError = true;
@@ -245,6 +229,13 @@ function processAlterTran(params) {
                 processAlterTranError = error;
             }
         }
-        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { searchTradeResult } : undefined), (searchTradeResultAsError !== undefined) ? { searchTradeResultAsError } : undefined), (alterTranArgs !== undefined) ? { alterTranArgs } : undefined), (alterTranResult !== undefined) ? { alterTranResult } : undefined), (processAlterTranError !== undefined) ? { processAlterTranError } : undefined);
-    });
+        return {
+            ...(searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined,
+            ...(searchTradeResult !== undefined) ? { searchTradeResult } : undefined,
+            ...(searchTradeResultAsError !== undefined) ? { searchTradeResultAsError } : undefined,
+            ...(alterTranArgs !== undefined) ? { alterTranArgs } : undefined,
+            ...(alterTranResult !== undefined) ? { alterTranResult } : undefined,
+            ...(processAlterTranError !== undefined) ? { processAlterTranError } : undefined
+        };
+    };
 }

package/lib/chevre/service/payment/creditCard/searchGMOTrade.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.searchGMOTrade = searchGMOTrade;
 const GMO = require("@motionpicture/gmo-service");
@@ -17,44 +8,41 @@ const gmoError_1 = require("./gmoError");
  * 決済代行側の取引状態参照
  * 存在しない場合NotFoundエラー
  */
-function searchGMOTrade(params, settings) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const creditCardService = new GMO.service.Credit({
-            endpoint: String(params.availableChannel.serviceUrl),
-            useFetch: settings.gmo.useFetch
-        }, { timeout: settings.gmo.timeout });
-        // 取引状態参照
-        let searchTradeResult;
-        try {
-            searchTradeResult = yield creditCardService.searchTrade({
-                shopId: params.shopId,
-                shopPass: params.shopPass,
-                orderId: params.paymentMethodId,
-                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
-            });
-        }
-        catch (error) {
-            // searchTradeでのエラーをハンドリング(2024-04-08~)
-            let throwsError = true;
-            if (error.name === 'GMOServiceBadRequestError') {
-                if (Array.isArray(error.errors) && error.errors.length > 0) {
-                    const gmoErrors = error.errors;
-                    // 指定されたIDとパスワードの取引が存在しません。
-                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === gmoError_1.GMOErrorInfo.TransactionNotFound);
-                    if (notFoundErrorExists) {
-                        throwsError = false;
-                    }
+async function searchGMOTrade(params, settings) {
+    const creditCardService = new GMO.service.Credit({
+        endpoint: String(params.availableChannel.serviceUrl),
+        useFetch: settings.gmo.useFetch
+    }, { timeout: settings.gmo.timeout });
+    // 取引状態参照
+    let searchTradeResult;
+    try {
+        searchTradeResult = await creditCardService.searchTrade({
+            shopId: params.shopId,
+            shopPass: params.shopPass,
+            orderId: params.paymentMethodId,
+            siteId: params.availableChannel.credentials?.siteId,
+            sitePass: params.availableChannel.credentials?.sitePass
+        });
+    }
+    catch (error) {
+        // searchTradeでのエラーをハンドリング(2024-04-08~)
+        let throwsError = true;
+        if (error.name === 'GMOServiceBadRequestError') {
+            if (Array.isArray(error.errors) && error.errors.length > 0) {
+                const gmoErrors = error.errors;
+                // 指定されたIDとパスワードの取引が存在しません。
+                const notFoundErrorExists = gmoErrors.some(({ info }) => info === gmoError_1.GMOErrorInfo.TransactionNotFound);
+                if (notFoundErrorExists) {
+                    throwsError = false;
                 }
             }
-            if (throwsError) {
-                throw error;
-            }
         }
-        if (searchTradeResult === undefined) {
-            throw new factory.errors.NotFound('searchTradeResult');
+        if (throwsError) {
+            throw error;
         }
-        return searchTradeResult;
-    });
+    }
+    if (searchTradeResult === undefined) {
+        throw new factory.errors.NotFound('searchTradeResult');
+    }
+    return searchTradeResult;
 }

package/lib/chevre/service/payment/creditCard/voidTransaction.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.voidTransaction = voidTransaction;
 const GMO = require("@motionpicture/gmo-service");
@@ -19,11 +10,10 @@ const gmoError_1 = require("./gmoError");
  */
 // tslint:disable-next-line:max-func-body-length
 function voidTransaction(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos, settings) => {
         const transaction = params.object;
         // CreditCard系統の決済方法タイプは動的
-        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');
         }
@@ -32,20 +22,20 @@ function voidTransaction(params) {
             throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: transaction.project,
             id: paymentServiceId
         });
-        const sellerId = (_b = transaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
+        const sellerId = transaction.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted: false
         })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
-        const authorizeInvoiceAction = (yield repos.action.search({
+        const authorizeInvoiceAction = (await repos.action.search({
             limit: 1,
             page: 1,
             typeOf: { $eq: factory.actionType.AuthorizeAction },
@@ -58,7 +48,7 @@ function voidTransaction(params) {
                 agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
                 // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
             };
-            yield repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+            await repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
         }
         const creditCardService = new GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl),
@@ -66,12 +56,12 @@ function voidTransaction(params) {
         }, { timeout: settings.gmo.timeout });
         let searchTradeResult;
         try {
-            searchTradeResult = yield creditCardService.searchTrade({
+            searchTradeResult = await creditCardService.searchTrade({
                 shopId: shopId,
                 shopPass: shopPass,
                 orderId: paymentMethodId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                siteId: availableChannel.credentials?.siteId,
+                sitePass: availableChannel.credentials?.sitePass
             });
         }
         catch (error) {
@@ -92,16 +82,16 @@ function voidTransaction(params) {
             }
         }
         // 仮売上であれば取消
-        if ((searchTradeResult === null || searchTradeResult === void 0 ? void 0 : searchTradeResult.status) === GMO.utils.util.JobCd.Auth) {
-            yield creditCardService.alterTran({
+        if (searchTradeResult?.status === GMO.utils.util.JobCd.Auth) {
+            await creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
                 accessId: searchTradeResult.accessId,
                 accessPass: searchTradeResult.accessPass,
                 jobCd: GMO.utils.util.JobCd.Void,
-                siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
-                sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
+                siteId: availableChannel.credentials?.siteId,
+                sitePass: availableChannel.credentials?.sitePass
             });
         }
-    });
+    };
 }

package/lib/chevre/service/payment/faceToFace.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.payFaceToFace = payFaceToFace;
 exports.refundFaceToFace = refundFaceToFace;
@@ -19,19 +10,19 @@ const factory = require("../../factory");
 const onPayActionCompleted_1 = require("./any/onPayActionCompleted");
 const onRefundActionCompletedOrFailed_1 = require("./any/onRefundActionCompletedOrFailed");
 function voidTransaction(__) {
-    return (___) => __awaiter(this, void 0, void 0, function* () {
+    return async (___) => {
         // no op
-    });
+    };
 }
 function payFaceToFace(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = yield repos.action.start(params);
+    return async (repos) => {
+        const action = await repos.action.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -39,8 +30,8 @@ function payFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield (0, onPayActionCompleted_1.onPayActionCompleted)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -50,17 +41,17 @@ function payFaceToFace(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function refundFaceToFace(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = yield repos.action.start(params);
+    return async (repos) => {
+        const action = await repos.action.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -68,8 +59,8 @@ function refundFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -79,5 +70,5 @@ function refundFaceToFace(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }

package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.js

@@ -17,16 +17,21 @@ function createPayObjectServiceOutput(params) {
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
-            const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
+            const paymentMethodType = paymentMethod?.identifier;
+            const movieTickets = paymentMethod?.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
-                    var _a;
                     const { amount, additionalProperty } = checkResult2movieTicket(movieTicket, params.checkResult);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType), transaction.transactionNumber);
-                    return Object.assign(Object.assign({ identifier: movieTicket.identifier, additionalProperty }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? { serviceOutput: reservation4invoice }
-                        : undefined);
+                    return {
+                        identifier: movieTicket.identifier,
+                        additionalProperty, // add additionalProperty(2024-12-13~)
+                        // 計上金額を追加(2023-05-17~)
+                        ...(typeof amount?.value === 'number') ? { amount } : undefined,
+                        ...(typeof reservation4invoice.priceSpecification?.typeOf === 'string')
+                            ? { serviceOutput: reservation4invoice }
+                            : undefined
+                    };
                 });
             }
             break;
@@ -38,20 +43,19 @@ function createPayObjectServiceOutput(params) {
 function checkResult2movieTicket(
 // transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'object'>,
 movieTicket, checkResult) {
-    var _a, _b;
     const additionalProperty = [];
     let amount;
     // accountsReceivablesByServiceTypeへの依存をactionRecipeへ移行(2024-12-16~)
-    const purchaseNumberInfo = (_a = checkResult === null || checkResult === void 0 ? void 0 : checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find(({ knyknrNo }) => knyknrNo === movieTicket.identifier);
-    const ykknInfoOfServiceType = (_b = purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.ykknInfo) === null || _b === void 0 ? void 0 : _b.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
-    const kijUnip = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+    const purchaseNumberInfo = checkResult?.purchaseNumberAuthResult.knyknrNoInfoOut?.find(({ knyknrNo }) => knyknrNo === movieTicket.identifier);
+    const ykknInfoOfServiceType = purchaseNumberInfo?.ykknInfo?.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
+    const kijUnip = ykknInfoOfServiceType?.kijUnip;
     if (typeof kijUnip === 'string') {
         amount = {
             typeOf: 'MonetaryAmount',
             value: Number(kijUnip)
         };
     }
-    additionalProperty.push(...(typeof kijUnip === 'string') ? [{ name: 'kijUnip', value: kijUnip }] : [], ...(typeof (purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.dnshKmTyp) === 'string') ? [{ name: 'dnshKmTyp', value: purchaseNumberInfo.dnshKmTyp }] : []
+    additionalProperty.push(...(typeof kijUnip === 'string') ? [{ name: 'kijUnip', value: kijUnip }] : [], ...(typeof purchaseNumberInfo?.dnshKmTyp === 'string') ? [{ name: 'dnshKmTyp', value: purchaseNumberInfo.dnshKmTyp }] : []
     // ...(typeof purchaseNumberInfo?.znkkkytsknGkjknTyp === 'string')
     //     ? [{ name: 'znkkkytsknGkjknTyp', value: purchaseNumberInfo.znkkkytsknGkjknTyp }]
     //     : []
@@ -69,8 +73,7 @@ movieTicket, checkResult) {
     return { additionalProperty, amount };
 }
 function reservationPriceComponent2invoicePriceComponent(component) {
-    var _a;
-    const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
+    const accounting = (typeof component.accounting?.accountsReceivable === 'number')
         ? { accountsReceivable: component.accounting.accountsReceivable }
         : undefined;
     let minimizedUnitPriceSpec;
@@ -82,19 +85,33 @@ function reservationPriceComponent2invoicePriceComponent(component) {
                 return { typeOf: addOn.typeOf };
             })
             : undefined;
-        minimizedUnitPriceSpec = Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+        minimizedUnitPriceSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
+            referenceQuantity: component.referenceQuantity,
+            ...(Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined,
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     else if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification) {
-        minimizedMovieTicketTypeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price, 
+        minimizedMovieTicketTypeChargeSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
             // 適用決済方法区分を追加(2023-03-29~)
             appliesToMovieTicket: {
                 serviceOutput: {
                     typeOf: component.appliesToMovieTicket.serviceOutput.typeOf
                 }
-            } }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+            },
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     else {
-        minimizedCategoryCodeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+        minimizedCategoryCodeChargeSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     if (minimizedUnitPriceSpec !== undefined) {
         return minimizedUnitPriceSpec;
@@ -113,15 +130,13 @@ function reservationPriceComponent2invoicePriceComponent(component) {
  * 決済カードの対象予約情報を作成する
  */
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType, payTransactionNumber) {
-    var _a;
     // Orderから対象予約を取得
     const reservationOffer = order.acceptedOffersMovieTicketUsed.find(({ itemOffered, priceSpecification }) => {
-        var _a, _b;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
-        if ((priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.typeOf) === factory.priceSpecificationType.CompoundPriceSpecification) {
+        if (priceSpecification?.typeOf === factory.priceSpecificationType.CompoundPriceSpecification) {
             // 適用購入管理番号が一致、かつ、決済方法区分が一致、の単価仕様を検索
-            mvtkUnitPriceSpec = (_a = priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.priceComponent) === null || _a === void 0 ? void 0 : _a.find((p) => {
+            mvtkUnitPriceSpec = priceSpecification?.priceComponent?.find((p) => {
                 return p.typeOf === factory.priceSpecificationType.UnitPriceSpecification
                     && Array.isArray(p.appliesToMovieTicket)
                     && p.appliesToMovieTicket.some((appliesToMovieTicket) => {
@@ -132,7 +147,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType,
         }
         let isMovieTicketServiceOutput = mvtkUnitPriceSpec !== undefined
             && itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
-            && ((_b = itemOffered.reservedTicket.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
+            && itemOffered.reservedTicket.ticketedSeat?.seatNumber === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
             && itemOffered.reservedTicket.ticketedSeat.seatSection === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection;
         // チケット識別子で照合(2024-04-17~)
         isMovieTicketServiceOutput = isMovieTicketServiceOutput
@@ -154,12 +169,16 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType,
     }
     const reservationNumber = reservationOffer.itemOffered.reservationNumber;
     let priceComponents4invoice = [];
-    const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+    const priceComponent = reservationOffer.priceSpecification?.priceComponent;
     if (Array.isArray(priceComponent)) {
         priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
     }
-    return Object.assign({ priceSpecification: {
+    return {
+        priceSpecification: {
             typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
             priceComponent: priceComponents4invoice
-        }, reservationNumber }, (typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+        },
+        reservationNumber, // add reservationNumber(2023-03-20~)
+        ...(typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined
+    };
 }