@chevre/domain 21.13.0-alpha.3 → 21.13.0-alpha.4

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -8,6 +8,7 @@ import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
@@ -18,6 +19,7 @@ export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     event: EventRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
@@ -60,6 +62,7 @@ export type ICheckOperation<T> = (repos: {
     seller: SellerRepo;
 }) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
@@ -68,6 +71,7 @@ export type IPublishPaymentUrlOperation<T> = (repos: {
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -130,6 +134,7 @@ export declare function exportTasksById(params: {
 export declare function searchGMOTrade(params: {
     transactionNumber: string;
 }): (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     seller: SellerRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -6,7 +6,8 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../../repo/event';
-import { CognitoRepository as PersonRepo } from '../../repo/person';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
+import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -25,6 +26,7 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -35,6 +37,7 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -60,6 +63,7 @@ interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
@@ -71,6 +75,7 @@ interface IAuthorizeRepos {
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 interface IPublishPaymentUrlRepos {
     assetTransaction: AssetTransactionRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -5,7 +5,8 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import { CognitoRepository as PersonRepo } from '../../repo/person';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
+import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -14,6 +15,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
  * クレジットカード決済承認
  */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, searchTrade4accountId: boolean): (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;
@@ -30,6 +32,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
  * クレジットカード決済中止
  */
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -40,6 +43,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
 declare function payCreditCard(params: factory.task.pay.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -51,6 +55,7 @@ declare function payCreditCard(params: factory.task.pay.IData): (repos: {
 declare function refundCreditCard(params: factory.task.refund.IData, requirePayAction: boolean): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -67,8 +72,8 @@ declare function getGMOInfoFromSeller(params: {
     };
     paymentServiceId: string;
 }): (repos: {
+    paymentServiceProvider: PaymentServiceProviderRepo;
     seller: SellerRepo;
-    product: ProductRepo;
 }) => Promise<IGMOInfo>;
 declare function searchGMOTrade(params: {
     availableChannel: factory.product.IAvailableChannel;

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

@@ -526,7 +526,7 @@ function processChangeTransaction(params) {
 }
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,
@@ -541,31 +541,39 @@ function getGMOInfoFromSeller(params) {
             throw new factory.errors.Argument('transaction', 'payment not accepted');
         }
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.product.search({
+        const paymentServices = yield repos.paymentServiceProvider.search({
             limit: 1,
             page: 1,
-            project: { id: { $eq: seller.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
-            // serviceType: { codeValue: { $eq: params.paymentMethodType } },
+            provider: { id: { $eq: params.seller.id } },
             id: { $eq: params.paymentServiceId }
-        }, [], []);
+        });
+        // const paymentServices = <factory.service.paymentService.IService[]>await repos.product.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: seller.project.id } },
+        //         typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
+        //         // serviceType: { codeValue: { $eq: params.paymentMethodType } },
+        //         id: { $eq: params.paymentServiceId }
+        //     },
+        //     [],
+        //     []
+        // );
         const paymentService = paymentServices.shift();
         if (paymentService === undefined) {
             throw new factory.errors.NotFound('PaymentService');
         }
-        const provider = (_b = paymentService.provider) === null || _b === void 0 ? void 0 : _b.find((p) => p.id === params.seller.id);
-        if (provider === undefined) {
-            throw new factory.errors.NotFound('PaymentService provider');
-        }
-        const shopId = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.shopId;
-        const shopPass = (_d = provider.credentials) === null || _d === void 0 ? void 0 : _d.shopPass;
+        const provider = paymentService.provider;
+        // const provider = paymentService.provider?.find((p) => p.id === params.seller.id);
+        // if (provider === undefined) {
+        //     throw new factory.errors.NotFound('PaymentService provider');
+        // }
+        const shopId = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.shopId;
+        const shopPass = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.shopPass;
         if (typeof shopId !== 'string' || typeof shopPass !== 'string') {
             throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
         }
-        return {
-            shopId,
-            shopPass
-        };
+        return { shopId, shopPass };
     });
 }
 exports.getGMOInfoFromSeller = getGMOInfoFromSeller;

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

@@ -5,6 +5,7 @@ import type { MongoRepository as AccountingReportRepo } from '../repo/accounting
 import type { MongoRepository as ActionRepo } from '../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../repo/event';
+import type { MongoRepository as PaymentServiceProviderRepo } from '../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../repo/product';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { MongoRepository as SellerRepo } from '../repo/seller';
@@ -18,6 +19,7 @@ export declare function pay(params: factory.task.pay.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -26,6 +28,7 @@ export declare function pay(params: factory.task.pay.IData): (repos: {
 export declare function voidPayment(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -37,6 +40,7 @@ export declare function voidPayment(params: factory.task.voidPayment.IData): (re
 export declare function refund(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
@@ -23,21 +24,15 @@ const PaymentService = require("../payment");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const eventRepo = new event_1.MongoRepository(settings.connection);
-        const productRepo = new product_1.MongoRepository(settings.connection);
-        const projectRepo = new project_1.MongoRepository(settings.connection);
-        const sellerRepo = new seller_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield PaymentService.pay(data)({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            event: eventRepo,
-            product: productRepo,
-            project: projectRepo,
-            seller: sellerRepo,
-            task: taskRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/refund.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
@@ -28,23 +29,16 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const productRepo = new product_1.MongoRepository(settings.connection);
-        const projectRepo = new project_1.MongoRepository(settings.connection);
-        const sellerRepo = new seller_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const transactionNumberRepo = new transactionNumber_1.RedisRepository(settings.redisClient);
         yield PaymentService.refund(data)({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            product: productRepo,
-            project: projectRepo,
-            seller: sellerRepo,
-            task: taskRepo,
-            assetTransaction: transactionRepo,
-            transactionNumber: transactionNumberRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient)
         });
     });
 }

package/lib/chevre/service/task/voidPayTransaction.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
@@ -24,23 +25,16 @@ const AnyPaymentService = require("../payment/any");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const productRepo = new product_1.MongoRepository(settings.connection);
-        const projectRepo = new project_1.MongoRepository(settings.connection);
-        const sellerRepo = new seller_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield AnyPaymentService.voidPayTransaction(data)({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            product: productRepo,
-            project: projectRepo,
-            seller: sellerRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/voidPayment.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
@@ -22,19 +23,14 @@ const PaymentService = require("../payment");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const productRepo = new product_1.MongoRepository(settings.connection);
-        const projectRepo = new project_1.MongoRepository(settings.connection);
-        const sellerRepo = new seller_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield PaymentService.voidPayment(data)({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            product: productRepo,
-            project: projectRepo,
-            seller: sellerRepo,
-            task: taskRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.3"
+  "version": "21.13.0-alpha.4"
 }