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

package/lib/chevre/repo/mongoose/model/comments.d.ts

@@ -1,5 +1,5 @@
 import * as mongoose from 'mongoose';
-declare const modelName = "CreativeWork";
+declare const modelName = "Comment";
 /**
  * コメントスキーマ
  */

package/lib/chevre/repo/mongoose/model/comments.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.modelName = void 0;
 const mongoose = require("mongoose");
-const modelName = 'CreativeWork';
+const modelName = 'Comment';
 exports.modelName = modelName;
 const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
 /**

package/lib/chevre/repository.d.ts

@@ -11,6 +11,7 @@ import { MongoRepository as AggregationRepo } from './repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
 import { MongoRepository as CodeRepo } from './repo/code';
+import { MongoRepository as CommentRepo } from './repo/comment';
 import { MongoRepository as CreativeWorkRepo } from './repo/creativeWork';
 import { MongoRepository as CustomerRepo } from './repo/customer';
 import { MongoRepository as EmailMessageRepo } from './repo/emailMessage';
@@ -82,6 +83,11 @@ export declare class CategoryCode extends CategoryCodeRepo {
  */
 export declare class Code extends CodeRepo {
 }
+/**
+ * コメントリポジトリ
+ */
+export declare class Comment extends CommentRepo {
+}
 /**
  * 確認番号リポジトリ
  */

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -15,6 +15,7 @@ const aggregation_1 = require("./repo/aggregation");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
 const code_1 = require("./repo/code");
+const comment_1 = require("./repo/comment");
 const creativeWork_1 = require("./repo/creativeWork");
 const customer_1 = require("./repo/customer");
 const emailMessage_1 = require("./repo/emailMessage");
@@ -98,6 +99,12 @@ exports.CategoryCode = CategoryCode;
 class Code extends code_1.MongoRepository {
 }
 exports.Code = Code;
+/**
+ * コメントリポジトリ
+ */
+class Comment extends comment_1.MongoRepository {
+}
+exports.Comment = Comment;
 /**
  * 確認番号リポジトリ
  */

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.7"
 }