npm - @chevre/domain - Versions diffs - 23.2.0-alpha.61 → 23.2.0-alpha.63 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (481) hide show

package/lib/chevre/service/assetTransaction/moneyTransfer.js CHANGED Viewed

@@ -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;
 exports.confirm = confirm;
@@ -27,11 +18,10 @@ const potentialActions_1 = require("./moneyTransfer/potentialActions");
  * Pecorinoサービスを利用して口座取引を開始する
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const issuedThroughId = fixIssuedThroughId(params);
         // location.issuedThroughIdからプロダクトをfixする
-        const products = yield repos.product.projectFields({
+        const products = await repos.product.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -45,15 +35,15 @@ function start(params) {
             throw new factory.errors.NotFound('Product');
         }
         // fromとtoをfix
-        const { fromLocation } = yield fixFromLocation(params, product)(repos);
-        const { toLocation } = yield fixToLocation(params, product)(repos);
+        const { fromLocation } = await fixFromLocation(params, product)(repos);
+        const { toLocation } = await fixToLocation(params, product)(repos);
         const amount = fixMonetaryAmount(params, product);
         // 自動発行廃止(2022-05-17~)
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
-        const transactionType = (_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const transactionType = params.object.pendingTransaction?.typeOf;
         if (typeof transactionType !== 'string') {
             throw new factory.errors.ArgumentNull('object.pendingTransaction.typeOf');
         }
@@ -64,17 +54,26 @@ function start(params) {
             typeOf: factory.assetTransactionType.MoneyTransfer,
             agent: params.agent,
             recipient: params.recipient,
-            object: Object.assign(Object.assign({ amount,
+            object: {
+                amount,
                 fromLocation,
-                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
+                toLocation,
+                pendingTransaction: {
+                    typeOf: transactionType,
+                    transactionNumber: transactionNumber,
+                    ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
+                },
+                ...(typeof params.object.description === 'string') ? { description: params.object.description } : {},
+                force: params.object.force === true
+            },
             expires: params.expires
         };
         // 取引開始
         let transaction;
         try {
-            transaction = yield repos.assetTransaction.start(startParams);
+            transaction = await repos.assetTransaction.start(startParams);
             // const pendingTransaction = await authorizeAccount({ transaction })(repos);
-            yield authorizeAccount({ transaction })(repos);
+            await authorizeAccount({ transaction })(repos);
             // 更新不要(2023-02-20~)
             // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
             //     id: transaction.id,
@@ -94,19 +93,18 @@ function start(params) {
             throw error;
         }
         return transaction;
-    });
+    };
 }
 function fixIssuedThroughId(params) {
-    var _a, _b, _c;
     let issuedThroughId;
-    const pendingTransactionType = (_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf;
+    const pendingTransactionType = params.object.pendingTransaction?.typeOf;
     switch (pendingTransactionType) {
         case factory.account.transactionType.Deposit:
-            issuedThroughId = String((_b = params.object.toLocation.issuedThrough) === null || _b === void 0 ? void 0 : _b.id);
+            issuedThroughId = String(params.object.toLocation.issuedThrough?.id);
             break;
         case factory.account.transactionType.Transfer:
         case factory.account.transactionType.Withdraw:
-            issuedThroughId = String((_c = params.object.fromLocation.issuedThrough) === null || _c === void 0 ? void 0 : _c.id);
+            issuedThroughId = String(params.object.fromLocation.issuedThrough?.id);
             break;
         default:
             throw new factory.errors.Argument('AccountTransactionType', `invalid type: ${params.typeOf}`);
@@ -117,50 +115,58 @@ function fixIssuedThroughId(params) {
     return issuedThroughId;
 }
 function authorizeAccount(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const transaction = params.transaction;
         const fromLocation = transaction.object.fromLocation;
         const toLocation = transaction.object.toLocation;
-        if (typeof ((_a = transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
+        if (typeof transaction.object.pendingTransaction?.typeOf !== 'string') {
             throw new factory.errors.NotFound('transaction.object.pendingTransaction.typeOf');
         }
-        yield MoneyTransferService.authorize({
+        await MoneyTransferService.authorize({
             typeOf: transaction.object.pendingTransaction.typeOf,
             identifier: transaction.object.pendingTransaction.identifier,
             transactionNumber: transaction.object.pendingTransaction.transactionNumber,
             project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             agent: transaction.agent,
-            object: Object.assign({ force: transaction.object.force === true, amount: transaction.object.amount.value, fromLocation: Object.assign({}, (typeof fromLocation.identifier === 'string')
-                    ? {
-                        identifier: fromLocation.identifier,
-                        hasNoPermit: fromLocation.hasNoPermit === true,
-                        issuedThrough: { id: (_b = fromLocation.issuedThrough) === null || _b === void 0 ? void 0 : _b.id }
-                    }
-                    : undefined), toLocation: Object.assign({}, (typeof toLocation.identifier === 'string')
-                    ? {
-                        identifier: toLocation.identifier,
-                        hasNoPermit: toLocation.hasNoPermit === true,
-                        issuedThrough: { id: (_c = toLocation.issuedThrough) === null || _c === void 0 ? void 0 : _c.id }
-                    }
-                    : undefined) }, (typeof transaction.object.description === 'string')
-                ? { description: transaction.object.description }
-                : undefined),
+            object: {
+                force: transaction.object.force === true,
+                amount: transaction.object.amount.value,
+                fromLocation: {
+                    ...(typeof fromLocation.identifier === 'string')
+                        ? {
+                            identifier: fromLocation.identifier,
+                            hasNoPermit: fromLocation.hasNoPermit === true,
+                            issuedThrough: { id: fromLocation.issuedThrough?.id }
+                        }
+                        : undefined
+                },
+                toLocation: {
+                    ...(typeof toLocation.identifier === 'string')
+                        ? {
+                            identifier: toLocation.identifier,
+                            hasNoPermit: toLocation.hasNoPermit === true,
+                            issuedThrough: { id: toLocation.issuedThrough?.id }
+                        }
+                        : undefined
+                },
+                ...(typeof transaction.object.description === 'string')
+                    ? { description: transaction.object.description }
+                    : undefined
+            },
             recipient: transaction.recipient,
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         })(repos);
         // return pendingTransaction;
-    });
+    };
 }
 function fixMonetaryAmount(params, product) {
-    var _a, _b, _c, _d;
     // currencyはプロダクトから自動取得
-    const currency = (_b = (_a = product.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+    const currency = product.serviceOutput?.amount?.currency;
     if (typeof currency !== 'string') {
         throw new factory.errors.Argument('amount', 'currency unknown');
     }
     // 金額をfix
-    const amountValue = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.value;
+    const amountValue = params.object?.amount?.value;
     if (typeof amountValue !== 'number') {
         throw new factory.errors.ArgumentNull('amount.value');
     }
@@ -171,16 +177,15 @@ function fixMonetaryAmount(params, product) {
     };
 }
 function fixFromLocation(params, product) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (__) => {
         const amount = params.object.amount;
-        if (typeof (amount === null || amount === void 0 ? void 0 : amount.value) !== 'number') {
+        if (typeof amount?.value !== 'number') {
             throw new factory.errors.ArgumentNull('amount.value');
         }
         const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = createPermitServiceCredentials({ product });
-        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
+        const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -189,7 +194,7 @@ function fixFromLocation(params, product) {
             })
         });
         let fromLocation = params.object.fromLocation;
-        const transactionType = (_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const transactionType = params.object.pendingTransaction?.typeOf;
         switch (transactionType) {
             case factory.account.transactionType.Withdraw:
             case factory.account.transactionType.Transfer:
@@ -199,47 +204,51 @@ function fixFromLocation(params, product) {
                 let serviceOutput;
                 if (!hasNoPermit) {
                     // サービスアウトプット存在確認
-                    serviceOutput = yield permitService.findByIdentifier({
+                    serviceOutput = await permitService.findByIdentifier({
                         project: { id: params.project.id },
                         identifier: fromLocationObject.identifier,
                         issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
                     });
                     // 出金金額設定を確認
                     const paymentAmount = serviceOutput.paymentAmount;
-                    if (typeof (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.minValue) === 'number') {
+                    if (typeof paymentAmount?.minValue === 'number') {
                         if (amount.value < paymentAmount.minValue) {
                             throw new factory.errors.Argument('fromLocation', `mininum payment amount requirement not satisfied`);
                         }
                     }
-                    if (typeof (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.maxValue) === 'number') {
+                    if (typeof paymentAmount?.maxValue === 'number') {
                         if (amount.value > paymentAmount.maxValue) {
                             throw new factory.errors.Argument('fromLocation', `maximum payment amount requirement not satisfied`);
                         }
                     }
                 }
                 const accountNumber = (serviceOutput !== undefined)
-                    ? String((_b = serviceOutput.paymentAccount) === null || _b === void 0 ? void 0 : _b.accountNumber)
+                    ? String(serviceOutput.paymentAccount?.accountNumber)
                     : fromLocationObject.identifier;
-                fromLocation = Object.assign(Object.assign({ typeOf: (serviceOutput !== undefined) ? serviceOutput.typeOf : factory.permit.PermitType.Permit, identifier: (serviceOutput !== undefined) ? serviceOutput.identifier : accountNumber }, (hasNoPermit) ? { hasNoPermit } : undefined), { issuedThrough: { id: (_c = fromLocationObject.issuedThrough) === null || _c === void 0 ? void 0 : _c.id } });
+                fromLocation = {
+                    typeOf: (serviceOutput !== undefined) ? serviceOutput.typeOf : factory.permit.PermitType.Permit,
+                    identifier: (serviceOutput !== undefined) ? serviceOutput.identifier : accountNumber,
+                    ...(hasNoPermit) ? { hasNoPermit } : undefined,
+                    issuedThrough: { id: fromLocationObject.issuedThrough?.id }
+                };
                 break;
             default:
             // no op
         }
         return { fromLocation };
-    });
+    };
 }
 function fixToLocation(params, product) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (__) => {
         let toLocation = params.object.toLocation;
         const amount = params.object.amount;
-        if (typeof (amount === null || amount === void 0 ? void 0 : amount.value) !== 'number') {
+        if (typeof amount?.value !== 'number') {
             throw new factory.errors.ArgumentNull('amount.value');
         }
         const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = createPermitServiceCredentials({ product });
-        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
+        const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -247,7 +256,7 @@ function fixToLocation(params, product) {
                 state: ''
             })
         });
-        const transactionType = (_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const transactionType = params.object.pendingTransaction?.typeOf;
         switch (transactionType) {
             case factory.account.transactionType.Deposit:
             case factory.account.transactionType.Transfer:
@@ -257,41 +266,45 @@ function fixToLocation(params, product) {
                 let serviceOutput;
                 if (!hasNoPermit) {
                     // サービスアウトプット存在確認
-                    serviceOutput = yield permitService.findByIdentifier({
+                    serviceOutput = await permitService.findByIdentifier({
                         project: { id: params.project.id },
                         identifier: toLocationObject.identifier,
                         issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
                     });
                     // 入金金額設定を確認
                     const depositAmount = serviceOutput.depositAmount;
-                    if (typeof (depositAmount === null || depositAmount === void 0 ? void 0 : depositAmount.minValue) === 'number') {
+                    if (typeof depositAmount?.minValue === 'number') {
                         if (amount.value < depositAmount.minValue) {
                             throw new factory.errors.Argument('toLocation', `mininum deposit amount requirement not satisfied`);
                         }
                     }
-                    if (typeof (depositAmount === null || depositAmount === void 0 ? void 0 : depositAmount.maxValue) === 'number') {
+                    if (typeof depositAmount?.maxValue === 'number') {
                         if (amount.value > depositAmount.maxValue) {
                             throw new factory.errors.Argument('toLocation', `maximum deposit amount requirement not satisfied`);
                         }
                     }
                 }
                 const accountNumber = (serviceOutput !== undefined)
-                    ? String((_b = serviceOutput.paymentAccount) === null || _b === void 0 ? void 0 : _b.accountNumber)
+                    ? String(serviceOutput.paymentAccount?.accountNumber)
                     : toLocationObject.identifier;
-                toLocation = Object.assign(Object.assign({ typeOf: (serviceOutput !== undefined) ? serviceOutput.typeOf : factory.permit.PermitType.Permit, identifier: (serviceOutput !== undefined) ? serviceOutput.identifier : accountNumber }, (hasNoPermit) ? { hasNoPermit } : undefined), { issuedThrough: { id: (_c = toLocationObject.issuedThrough) === null || _c === void 0 ? void 0 : _c.id } });
+                toLocation = {
+                    typeOf: (serviceOutput !== undefined) ? serviceOutput.typeOf : factory.permit.PermitType.Permit,
+                    identifier: (serviceOutput !== undefined) ? serviceOutput.identifier : accountNumber,
+                    ...(hasNoPermit) ? { hasNoPermit } : undefined,
+                    issuedThrough: { id: toLocationObject.issuedThrough?.id }
+                };
                 break;
             default:
             // no op
         }
         return { toLocation };
-    });
+    };
 }
 function createPermitServiceCredentials(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const permitServiceEndpoint = (_a = params.product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
-    const permitServiceAuthorizeServerDomain = (_c = (_b = params.product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
-    const permitServiceClientId = (_e = (_d = params.product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;
-    const permitServiceClientSecret = (_g = (_f = params.product.availableChannel) === null || _f === void 0 ? void 0 : _f.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret;
+    const permitServiceEndpoint = params.product.availableChannel?.serviceUrl;
+    const permitServiceAuthorizeServerDomain = params.product.availableChannel?.credentials?.authorizeServerDomain;
+    const permitServiceClientId = params.product.availableChannel?.credentials?.clientId;
+    const permitServiceClientSecret = params.product.availableChannel?.credentials?.clientSecret;
     if (typeof permitServiceEndpoint !== 'string' || permitServiceEndpoint.length === 0
         || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
         || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
@@ -309,17 +322,17 @@ function createPermitServiceCredentials(params) {
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.MoneyTransfer,
                 id: params.id
             });
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.MoneyTransfer,
                 transactionNumber: params.transactionNumber
             });
@@ -327,35 +340,35 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+        const potentialActions = await (0, potentialActions_1.createPotentialActions)({
             transaction: transaction
         });
-        yield repos.assetTransaction.confirm({
+        await repos.assetTransaction.confirm({
             typeOf: factory.assetTransactionType.MoneyTransfer,
             id: transaction.id,
             result: {},
             potentialActions: potentialActions
         });
-    });
+    };
 }
 /**
  * 取引中止
  */
 function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+    return async (repos) => {
+        await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.MoneyTransfer,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-    });
+    };
 }
 /**
  * 取引のタスク出力
  */
 function exportTasksById(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.findById({
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.MoneyTransfer,
             id: params.id
         });
@@ -370,10 +383,8 @@ function exportTasksById(params) {
         }
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (potentialActions !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (potentialActions.moneyTransfer !== undefined) {
                         taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
@@ -411,5 +422,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/cancel.js CHANGED Viewed

@@ -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.cancel = cancel;
 const factory = require("../../../factory");
@@ -15,11 +6,11 @@ const factory = require("../../../factory");
  * 取引中止
  */
 function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+    return async (repos) => {
+        await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/check.js CHANGED Viewed

@@ -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.check = check;
 const factory = require("../../../factory");
@@ -16,14 +7,13 @@ const MovieTicketPayment = require("../../payment/movieTicket");
  * 決済方法認証
  */
 function check(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos, settings) => {
         let action;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentServiceType = params.object[0]?.typeOf;
         try {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                    action = yield MovieTicketPayment.checkMovieTicket(params)(repos, settings);
+                    action = await MovieTicketPayment.checkMovieTicket(params)(repos, settings);
                     break;
                 default:
                     throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -33,5 +23,5 @@ function check(params) {
             throw error;
         }
         return action;
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/confirm.js CHANGED Viewed

@@ -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.confirm = confirm;
 const factory = require("../../../factory");
@@ -15,18 +6,17 @@ const factory = require("../../../factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.Pay,
                 id: params.id
             });
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.Pay,
                 transactionNumber: params.transactionNumber
             });
@@ -36,21 +26,21 @@ function confirm(params) {
         }
         let overwritingPaymentMethodIdentifier;
         if (transaction.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
-            const specifiedPaymentMethodIdentifire = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+            const specifiedPaymentMethodIdentifire = params.object?.paymentMethod?.identifier;
             if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
                 overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
                 transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
             }
         }
-        const confirmationNumber = (_e = (_d = (_c = params.potentialActions) === null || _c === void 0 ? void 0 : _c.pay) === null || _d === void 0 ? void 0 : _d.purpose) === null || _e === void 0 ? void 0 : _e.confirmationNumber;
-        const orderNumber = (_h = (_g = (_f = params.potentialActions) === null || _f === void 0 ? void 0 : _f.pay) === null || _g === void 0 ? void 0 : _g.purpose) === null || _h === void 0 ? void 0 : _h.orderNumber;
+        const confirmationNumber = params.potentialActions?.pay?.purpose?.confirmationNumber;
+        const orderNumber = params.potentialActions?.pay?.purpose?.orderNumber;
         if (typeof confirmationNumber !== 'string' || confirmationNumber.length === 0
             || typeof orderNumber !== 'string' || orderNumber.length === 0) {
             throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
         }
         let potentialActions;
         // 注文検証
-        const existingOrders = yield repos.order.projectFields({
+        const existingOrders = await repos.order.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: transaction.project.id } },
@@ -65,8 +55,15 @@ function confirm(params) {
             purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
         };
         potentialActions = { pay: [payActionData4order] };
-        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
-            ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
-            : undefined));
-    });
+        await repos.assetTransaction.confirm({
+            typeOf: factory.assetTransactionType.Pay,
+            id: transaction.id,
+            result: {},
+            potentialActions: potentialActions,
+            // 確定時の決済方法区分指定(2023-08-29~)
+            ...(typeof overwritingPaymentMethodIdentifier === 'string')
+                ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
+                : undefined
+        });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/exportTasksById.js CHANGED Viewed

@@ -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.exportTasksById = exportTasksById;
 const moment = require("moment");
@@ -16,9 +7,8 @@ const factory = require("../../../factory");
  * 取引のタスク出力
  */
 function exportTasksById(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.findById({
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id
         });
@@ -79,7 +69,7 @@ function exportTasksById(params) {
         };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
+                const payActions = potentialActions?.pay;
                 if (Array.isArray(payActions) && payActions.length > 0) {
                     const payTasks = payActions.map(({ object, purpose }) => {
                         const data = { object, purpose };
@@ -107,5 +97,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }