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

package/lib/chevre/repo/action/acceptPay.d.ts

@@ -16,4 +16,18 @@ export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAct
             id: string;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptPayAction[]>;
+    /**
+     * 決済取引番号から完了済の決済採用アクションを参照する
+     */
+    findCompletedAcceptActionsByTransactionNumber(params: {
+        project: {
+            id: string;
+        };
+        purpose: {
+            id: string;
+        };
+        object: {
+            transactionNumber: string;
+        };
+    }, inclusion: IKeyOfProjection[]): Promise<IAcceptPayAction[]>;
 }

package/lib/chevre/repo/action/acceptPay.js

@@ -68,5 +68,32 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
             .lean()
             .exec();
     }
+    /**
+     * 決済取引番号から完了済の決済採用アクションを参照する
+     */
+    async findCompletedAcceptActionsByTransactionNumber(params, inclusion) {
+        const andConditions = [
+            { typeOf: { $eq: factory.actionType.AcceptAction } },
+            { actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus } },
+            { 'project.id': { $eq: params.project.id } },
+            { 'purpose.id': { $exists: true, $eq: params.purpose.id } },
+            { 'object.typeOf': { $exists: true, $eq: factory.assetTransactionType.Pay } },
+            { 'object.transactionNumber': { $exists: true, $eq: params.object.transactionNumber } }
+        ];
+        let positiveProjectionFields = actionProcess_1.AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => actionProcess_1.AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.actionModel.find({ $and: andConditions }, projection);
+        query.limit(1); // ひとまず1つだけでよい
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+    }
 }
 exports.AcceptPayActionRepo = AcceptPayActionRepo;

package/lib/chevre/repo/action/authorizePaymentMethod.d.ts

@@ -7,18 +7,27 @@ export type IActionRecipe = never;
  */
 export declare class AuthorizePaymentMethodActionRepo extends ActionProcessRepo<IAuthorizePaymentMethodAction, IActionRecipe> {
     /**
-     * 取引に対するアクションを検索する
+     * 取引に対する決済承認アクションを検索する
      */
     findAuthorizePaymentMethodActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
         purpose: {
             typeOf: factory.transactionType;
             id: string;
         };
+        /**
+         * 決済取引番号でフィルター
+         */
         object?: {
             paymentMethodId?: {
                 $eq?: string;
             };
         };
+        /**
+         * アクションステータスでフィルター
+         */
         actionStatus?: {
             $eq?: factory.actionStatusType.CompletedActionStatus;
         };

package/lib/chevre/repo/action/authorizePaymentMethod.js

@@ -34,7 +34,7 @@ const actionProcess_1 = require("./actionProcess");
  */
 class AuthorizePaymentMethodActionRepo extends actionProcess_1.ActionProcessRepo {
     /**
-     * 取引に対するアクションを検索する
+     * 取引に対する決済承認アクションを検索する
      */
     async findAuthorizePaymentMethodActionsByPurpose(params) {
         const andConditions = [
@@ -76,7 +76,7 @@ class AuthorizePaymentMethodActionRepo extends actionProcess_1.ActionProcessRepo
             id: { $toString: '$_id' },
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
-        const query = this.actionModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
+        const query = this.actionModel.find({ $and: andConditions }, projection);
         if (typeof params.sort?.startDate === 'number') {
             query.sort({ startDate: params.sort.startDate });
         }

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

@@ -1,5 +1,6 @@
 import * as factory from '../../../../factory';
-import type { ActionRepo } from '../../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
+import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
@@ -7,7 +8,9 @@ import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
 interface IFixTransactionNumberRepos {
-    action: ActionRepo;
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -1,5 +1,6 @@
 import * as factory from '../../../../factory';
-import type { ActionRepo } from '../../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
+import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
@@ -10,6 +11,14 @@ interface IAcceptAction2ticketResult {
     invoiceByTicketToken: IInvoiceByTicketToken;
     ticketToken: string;
 }
+interface IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos {
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
+}
 /**
  * 決済承認前の決済採用アクションを参照する
  */
@@ -17,12 +26,7 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'referencesOrder'>;
     prePublishedPaymentMethodId: string;
     transaction: Pick<ITransactionInProgress, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
-}): (repos: {
-    action: ActionRepo;
-    authorization: AuthorizationRepo;
-    ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
-}) => Promise<{
+}): (repos: IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
         paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
@@ -37,4 +41,4 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     authorizeParams?: never;
     acceptAction2ticketResult?: never;
 }>;
-export { handlePrePublishedPaymentMethodIdOnAuthorizing };
+export { IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos, handlePrePublishedPaymentMethodIdOnAuthorizing };

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js

@@ -125,24 +125,32 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
         const paymentMethodByTransaction = await repos.placeOrder.findInProgressPaymentMethodId({ id: params.transaction.id });
         if (params.prePublishedPaymentMethodId === paymentMethodByTransaction?.paymentMethodId) {
             // check existence of acceptAction when authorizing payment(2024-06-01~)
-            acceptPayAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.transaction.project.id } },
-                typeOf: { $eq: factory.actionType.AcceptAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                purpose: { id: { $in: [params.transaction.id] } },
-                object: {
-                    transactionNumber: { $eq: params.prePublishedPaymentMethodId },
-                    typeOf: { $eq: factory.assetTransactionType.Pay }
-                }
+            // acceptPayAction = (<Pick<IAcceptPayAction, 'object' | 'result' | 'id' | 'instrument'>[]>await repos.action.search<factory.actionType.AcceptAction>(
+            //     {
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: params.transaction.project.id } },
+            //         typeOf: { $eq: factory.actionType.AcceptAction },
+            //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            //         purpose: { id: { $in: [params.transaction.id] } },
+            //         object: {
+            //             transactionNumber: { $eq: params.prePublishedPaymentMethodId },
+            //             typeOf: { $eq: factory.assetTransactionType.Pay }
+            //         }
+            //     },
+            //     ['object', 'result', 'instrument']
+            // )).shift();
+            acceptPayAction = (await repos.acceptPayAction.findCompletedAcceptActionsByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                purpose: { id: params.transaction.id },
+                object: { transactionNumber: params.prePublishedPaymentMethodId }
             }, ['object', 'result', 'instrument'])).shift();
             if (acceptPayAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.AcceptAction);
             }
             debug('acceptPayAction found:', acceptPayAction.id);
             // find recipe(2024-06-02~)
