@chevre/domain 23.2.0-alpha.8 → 23.2.0

package/lib/chevre/service/task/pay.js

@@ -1,16 +1,30 @@
 "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.call = call;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
@@ -29,24 +43,25 @@ const payByTask_1 = require("./payment/payByTask");
  * タスク実行関数
  */
 function call(params) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient, settings }) {
-        var _b;
+    return async ({ connection, redisClient, settings }) => {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         let payActionAttributes;
-        payActionAttributes = yield (0, payByTask_1.payTask2payActionAttributes)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
-         }))({
+        payActionAttributes = await (0, payByTask_1.payTask2payActionAttributes)({
+            ...params.data,
+            sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+        })({
             action: new action_1.ActionRepo(connection),
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection)
         });
-        const paymentServiceId = (_b = payActionAttributes.object.at(0)) === null || _b === void 0 ? void 0 : _b.id;
+        const paymentServiceId = payActionAttributes.object.at(0)?.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
-        yield (0, payByTask_1.payByTask)(
+        await (0, payByTask_1.payByTask)(
         // {
         //     ...params.data,
         //     sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
@@ -69,5 +84,5 @@ function call(params) {
             project: new project_1.ProjectRepo(connection),
             task: new task_1.TaskRepo(connection)
         }, settings);
-    });
+    };
 }

package/lib/chevre/service/task/payment/invalidatePaymentUrlByTask.js

@@ -1,33 +1,46 @@
 "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.invalidatePaymentUrlByTask = invalidatePaymentUrlByTask;
-const factory = require("../../../factory");
-const CreditCardPayment = require("../../payment/creditCard");
+const factory = __importStar(require("../../../factory"));
+const CreditCardPayment = __importStar(require("../../payment/creditCard"));
 /**
  * 決済ロケーションを無効化する
  * 実質、外部で実行された決済に対する返金処理
  */
 function invalidatePaymentUrlByTask(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+    return async (repos, settings) => {
+        const paymentServiceType = params.object[0]?.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPayment.refundCreditCard(params
+                await CreditCardPayment.refundCreditCard(params
                 // { requirePayAction: false }
                 )(repos, settings);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-    });
+    };
 }

package/lib/chevre/service/task/payment/payByTask.js

@@ -1,30 +1,46 @@
 "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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payByTask = payByTask;
 exports.payTask2payActionAttributes = payTask2payActionAttributes;
-const createDebug = require("debug");
-const factory = require("../../../factory");
-const CreditCardPaymentService = require("../../payment/creditCard");
-const FaceToFacePaymentService = require("../../payment/faceToFace");
+const debug_1 = __importDefault(require("debug"));
+const factory = __importStar(require("../../../factory"));
+const CreditCardPaymentService = __importStar(require("../../payment/creditCard"));
+const FaceToFacePaymentService = __importStar(require("../../payment/faceToFace"));
 const factory_1 = require("../../payment/factory");
-const MovieTicketPaymentService = require("../../payment/movieTicket");
-const PaymentCardPaymentService = require("../../payment/paymentCard");
-const debug = createDebug('chevre-domain:service:payment');
+const MovieTicketPaymentService = __importStar(require("../../payment/movieTicket"));
+const PaymentCardPaymentService = __importStar(require("../../payment/paymentCard"));
+const debug = (0, debug_1.default)('chevre-domain:service:payment');
 function fixOrderAsPurpose(params, transaction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const payPurposeConfirmationNumber = params.potentialActions.pay.purpose.confirmationNumber;
-        const payPurposeOrderNumber = (_a = params.potentialActions.pay.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-        const ordersWithoutAcceptedOffers = yield repos.order.projectFields({
+        const payPurposeOrderNumber = params.potentialActions.pay.purpose?.orderNumber;
+        const ordersWithoutAcceptedOffers = await repos.order.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: transaction.project.id } },
@@ -41,7 +57,7 @@ function fixOrderAsPurpose(params, transaction) {
         if (Array.isArray(movieTickets) && movieTickets.length > 0) {
             const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
             const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
-            acceptedOffersMovieTicketUsed = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            acceptedOffersMovieTicketUsed = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                 orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
@@ -52,18 +68,20 @@ function fixOrderAsPurpose(params, transaction) {
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
                     }
                 }
-            }, ['itemOffered', 'priceSpecification']));
+            }, ['itemOffered', 'priceSpecification']);
         }
