@chevre/domain 20.4.0-alpha.5 → 20.4.0-alpha.6

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

@@ -220,20 +220,26 @@ function validateSeller(params) {
 }
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+        if (typeof amount !== 'number') {
+            throw new factory.errors.ArgumentNull('object.paymentMethod?.amount');
+        }
         yield (0, validation_1.validateAccount)(params)(repos);
-        const { pendingTransaction, currency } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        const { pendingTransaction, currency, accountNumber } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
         const totalPaymentDue = {
             typeOf: 'MonetaryAmount',
             currency,
-            value: (typeof pendingTransaction.object.amount === 'number')
-                ? pendingTransaction.object.amount
-                : pendingTransaction.object.amount.value
+            value: amount
+            // value: (typeof pendingTransaction.object.amount === 'number')
+            //     ? pendingTransaction.object.amount
+            //     : pendingTransaction.object.amount.value
         };
         const savingPendingTransaction = {
             typeOf: pendingTransaction.typeOf,
             id: pendingTransaction.id,
             transactionNumber: pendingTransaction.transactionNumber,
-            object: { fromLocation: { accountNumber: pendingTransaction.object.fromLocation.accountNumber } }
+            object: { fromLocation: { accountNumber } }
         };
         return saveAuthorizeResult({
             id: transaction.id,

package/lib/chevre/service/payment/paymentCard.d.ts

@@ -6,13 +6,14 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'object' | 'transactionNumber' | 'typeOf'>;
+declare type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'transactionNumber' | 'typeOf'>;
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<{
     pendingTransaction: IPendingTransaction;
     currency: string;
+    accountNumber: string;
 }>;
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;

package/lib/chevre/service/payment/paymentCard.js

@@ -55,7 +55,7 @@ function authorize(params, paymentServiceId) {
             // PecorinoAPIのエラーをハンドリング
             throw (0, errorHandler_1.handlePecorinoError)(error);
         }
-        return { pendingTransaction, currency };
+        return { pendingTransaction, currency, accountNumber };
     });
 }
 exports.authorize = authorize;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.289.0-alpha.6",
-    "@cinerino/sdk": "3.140.0-alpha.7",
+    "@cinerino/sdk": "3.140.0-alpha.8",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.5"
+  "version": "20.4.0-alpha.6"
 }