@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

package/lib/chevre/service/transaction/moneyTransfer/potentialActions.js

@@ -1,25 +1,38 @@
 "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.createPotentialActions = createPotentialActions;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 function createMoneyTransferActions(params) {
     const moneyTransferActions = [];
     const authorizeMoneyTransferActions = params.authorizeActions
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
-        .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
+        .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
     authorizeMoneyTransferActions.forEach((a) => {
-        var _a;
         const actionResult = a.result;
-        const pendingTransaction = (_a = a.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction;
+        const pendingTransaction = a.object.itemOffered.object?.pendingTransaction;
         if (actionResult !== undefined && pendingTransaction !== undefined) {
             moneyTransferActions.push({
                 project: params.transaction.project,
@@ -39,16 +52,14 @@ function createMoneyTransferActions(params) {
 /**
  * 取引のポストアクションを作成する
  */
-function createPotentialActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 通貨転送アクション属性作成
-        const moneyTransferActionAttributesList = createMoneyTransferActions(params);
-        // まずは1転送アクションのみ対応
-        if (moneyTransferActionAttributesList.length !== 1) {
-            throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
-        }
-        return {
-            moneyTransfer: moneyTransferActionAttributesList
-        };
-    });
+async function createPotentialActions(params) {
+    // 通貨転送アクション属性作成
+    const moneyTransferActionAttributesList = createMoneyTransferActions(params);
+    // まずは1転送アクションのみ対応
+    if (moneyTransferActionAttributesList.length !== 1) {
+        throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
+    }
+    return {
+        moneyTransfer: moneyTransferActionAttributesList
+    };
 }

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -1,12 +1,29 @@
 "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.start = start;
@@ -15,26 +32,26 @@ exports.exportTasksById = exportTasksById;
 /**
  * 通貨転送取引サービス
  */
-const moment = require("moment");
-const factory = require("../../factory");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../../factory"));
 const order_1 = require("../../factory/order");
 // import { Settings } from '../../settings';
 const factory_1 = require("./moneyTransfer/exportTasks/factory");
 const factory_2 = require("./moneyTransfer/factory");
 const potentialActions_1 = require("./moneyTransfer/potentialActions");
-const MoneyTransferAssetTransactionService = require("../assetTransaction/moneyTransfer");
+const MoneyTransferAssetTransactionService = __importStar(require("../assetTransaction/moneyTransfer"));
 /**
  * 取引開始
  * 通貨転送資産取引サービスを利用して転送取引を開始する
  */
 function start(params) {
-    return (repos
+    return async (repos
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
-        const sellers = yield repos.seller.projectFields({
+    ) => {
+        const { passport } = await repos.passport.validatePassportTokenIfExist(params);
+        const sellers = await repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }
@@ -49,45 +66,58 @@ function start(params) {
             throw new factory.errors.ArgumentNull('amount.value');
         }
         // fromとtoをfix
-        const fromLocation = yield fixFromLocation(params)(repos);
-        const toLocation = yield fixToLocation(params)(repos);
+        const fromLocation = await fixFromLocation(params)(repos);
+        const toLocation = await fixToLocation(params)(repos);
         // まず取引番号発行
-        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+        const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
         // 取引開始
         const startParams = (0, factory_2.createStartParams)(params, passport, seller, amount, fromLocation, toLocation, transactionNumber);
         let transaction;
         try {
-            transaction = yield repos.transaction.start(startParams);
-            yield authorizePaymentCard({
-                transaction: Object.assign(Object.assign({}, transaction), { object: startParams.object, seller: startParams.seller, agent: startParams.agent, project: startParams.project, typeOf: startParams.typeOf })
+            transaction = await repos.transaction.start(startParams);
+            await authorizePaymentCard({
+                transaction: {
+                    ...transaction,
+                    object: startParams.object,
+                    seller: startParams.seller,
+                    agent: startParams.agent,
+                    project: startParams.project,
+                    typeOf: startParams.typeOf
+                }
             })(repos);
         }
         catch (error) {
             throw error;
         }
         return transaction;
-    });
+    };
 }
 function authorizePaymentCard(params) {
-    return (repos
+    return async (repos
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         const transaction = params.transaction;
         const fromLocation = transaction.object.fromLocation;
         if (typeof transaction.object.toLocation.typeOf === 'string') {
             const toLocation = transaction.object.toLocation;
             // 転送取引
-            yield processAuthorizePaymentCard({
+            await processAuthorizePaymentCard({
                 project: { id: transaction.project.id },
                 agent: { id: transaction.agent.id },
-                object: Object.assign({ project: { typeOf: transaction.project.typeOf, id: transaction.project.id }, typeOf: factory.offerType.AggregateOffer, itemOffered: {
+                object: {
+                    project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
+                    typeOf: factory.offerType.AggregateOffer,
+                    itemOffered: {
                         typeOf: factory.actionType.MoneyTransfer,
-                        amount: Object.assign({ typeOf: 'MonetaryAmount', currency: transaction.object.amount.currency }, (typeof transaction.object.amount.value === 'number')
-                            ? { value: transaction.object.amount.value }
-                            : undefined),
+                        amount: {
+                            typeOf: 'MonetaryAmount',
+                            currency: transaction.object.amount.currency,
+                            ...(typeof transaction.object.amount.value === 'number')
+                                ? { value: transaction.object.amount.value }
+                                : undefined
+                        },
                         toLocation: toLocation,
                         object: {
                             pendingTransaction: {
@@ -96,24 +126,29 @@ function authorizePaymentCard(params) {
                                 transactionNumber: ''
                             }
                         }
-                    }, fromLocation: fromLocation, seller: {
+                    },
+                    fromLocation: fromLocation,
+                    seller: {
                         id: transaction.seller.id,
                         typeOf: transaction.seller.typeOf,
                         name: (typeof transaction.seller.name === 'string')
                             ? transaction.seller.name
-                            : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
-                    }, price: 0, priceCurrency: factory.priceCurrency.JPY }, (typeof transaction.object.description === 'string') ? { description: transaction.object.description } : undefined),
+                            : String(transaction.seller.name?.ja)
+                    },
+                    price: 0,
+                    priceCurrency: factory.priceCurrency.JPY,
+                    ...(typeof transaction.object.description === 'string') ? { description: transaction.object.description } : undefined
+                },
                 purpose: { typeOf: transaction.typeOf, id: transaction.id }
             })(repos);
         }
         else {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
         }
-    });
+    };
 }
 function fixFromLocation(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (__) => {
         let fromLocation = params.object.fromLocation;
         if (typeof fromLocation === 'string') {
             // no op
@@ -125,7 +160,7 @@ function fixFromLocation(params) {
                 // ↓chevre/api側での制御に変更したので不要(2022-03-24~)
                 // ↓指定しないとPermitのチェックが実行される(注文口座にはPermitが存在しない)
                 // hasNoPermit: fromLocation.hasNoPermit,
-                issuedThrough: { id: (_a = fromLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id }
+                issuedThrough: { id: fromLocation.issuedThrough?.id }
             };
         }
         else if (fromLocation.typeOf === factory.order.OrderType.Order) {
@@ -140,17 +175,16 @@ function fixFromLocation(params) {
             throw new factory.errors.Argument('fromLocation', 'location type must be specified');
         }
         return fromLocation;
-    });
+    };
 }
 function fixToLocation(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (__) => {
         let toLocation = params.object.toLocation;
         if (typeof toLocation.typeOf === 'string') {
             toLocation = {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: toLocation.identifier,
-                issuedThrough: { id: (_a = toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id }
+                issuedThrough: { id: toLocation.issuedThrough?.id }
             };
         }
         else {
@@ -162,20 +196,19 @@ function fixToLocation(params) {
             // };
         }
         return toLocation;
-    });
+    };
 }
 /**
  * 口座残高差し押さえ
  * 口座取引は、出金取引あるいは転送取引のどちらかを選択できます
  */
 function processAuthorizePaymentCard(params) {
-    return (repos
+    return async (repos
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+    ) => {
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.purpose.id
         }, ['agent', 'project', 'recipient', 'seller', 'typeOf', 'object']);
@@ -186,7 +219,7 @@ function processAuthorizePaymentCard(params) {
                 ? transaction.recipient.name
                 : `A recipient of ${transaction.typeOf} Transaction ${transaction.id}`
         };
-        const transactionNumber = (_a = transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+        const transactionNumber = transaction.object.pendingTransaction?.transactionNumber;
         // ↓事前に取引番号を発行しているので、ありえないフロー
         if (typeof transactionNumber !== 'string') {
             throw new factory.errors.Internal('transaction.object.pendingTransaction.transactionNumber undefined');
@@ -198,11 +231,11 @@ function processAuthorizePaymentCard(params) {
             transaction,
             transactionNumber
         });
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         // 口座取引開始
         let responseBody;
         try {
-            responseBody = yield processMoneyTransferTransaction({
+            responseBody = await processMoneyTransferTransaction({
                 project: params.project,
                 object: params.object,
                 recipient: recipient,
@@ -210,7 +243,7 @@ function processAuthorizePaymentCard(params) {
                 transactionNumber
             })(repos);
             // アクションにchevre取引情報を保管
-            yield repos.action.findByIdAndUpdate({
+            await repos.action.findByIdAndUpdate({
                 id: action.id,
                 update: {
                     'object.itemOffered.amount.currency': params.object.itemOffered.amount.currency,
@@ -224,7 +257,7 @@ function processAuthorizePaymentCard(params) {
         }
         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
@@ -238,11 +271,10 @@ function processAuthorizePaymentCard(params) {
             responseBody: responseBody
             // acceptedOffers: [] // PlaceOrderではないのでacceptedOffersとしては空 // discontinue(2024-06-17~)
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+    };
 }
 function createAuthorizeMoneyTransferOfferActionAttributes(params) {
-    var _a;
     const transaction = params.transaction;
     const transactionNumber = params.transactionNumber;
     const recipient = params.recipient;
@@ -258,9 +290,13 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
             typeOf: factory.offerType.Offer,
             itemOffered: {
                 typeOf: factory.actionType.MoneyTransfer,
-                amount: Object.assign({ typeOf: 'MonetaryAmount', currency: params.object.itemOffered.amount.currency }, (typeof params.object.itemOffered.amount.value === 'number')
-                    ? { value: params.object.itemOffered.amount.value }
-                    : undefined),
+                amount: {
+                    typeOf: 'MonetaryAmount',
+                    currency: params.object.itemOffered.amount.currency,
+                    ...(typeof params.object.itemOffered.amount.value === 'number')
+                        ? { value: params.object.itemOffered.amount.value }
+                        : undefined
+                },
                 toLocation: params.object.itemOffered.toLocation,
                 object: {
                     pendingTransaction: {
@@ -273,7 +309,7 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
                 id: String(transaction.seller.id),
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja),
+                    : String(transaction.seller.name?.ja),
                 typeOf: transaction.seller.typeOf
             },
             price: 0,
@@ -288,20 +324,18 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
     };
 }
 function processMoneyTransferTransaction(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    ) => {
         let pendingTransaction;
         const transaction = params.transaction;
         // Sellerに変更(2022-05-30~)
         const agent = {
             typeOf: transaction.seller.typeOf,
             id: String(transaction.seller.id),
-            name: (typeof transaction.seller.name === 'string') ? transaction.seller.name : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+            name: (typeof transaction.seller.name === 'string') ? transaction.seller.name : String(transaction.seller.name?.ja)
         };
         const recipient = {
             typeOf: params.recipient.typeOf,
@@ -312,7 +346,7 @@ function processMoneyTransferTransaction(params) {
         };
         const description = (typeof params.object.description === 'string') ? params.object.description : `${transaction.typeOf}:${transaction.id}`;
         // 最大1ヵ月のオーソリ
-        const expires = moment()
+        const expires = (0, moment_1.default)()
             .add(1, 'month')
             .toDate();
         // 発行サービスIDはfromLocationあるいはtoLocationのどちらかに存在するはず
@@ -321,14 +355,21 @@ function processMoneyTransferTransaction(params) {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
         }
         else if (params.object.fromLocation !== undefined && params.object.itemOffered.toLocation !== undefined) {
-            const { fromLocation } = yield validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos);
-            const { toLocation } = yield validateToLocation({ id: params.project.id }, {
+            const { fromLocation } = await validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos);
+            const { toLocation } = await validateToLocation({ id: params.project.id }, {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: params.object.itemOffered.toLocation.identifier,
                 issuedThrough: { id: issuedThroughId }
             }, { id: issuedThroughId })(repos);
             // moneyTransferAssetTransactionで実装
-            pendingTransaction = yield MoneyTransferAssetTransactionService.start(Object.assign({ transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.MoneyTransfer, project: { typeOf: factory.organizationType.Project, id: params.project.id }, agent: agent, expires: expires, recipient: recipient, object: {
+            pendingTransaction = await MoneyTransferAssetTransactionService.start({
+                transactionNumber: params.transactionNumber,
+                typeOf: factory.assetTransactionType.MoneyTransfer,
+                project: { typeOf: factory.organizationType.Project, id: params.project.id },
+                agent: agent,
+                expires: expires,
+                recipient: recipient,
+                object: {
                     amount: {
                         typeOf: 'MonetaryAmount',
                         value: (typeof params.object.itemOffered.amount.value === 'number') ? params.object.itemOffered.amount.value : 0,
@@ -342,10 +383,13 @@ function processMoneyTransferTransaction(params) {
                         transactionNumber: params.transactionNumber
                     },
                     force: false
-                } }, (transaction.typeOf === factory.transactionType.MoneyTransfer
-                && typeof ((_b = transaction.object.pendingTransaction) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
-                ? { identifier: transaction.object.pendingTransaction.identifier }
-                : undefined))(repos);
+                },
+                // ユニークネスを保証するために識別子を指定する
+                ...(transaction.typeOf === factory.transactionType.MoneyTransfer
+                    && typeof transaction.object.pendingTransaction?.identifier === 'string')
+                    ? { identifier: transaction.object.pendingTransaction.identifier }
+                    : undefined
+            })(repos);
             // pendingTransaction = await repos.moneyTransferAssetTransaction.start({
             //     // 既発行のtransactionNumberを引き継ぐ(2022-05-16~)
             //     transactionNumber: params.transactionNumber,
@@ -383,16 +427,14 @@ function processMoneyTransferTransaction(params) {
             throw new factory.errors.Argument('Object', 'At least one of accounts from and to must be specified');
         }
         return pendingTransaction;
-    });
+    };
 }
-// tslint:disable-next-line:max-func-body-length
 function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
-    return (repos
+    return async (repos
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    ) => {
         let fromLocation = fromLocationBeforeStart;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof fromLocation === 'string') {
@@ -427,7 +469,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
             if (fromLocation.typeOf === factory.order.OrderType.Order) {
                 fromLocation = fromLocation;
                 // 注文検索
-                const orders = yield repos.order.projectFields({
+                const orders = await repos.order.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: project.id } },
@@ -445,7 +487,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     throw new factory.errors.Argument('fromLocation', `Invalid order status '${order.orderStatus}''`);
                 }
                 let awardAccounts = [];
-                const awardAccounsValue = (_b = (_a = order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
+                const awardAccounsValue = order.identifier?.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)?.value;
                 if (typeof awardAccounsValue === 'string' && awardAccounsValue.length > 0) {
                     awardAccounts = JSON.parse(awardAccounsValue);
                 }
@@ -463,15 +505,17 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 };
             }
             else if (fromLocation.typeOf === factory.permit.PermitType.Permit) {
-                fromLocation = Object.assign(Object.assign({}, fromLocation), { hasNoPermit: false });
+                fromLocation = {
+                    ...fromLocation,
+                    hasNoPermit: false
+                };
             }
         }
         return { fromLocation };
-    });
+    };
 }
 function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         let toLocation = toLocationBeforeStart;
         if (typeof toLocation === 'string') {
             throw new factory.errors.Argument('toLocation', 'string not permitted');
@@ -481,7 +525,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
             if (toLocation.typeOf === factory.order.OrderType.Order) {
                 toLocation = toLocation;
                 // 注文検索
-                const orders = yield repos.order.projectFields({
+                const orders = await repos.order.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: project.id } },
@@ -497,7 +541,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                     throw new factory.errors.NotFound('Order');
                 }
                 let awardAccounts = [];
-                const awardAccounsValue = (_b = (_a = order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
+                const awardAccounsValue = order.identifier?.find((i) => i.name === order_1.AWARD_ACCOUNTS_IDENTIFIER_NAME)?.value;
                 if (typeof awardAccounsValue === 'string' && awardAccounsValue.length > 0) {
                     awardAccounts = JSON.parse(awardAccounsValue);
                 }
@@ -515,19 +559,22 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                 };
             }
             else if (toLocation.typeOf === factory.permit.PermitType.Permit) {
-                toLocation = Object.assign(Object.assign({}, toLocation), { hasNoPermit: false });
+                toLocation = {
+                    ...toLocation,
+                    hasNoPermit: false
+                };
             }
         }
         return { toLocation };
-    });
+    };
 }
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
-        const transaction = yield repos.transaction.projectFieldsById({
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['typeOf', 'status', 'project']);
@@ -545,24 +592,24 @@ function confirm(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         // 取引に対する全ての承認アクションをマージ
-        const authorizeActions = yield searchAuthorizeActions({
+        const authorizeActions = await searchAuthorizeActions({
             transaction: transaction,
             now: now
         })(repos);
         // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({ authorizeActions, transaction });
+        const potentialActions = await (0, potentialActions_1.createPotentialActions)({ authorizeActions, transaction });
         // 取引確定
-        yield repos.transaction.confirm({
+        await repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
             result: {},
             potentialActions: potentialActions
         });
-    });
+    };
 }
 function searchAuthorizeActions(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let authorizeActions = yield repos.action.searchByPurpose({
+    return async (repos) => {
+        let authorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.transaction.typeOf,
@@ -573,38 +620,38 @@ function searchAuthorizeActions(params) {
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
-            return (a.endDate instanceof Date) && moment(a.endDate)
-                .isBefore(moment(params.now));
+            return (a.endDate instanceof Date) && (0, moment_1.default)(a.endDate)
+                .isBefore((0, moment_1.default)(params.now));
         });
         return authorizeActions;
-    });
+    };
 }
 /**
  * 取引のタスク出力
  */
 function exportTasksById(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.projectFieldsById({
+    ) => {
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['endDate', 'status', 'project', 'startDate', 'typeOf', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
-            taskRunsAt = moment(taskRunsAt)
+            taskRunsAt = (0, moment_1.default)(taskRunsAt)
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
         // search settings
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt
         }, setting
         // settings
         );
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+    };
 }