@chevre/domain 24.0.0-alpha.26 → 24.0.0-alpha.28

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

@@ -1,16 +1,17 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-/**
- * クレジットカード決済中止
- */
-declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
+interface IVoidTransactionRepos {
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<void>;
-export { voidTransaction };
+}
+/**
+ * クレジットカード決済中止
+ */
+declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
+export { IVoidTransactionRepos, voidTransaction };

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

@@ -57,12 +57,20 @@ function voidTransaction(params) {
             requirePaymentAccepted: false
         })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
-        const authorizeInvoiceAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            typeOf: { $eq: factory.actionType.AuthorizeAction },
-            object: { paymentMethodId: { $eq: paymentMethodId } },
-            sameAs: { id: { $eq: transaction.id } }
+        // const authorizeInvoiceAction = (<Pick<factory.action.authorize.invoice.IAction, 'id' | 'typeOf' | 'project'>[]>
+        //     await repos.action.search(
+        //         {
+        //             limit: 1,
+        //             page: 1,
+        //             typeOf: { $eq: factory.actionType.AuthorizeAction },
+        //             object: { paymentMethodId: { $eq: paymentMethodId } },
+        //             sameAs: { id: { $eq: transaction.id } }
+        //         },
+        //         ['id', 'typeOf', 'project']
+        //     )).shift();
+        const authorizeInvoiceAction = (await repos.authorizeInvoiceAction.findAuthorizeInvoiceActionsByPayTransaction({
+            paymentMethodId,
+            payTransactionId: transaction.id
         }, ['id', 'typeOf', 'project'])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
@@ -70,7 +78,7 @@ function voidTransaction(params) {
                 agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
                 // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
             };
-            await repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+            await repos.authorizeInvoiceAction.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
         }
         const creditCardService = new GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl),

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

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -11,6 +12,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

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

@@ -27,6 +27,7 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -50,6 +51,7 @@ function call(data) {
         await (0, voidPaymentByTask_1.voidPaymentByTask)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                 expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

package/package.json

@@ -54,7 +54,7 @@
     "googleapis": "^85.0.0",
     "jose": "6.0.12",
     "json2csv": "4.5.4",
-    "mongoose": "8.0.4",
+    "mongoose": "8.23.0",
     "redis": "4.6.5",
     "rimraf": "^2.7.1",
     "size-limit": "12.0.0",
@@ -63,7 +63,7 @@
     "vitest": "4.0.18"
   },
   "peerDependencies": {
-    "mongoose": "^8.0.0",
+    "mongoose": "^8.23.0",
     "redis": "^4.6.5"
   },
   "engines": {
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.26"
+  "version": "24.0.0-alpha.28"
 }