@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/service/account.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.open = open;
 exports.transferMoney = transferMoney;
@@ -21,7 +12,7 @@ const factory = require("../factory");
  * 口座を開設する
  */
 function open(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const openDate = new Date();
         return repos.account.open(params.map((p) => {
             return {
@@ -34,7 +25,7 @@ function open(params) {
                 openDate: openDate
             };
         }));
-    });
+    };
 }
 /**
  * 口座を解約する
@@ -59,22 +50,20 @@ function open(params) {
  * 確定取引結果から、実際の転送アクションを実行します。
  */
 function transferMoney(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const action = actionAttributes;
         let fromAccountNumber;
         let toAccountNumber;
         try {
             fromAccountNumber = (typeof action.fromLocation.accountNumber === 'string')
                 ? action.fromLocation.accountNumber
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
                 : undefined;
             toAccountNumber = (typeof action.toLocation.accountNumber === 'string')
                 ? action.toLocation.accountNumber
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
                 : undefined;
-            yield repos.account.settleTransaction({
+            await repos.account.settleTransaction({
                 fromAccountNumber: fromAccountNumber,
                 toAccountNumber: toAccountNumber,
                 amount: (typeof action.amount === 'number') ? action.amount : Number(action.amount.value),
@@ -84,18 +73,18 @@ function transferMoney(actionAttributes) {
         catch (error) {
             throw error;
         }
-    });
+    };
 }
 /**
  * 転送取消
  * 期限切れ、あるいは、中止された取引から、転送をアクションを取り消します。
  */
 function cancelMoneyTransfer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let fromAccountNumber;
         let toAccountNumber;
         // 取引存在確認
-        const transaction = yield repos.accountTransaction.findById({ typeOf: params.transaction.typeOf, id: params.transaction.id });
+        const transaction = await repos.accountTransaction.findById({ typeOf: params.transaction.typeOf, id: params.transaction.id });
         switch (params.transaction.typeOf) {
             case factory.account.transactionType.Deposit:
                 toAccountNumber =
@@ -109,13 +98,12 @@ function cancelMoneyTransfer(params) {
                 fromAccountNumber =
                     transaction.object.fromLocation.accountNumber;
                 toAccountNumber =
-                    // tslint:disable-next-line:max-line-length
                     transaction.object.toLocation.accountNumber;
                 break;
             default:
                 throw new factory.errors.Argument('typeOf', `transaction type ${params.transaction.typeOf} unknown`);
         }
-        yield repos.account.voidTransaction({
+        await repos.account.voidTransaction({
             fromAccountNumber: fromAccountNumber,
             toAccountNumber: toAccountNumber,
             amount: (typeof transaction.object.amount === 'number')
@@ -123,5 +111,5 @@ function cancelMoneyTransfer(params) {
                 : transaction.object.amount.value,
             transactionId: transaction.id
         });
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/deposit.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.start = start;
 /**
@@ -18,13 +9,18 @@ const factory = require("../../factory");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const account = yield repos.account.findByAccountNumber({
+        const account = await repos.account.findByAccountNumber({
             accountNumber: params.object.toLocation.accountNumber
         });
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Deposit, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Deposit,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 toLocation: {
                     typeOf: account.typeOf,
@@ -34,14 +30,17 @@ function start(params) {
                     name: account.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -54,11 +53,11 @@ function start(params) {
                 : params.object.amount.value
         };
         // 入金先口座に進行中取引を追加
-        yield repos.account.startTransaction({
+        await repos.account.startTransaction({
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/transfer.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.start = start;
 /**
@@ -18,21 +9,18 @@ const factory = require("../../factory");
  * 取引開始
  */
 function start(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const fromAccount = yield repos.account.findByAccountNumber({
+        const fromAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.fromLocation.accountNumber
         });
-        const toAccount = yield repos.account.findByAccountNumber({
+        const toAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.toLocation.accountNumber
         });
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore if */
         if (fromAccount.accountType !== toAccount.accountType) {
             throw new factory.errors.Argument('accountType', 'FromLocation accountType must be the same as ToLocation');
         }
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore if */
         if (fromAccount.accountNumber === toAccount.accountNumber) {
             throw new factory.errors.Argument('accountNumber', 'FromLocation accountNumber must be different from ToLocation');
@@ -42,7 +30,12 @@ function start(params) {
             throw new factory.errors.Argument('fromLocation', 'Insufficient balance');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Transfer, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Transfer,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
@@ -59,14 +52,17 @@ function start(params) {
                     name: toAccount.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -79,7 +75,7 @@ function start(params) {
                 : params.object.amount.value
         };
         // 残高確認
-        yield repos.account.authorizeAmount({
+        await repos.account.authorizeAmount({
             accountNumber: params.object.fromLocation.accountNumber,
             amount: (typeof params.object.amount === 'number')
                 ? params.object.amount
@@ -87,11 +83,11 @@ function start(params) {
             transaction: pendingTransaction
         });
         // 転送先口座に進行中取引を追加
-        yield repos.account.startTransaction({
+        await repos.account.startTransaction({
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction/withdraw.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.start = start;
 /**
@@ -18,9 +9,9 @@ const factory = require("../../factory");
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 口座存在確認
-        const fromAccount = yield repos.account.findByAccountNumber({
+        const fromAccount = await repos.account.findByAccountNumber({
             accountNumber: params.object.fromLocation.accountNumber
         });
         const forcibly = (params.object.force === true);
@@ -31,7 +22,12 @@ function start(params) {
             }
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Withdraw, agent: params.agent, recipient: params.recipient, object: {
+        const startParams = {
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Withdraw,
+            agent: params.agent,
+            recipient: params.recipient,
+            object: {
                 amount: params.object.amount,
                 fromLocation: {
                     typeOf: fromAccount.typeOf,
@@ -41,14 +37,17 @@ function start(params) {
                     name: fromAccount.name
                 },
                 description: params.object.description
-            }, expires: params.expires, 
+            },
+            expires: params.expires,
             // 必須化(2022-09-26~)
-            transactionNumber: params.transactionNumber }, (typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined);
+            transactionNumber: params.transactionNumber,
+            ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
+        };
         // 取引作成
         let transaction;
         try {
             // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = yield repos.accountTransaction.startByIdentifier(startParams);
+            transaction = await repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
             throw error;
@@ -61,7 +60,7 @@ function start(params) {
                 : params.object.amount.value
         };
         // 残高確保
-        yield repos.account.authorizeAmount({
+        await repos.account.authorizeAmount({
             accountNumber: params.object.fromLocation.accountNumber,
             amount: (typeof params.object.amount === 'number')
                 ? params.object.amount
@@ -71,5 +70,5 @@ function start(params) {
         });
         // 結果返却
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/accountTransaction.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.withdraw = exports.transfer = exports.deposit = void 0;
 exports.confirm = confirm;
@@ -23,24 +14,21 @@ const factory_1 = require("./accountTransaction/factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
-        // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof params.id === 'string') {
-            transaction = yield repos.accountTransaction.findById({ typeOf: params.typeOf, id: params.id });
+            transaction = await repos.accountTransaction.findById({ typeOf: params.typeOf, id: params.id });
         }
         else if (typeof params.transactionNumber === 'string') {
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore next */
-            transaction = yield repos.accountTransaction.findByTransactionNumber({
+            transaction = await repos.accountTransaction.findByTransactionNumber({
                 typeOf: params.typeOf,
                 transactionNumber: params.transactionNumber
             });
         }
         else {
-            // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore next */
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
@@ -56,5 +44,5 @@ function confirm(params) {
             // result: {},
             potentialActions
         });
-    });
+    };
 }