-            const actionRecipe = await repos.action.findRecipeByAction({
+            const actionRecipe = await repos.acceptPayAction.findRecipeByAction({
                 project: { id: params.transaction.project.id },
                 recipeFor: { id: acceptPayAction.id }
             });
@@ -169,13 +177,22 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 throw new factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');
             }
             // 既に承認済であれば何もしない(2023-05-15~)
-            const existingCompletedAuthorizeActions = await repos.action.searchByPurpose({
-                typeOf: factory.actionType.AuthorizeAction,
+            // const existingCompletedAuthorizeActions = <IAuthorizePaymentAction[]>
+            //     await repos.action.searchByPurpose<factory.actionType.AuthorizeAction>({
+            //         typeOf: factory.actionType.AuthorizeAction,
+            //         purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
+            //         actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
+            //         object: {
+            //             paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
+            //             typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+            //         },
+            //         sort: { startDate: factory.sortType.Ascending }
+            //     });
+            const existingCompletedAuthorizeActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
                 purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
                 actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
                 object: {
-                    paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
-                    typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+                    paymentMethodId: { $eq: params.prePublishedPaymentMethodId }
                 },
                 sort: { startDate: factory.sortType.Ascending }
             });

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

@@ -4,6 +4,7 @@ import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMet
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
 import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
@@ -28,6 +29,7 @@ interface IAuthorizeRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     checkMovieTicketAction: CheckMovieTicketActionRepo;
+    acceptPayAction: AcceptPayActionRepo;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/payment/any/authorize.js

@@ -63,7 +63,14 @@ function authorize(params) {
             object: params.object,
             transaction,
             paymentServiceType
-        })(repos);
+        })({
+            acceptPayAction: repos.acceptPayAction,
+            authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
+            authorization: repos.authorization,
+            ticket: repos.ticket,
+            placeOrder: repos.placeOrder,
+            transactionNumber: repos.transactionNumber
+        });
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }

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

@@ -29,6 +29,7 @@ const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
+const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -81,6 +82,7 @@ function call(params) {
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: new action_1.ActionRepo(connection),
                 checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
+                acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 authorizePaymentMethodAction: authorizePaymentMethodActionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.25"
+  "version": "24.0.0-alpha.26"
 }