@chevre/domain 23.2.0-alpha.8 → 23.2.0

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

@@ -1,21 +1,34 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGMOInfoFromSeller = getGMOInfoFromSeller;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 function getGMOInfoFromSeller(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         if (params.requirePaymentAccepted) {
-            const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+            const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: params.seller.id },
                 codeValue: params.paymentMethodType
             });
@@ -24,7 +37,7 @@ function getGMOInfoFromSeller(params) {
             }
         }
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.paymentServiceProvider.search({
+        const paymentServices = await repos.paymentServiceProvider.search({
             limit: 1,
             page: 1,
             provider: { id: { $eq: params.seller.id } },
@@ -35,14 +48,14 @@ function getGMOInfoFromSeller(params) {
             throw new factory.errors.NotFound('PaymentService');
         }
         const provider = paymentService.provider;
-        const shopId = (_a = provider.credentials) === null || _a === void 0 ? void 0 : _a.shopId;
-        const shopPass = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.shopPass;
+        const shopId = provider.credentials?.shopId;
+        const shopPass = provider.credentials?.shopPass;
         if (typeof shopId !== 'string' || typeof shopPass !== 'string') {
             throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
         }
-        const returnUrls3dsSetting = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.returnUrls3ds;
+        const returnUrls3dsSetting = provider.credentials?.returnUrls3ds;
         const returnUrls3ds = (Array.isArray(returnUrls3dsSetting)) ? returnUrls3dsSetting : [];
-        const callbackType3ds = (_d = provider.credentials) === null || _d === void 0 ? void 0 : _d.callbackType3ds;
+        const callbackType3ds = provider.credentials?.callbackType3ds;
         return { shopId, shopPass, returnUrls3ds, callbackType3ds };
-    });
+    };
 }

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

@@ -1,17 +1,31 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payCreditCard = payCreditCard;
-const GMO = require("@motionpicture/gmo-service");
-const factory = require("../../../factory");
+const GMO = __importStar(require("@motionpicture/gmo-service"));
+const factory = __importStar(require("../../../factory"));
 const onPayActionCompleted_1 = require("../any/onPayActionCompleted");
 const factory_1 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
@@ -19,8 +33,7 @@ const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
  * クレジットカード決済
  */
 function payCreditCard(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos, settings) => {
         const payObject = params.object;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payObject[0].paymentMethod.typeOf;
@@ -28,21 +41,21 @@ function payCreditCard(params) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         const paymentServiceId = payObject[0].id;
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: params.project,
             // typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
+        const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
         const requirePaymentAccepted = false;
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted
         })(repos);
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
         let recipe;
@@ -51,8 +64,8 @@ function payCreditCard(params) {
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: settings.gmo.useFetch
             }, { timeout: settings.gmo.timeout });
-            yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
-                const processAlterTranResult = yield processAlterTran({
+            await Promise.all(payObject.map(async (paymentMethod) => {
+                const processAlterTranResult = await processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod
                 })({ creditService });
                 processAlterTranResults.push(processAlterTranResult);
@@ -65,7 +78,7 @@ function payCreditCard(params) {
                     // 代行決済連携中にエラーがあればそのままthrow
                     throw processAlterTranResult.processAlterTranError;
                 }
-            })));
+            }));
             // add recipe(2024-06-03~)
             recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
         }
@@ -73,7 +86,7 @@ function payCreditCard(params) {
             try {
                 // add recipe(2024-06-29~)
                 recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -83,8 +96,8 @@ function payCreditCard(params) {
         const actionResult = {
         // creditCardSales: alterTranResults // discontinue(2024-06-10~)
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
-        yield (0, onPayActionCompleted_1.onPayActionCompleted)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -94,11 +107,10 @@ function payCreditCard(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function processAlterTran(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+    return async (repos) => {
         let searchTradeArgs;
         let searchTradeResult;
         let alterTranArgs;
@@ -111,12 +123,12 @@ function processAlterTran(params) {
             // 取引状態参照
             searchTradeArgs = {
                 shopId, shopPass, orderId,
-                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);
             const { accessId, accessPass, forward, approve, tranId, jobCd } = searchTradeResult;
-            const amount = (_c = paymentMethod.paymentMethod.totalPaymentDue) === null || _c === void 0 ? void 0 : _c.value;
+            const amount = paymentMethod.paymentMethod.totalPaymentDue?.value;
             if (typeof amount !== 'number') {
                 throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
             }
@@ -132,11 +144,11 @@ function processAlterTran(params) {
                         shopId, shopPass, accessId, accessPass,
                         jobCd: GMO.utils.util.JobCd.Capture,
                         amount, // 手数料を指定
-                        siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                        sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
+                        siteId: params.availableChannel.credentials?.siteId,
+                        sitePass: params.availableChannel.credentials?.sitePass,
                         method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
                     };
-                    alterTranResult = yield repos.creditService.alterTran(alterTranArgs);
+                    alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
                 case GMO.utils.util.JobCd.Auth:
                     alterTranArgs = {
@@ -144,10 +156,10 @@ function processAlterTran(params) {
                         accessId, accessPass,
                         jobCd: GMO.utils.util.JobCd.Sales,
                         amount: amount,
-                        siteId: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
-                        sitePass: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
+                        siteId: params.availableChannel.credentials?.siteId,
+                        sitePass: params.availableChannel.credentials?.sitePass
                     };
-                    alterTranResult = yield repos.creditService.alterTran(alterTranArgs);
+                    alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
                 default:
                     throw new factory.errors.NotImplemented(`jobCd '${jobCd}' not implemented`);
@@ -156,6 +168,12 @@ function processAlterTran(params) {
         catch (error) {
             processAlterTranError = error;
         }
-        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined), (searchTradeResult !== undefined) ? { searchTradeResult } : undefined), (alterTranArgs !== undefined) ? { alterTranArgs } : undefined), (alterTranResult !== undefined) ? { alterTranResult } : undefined), (processAlterTranError !== undefined) ? { processAlterTranError } : undefined);
-    });
+        return {
+            ...(searchTradeArgs !== undefined) ? { searchTradeArgs } : undefined,
+            ...(searchTradeResult !== undefined) ? { searchTradeResult } : undefined,
+            ...(alterTranArgs !== undefined) ? { alterTranArgs } : undefined,
+            ...(alterTranResult !== undefined) ? { alterTranResult } : undefined,
+            ...(processAlterTranError !== undefined) ? { processAlterTranError } : undefined
+        };
+    };
 }

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

@@ -1,28 +1,31 @@
 "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;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundCreditCard = refundCreditCard;
-const GMO = require("@motionpicture/gmo-service");
-const factory = require("../../../factory");
+const GMO = __importStar(require("@motionpicture/gmo-service"));
+const factory = __importStar(require("../../../factory"));
 const onRefundActionCompletedOrFailed_1 = require("../any/onRefundActionCompletedOrFailed");
 const factory_1 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
@@ -30,18 +33,16 @@ const gmoError_1 = require("./gmoError");
 /**
  * refund CreditCard IF payment
  */
-// tslint:disable-next-line:max-func-body-length
 function refundCreditCard(params
 // options: { // discontinue(2025-02-20~)
 //     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 +53,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 +84,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 +106,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 +118,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 +128,10 @@ 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 +144,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 +180,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 +213,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 +250,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,60 +1,71 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = searchGMOTrade;
-const GMO = require("@motionpicture/gmo-service");
-const factory = require("../../../factory");
+const GMO = __importStar(require("@motionpicture/gmo-service"));
+const factory = __importStar(require("../../../factory"));
 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;
 }