-        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffersMovieTicketUsed });
-    });
+        return {
+            ...orderWithoutAcceptedOffers,
+            acceptedOffersMovieTicketUsed
+        };
+    };
 }
 function payTask2payActionAttributes(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos) => {
         const { object, potentialActions, purpose, typeOf, instrument } = params;
         if (typeOf === factory.actionType.PayAction) {
             // 返金手数料決済の場合
-            const order = (yield repos.order.projectFields({
+            const order = (await repos.order.projectFields({
                 limit: 1,
                 page: 1,
                 orderNumbers: [params.purpose.object.orderNumber]
@@ -71,13 +89,27 @@ function payTask2payActionAttributes(params) {
             if (order === undefined) {
                 throw new factory.errors.NotFound(factory.order.OrderType.Order);
             }
-            return Object.assign(Object.assign({ object, purpose, typeOf: factory.actionType.PayAction, agent: { id: order.project.id, typeOf: factory.organizationType.Project }, project: { id: order.project.id, typeOf: factory.organizationType.Project }, recipient: Object.assign({ id: order.seller.id, typeOf: order.seller.typeOf }, (typeof order.seller.name === 'string') ? { name: order.seller.name } : undefined), instrument: (Array.isArray(instrument)) ? instrument : [] }, (potentialActions !== undefined) ? { potentialActions } : undefined), (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: params.sameAs } : undefined);
+            return {
+                object, purpose,
+                typeOf: factory.actionType.PayAction,
+                agent: { id: order.project.id, typeOf: factory.organizationType.Project },
+                project: { id: order.project.id, typeOf: factory.organizationType.Project },
+                recipient: {
+                    id: order.seller.id,
+                    typeOf: order.seller.typeOf,
+                    ...(typeof order.seller.name === 'string') ? { name: order.seller.name } : undefined
+                },
+                instrument: (Array.isArray(instrument)) ? instrument : [], // add(2025-02-19~)
+                // 返品手数料決済アクションのinstrumentはなし
+                ...(potentialActions !== undefined) ? { potentialActions } : undefined,
+                ...(typeof params.sameAs?.id === 'string') ? { sameAs: params.sameAs } : undefined
+            };
         }
         else {
             // 最適化されたタスクに対応(2024-01-19~)
             let transaction;
             if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
-                transaction = yield repos.assetTransaction.findByTransactionNumber({
+                transaction = await repos.assetTransaction.findByTransactionNumber({
                     typeOf: factory.assetTransactionType.Pay,
                     transactionNumber: params.object.paymentMethod.paymentMethodId
                 });
@@ -88,16 +120,16 @@ function payTask2payActionAttributes(params) {
             else {
                 throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
             }
-            const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
+            const order = await fixOrderAsPurpose({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
             // 認証アクションのactionRecipeを検索(2024-12-13~)
             let checkResult;
-            const checkedActionId = (_b = transaction.object.checkedAction) === null || _b === void 0 ? void 0 : _b.id;
+            const checkedActionId = transaction.object.checkedAction?.id;
             if (typeof checkedActionId === 'string' && checkedActionId !== '') {
-                const recipe = yield repos.action.findRecipeByAction({
+                const recipe = await repos.action.findRecipeByAction({
                     project: { id: transaction.project.id },
                     recipeFor: { id: checkedActionId }
                 });
-                const directionPurchaseNumberAuth = (_d = (_c = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[0];
+                const directionPurchaseNumberAuth = recipe?.step[0]?.itemListElement[0]?.itemListElement[0];
                 if (directionPurchaseNumberAuth !== undefined) {
                     const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
                     if (beforeMedia !== undefined && afterMedia !== undefined) {
@@ -112,9 +144,12 @@ function payTask2payActionAttributes(params) {
                 order,
                 checkResult
             });
-            return Object.assign(Object.assign({}, payOrderAction), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string') ? { sameAs: params.sameAs } : undefined);
+            return {
+                ...payOrderAction,
+                ...(typeof params.sameAs?.id === 'string') ? { sameAs: params.sameAs } : undefined
+            };
         }
-    });
+    };
 }
 /**
  * 決済確定
@@ -130,29 +165,31 @@ function payByTask(
 //     };
 // }
 payActionAttributes) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+    return async (repos, settings) => {
+        const paymentServiceType = payActionAttributes.object[0]?.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                yield FaceToFacePaymentService.payFaceToFace(payActionAttributes)(repos);
+                await FaceToFacePaymentService.payFaceToFace(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.payPaymentCard(payActionAttributes)(repos);
+                await PaymentCardPaymentService.payPaymentCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.payCreditCard(payActionAttributes)(repos, settings);
+                await CreditCardPaymentService.payCreditCard(payActionAttributes)(repos, settings);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 // check purpose(2025-02-12~)
                 const purpose = payActionAttributes.purpose;
-                if ((purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) !== factory.order.OrderType.Order) {
-                    throw new factory.errors.NotImplemented(`${purpose === null || purpose === void 0 ? void 0 : purpose.typeOf} not implemented`);
+                if (purpose?.typeOf !== factory.order.OrderType.Order) {
+                    throw new factory.errors.NotImplemented(`${purpose?.typeOf} not implemented`);
                 }
-                yield MovieTicketPaymentService.payMovieTicket(Object.assign(Object.assign({}, payActionAttributes), { purpose }), { callOnPayActionCompleted: true })(repos, settings);
+                await MovieTicketPaymentService.payMovieTicket({
+                    ...payActionAttributes,
+                    purpose
+                }, { callOnPayActionCompleted: true })(repos, settings);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-    });
+    };
 }

package/lib/chevre/service/task/payment/refundByTask.js

@@ -1,41 +1,54 @@
 "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.refundByTask = refundByTask;
-const factory = require("../../../factory");
-const CreditCardPaymentService = require("../../payment/creditCard");
-const FaceToFacePaymentService = require("../../payment/faceToFace");
-const MovieTicketPaymentService = require("../../payment/movieTicket");
-const PaymentCardPaymentService = require("../../payment/paymentCard");
+const factory = __importStar(require("../../../factory"));
+const CreditCardPaymentService = __importStar(require("../../payment/creditCard"));
+const FaceToFacePaymentService = __importStar(require("../../payment/faceToFace"));
+const MovieTicketPaymentService = __importStar(require("../../payment/movieTicket"));
+const PaymentCardPaymentService = __importStar(require("../../payment/paymentCard"));
 function refundByTask(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+    return async (repos, settings) => {
+        const paymentServiceType = params.object[0]?.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                yield FaceToFacePaymentService.refundFaceToFace(params)(repos);
+                await FaceToFacePaymentService.refundFaceToFace(params)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.refundPaymentCard(params)(repos);
+                await PaymentCardPaymentService.refundPaymentCard(params)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.refundCreditCard(params
+                await CreditCardPaymentService.refundCreditCard(params
                 // { requirePayAction: true }
                 )(repos, settings);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                yield MovieTicketPaymentService.refundMovieTicket(params, { callOnPayActionCompleted: true })(repos, settings);
+                await MovieTicketPaymentService.refundMovieTicket(params, { callOnPayActionCompleted: true })(repos, settings);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-    });
+    };
 }

package/lib/chevre/service/task/payment/voidPaymentByTask.js

@@ -1,38 +1,52 @@
 "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.voidPaymentByTask = voidPaymentByTask;
-const factory = require("../../../factory");
-const CreditCardPaymentService = require("../../payment/creditCard");
-const FaceToFacePaymentService = require("../../payment/faceToFace");
-const MovieTicketPaymentService = require("../../payment/movieTicket");
-const PaymentCardPaymentService = require("../../payment/paymentCard");
+const factory = __importStar(require("../../../factory"));
+const CreditCardPaymentService = __importStar(require("../../payment/creditCard"));
+const FaceToFacePaymentService = __importStar(require("../../payment/faceToFace"));
+const MovieTicketPaymentService = __importStar(require("../../payment/movieTicket"));
+const PaymentCardPaymentService = __importStar(require("../../payment/paymentCard"));
 function voidPaymentByTask(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         const paymentServiceType = params.object.object.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                yield FaceToFacePaymentService.voidTransaction(params)(repos);
+                await FaceToFacePaymentService.voidTransaction(params)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.voidTransaction(params)(repos);
+                await PaymentCardPaymentService.voidTransaction(params)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.voidTransaction(params)(repos, settings);
+                await CreditCardPaymentService.voidTransaction(params)(repos, settings);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                yield MovieTicketPaymentService.voidTransaction(params)(repos, settings);
+                await MovieTicketPaymentService.voidTransaction(params)(repos, settings);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
-    });
+    };
 }

package/lib/chevre/service/task/placeOrder.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.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
@@ -23,8 +14,11 @@ const placeOrder_1 = require("../order/placeOrder");
  * タスク実行関数
  */
 function call(data) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, settings }) {
-        yield (0, placeOrder_1.placeOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+    return async ({ connection, settings }) => {
+        await (0, placeOrder_1.placeOrder)({
+            ...data,
+            useOnOrderStatusChanged: true
+        })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
@@ -34,5 +28,5 @@ function call(data) {
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
         }, settings);
-    });
+    };
 }

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -1,16 +1,30 @@
 "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.call = call;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -31,7 +45,7 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return (_a, options_1) => __awaiter(this, [_a, options_1], void 0, function* ({ connection, redisClient, settings }, options) {
+    return async ({ connection, redisClient, settings }, options) => {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -42,7 +56,11 @@ function call(params) {
         const actionRepo = new action_1.ActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } }))({
+            await (0, any_1.publishPaymentUrl)({
+                ...params.data,
+                instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
+                sameAs: { id: params.id }
+            })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -62,12 +80,12 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (yield actionRepo.searchBySameAs({
+            const action = (await actionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
                 purpose: { id: { $eq: params.data.purpose.id } },
                 typeOf: { $eq: factory.actionType.AcceptAction }
             })).shift();
-            if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
+            if (typeof action?.id === 'string') {
                 throwsError = false;
             }
             if (throwsError) {
@@ -79,5 +97,5 @@ function call(params) {
             // 取引プロセスロック解除
             // await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
         }
-    });
+    };
 }