@chevre/domain 25.2.0-alpha.50 → 25.2.0-alpha.52

package/lib/chevre/repo/asyncAction.d.ts

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 import { IModel, IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
@@ -7,12 +7,17 @@ type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'ex
 };
 export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
+type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status' | 'limit' | 'page' | 'sort'>;
 /**
  * 非同期アクションリポジトリ
  */
 export declare class AsyncActionRepo {
     readonly asyncActionModel: IModel;
     constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/deleteTransaction").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").ITask>[];
+    findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    })[]>;
     /**
      * Readyタスクをひとつ追加する
      */

package/lib/chevre/repo/asyncAction.js

@@ -35,6 +35,65 @@ class AsyncActionRepo {
     constructor(connection) {
         this.asyncActionModel = connection.model(asyncAction_1.modelName, (0, asyncAction_1.createSchema)());
     }
+    static CREATE_MONGO_CONDITIONS(params) {
+        const andConditions = [];
+        const idEq = params.id?.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = params.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        if (typeof params.name === 'string') {
+            andConditions.push({ name: { $eq: params.name } });
+        }
+        else {
+            const nameIn = params.name?.$in;
+            if (Array.isArray(nameIn)) {
+                andConditions.push({ name: { $in: nameIn } });
+            }
+            const nameNin = params.name?.$nin;
+            if (Array.isArray(nameNin)) {
+                andConditions.push({ name: { $nin: nameNin } });
+            }
+        }
+        const statusEq = params.status?.$eq;
+        if (typeof statusEq === 'string') {
+            andConditions.push({ status: { $eq: statusEq } });
+        }
+        if (params.runsFrom instanceof Date) {
+            andConditions.push({ runsAt: { $gte: params.runsFrom } });
+        }
+        if (params.runsThrough instanceof Date) {
+            andConditions.push({ runsAt: { $lte: params.runsThrough } });
+        }
+        return andConditions;
+    }
+    async findAsyncActions(params, inclusion) {
+        const conditions = AsyncActionRepo.CREATE_MONGO_CONDITIONS(params);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.asyncActionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+        if (typeof params.limit === 'number' && params.limit > 0) {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            query.limit(params.limit)
+                .skip(params.limit * (page - 1));
+        }
+        if (params.sort?.runsAt !== undefined) {
+            query.sort({ runsAt: params.sort.runsAt });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+    }
     /**
      * Readyタスクをひとつ追加する
      */

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

@@ -1,5 +1,6 @@
 import { factory } from '../../../factory';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
+import type { AsyncActionRepo } from '../../../repo/asyncAction';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
@@ -38,8 +39,11 @@ declare function findAcceptAction(params: {
          */
         id: string;
     };
+}, options: {
+    useAsyncAction: boolean;
 }): (repos: {
     acceptPayAction: AcceptPayActionRepo;
+    asyncAction: AsyncActionRepo;
     task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction, };

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

@@ -2,16 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
 const factory_1 = require("../../../factory");
-function findAcceptAction(params) {
+function findAcceptAction(params, options) {
     return async (repos) => {
-        // タスク検索
-        const task = (await repos.task.projectFields({
-            limit: 1,
-            page: 1,
-            id: { $eq: params.sameAs.id },
-            project: { id: { $eq: params.project.id } },
-            name: factory_1.factory.taskName.PublishPaymentUrl
-        }, ['status', 'executionResults'])).shift();
+        // 非同期アクションに対応(2026-07-28~)
+        const { useAsyncAction } = options;
+        let task;
+        if (useAsyncAction) {
+            // まず非同期アクションを参照
+            task = await repos.asyncAction.findAsyncActionById({
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.PublishPaymentUrl
+            }, ['status', 'executionResults']);
+        }
+        // 非同期アクションが存在しなければタスクを参照
+        if (task === undefined) {
+            task = (await repos.task.projectFields({
+                limit: 1,
+                page: 1,
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.PublishPaymentUrl
+            }, ['status', 'executionResults'])).shift();
+        }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.PublishPaymentUrl);
         }

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

@@ -1,5 +1,6 @@
 import { factory } from '../../../factory';
 import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
+import type { AsyncActionRepo } from '../../../repo/asyncAction';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAuthorizeActionResult {
     /**
@@ -20,6 +21,7 @@ interface IFindAuthorizeActionResult {
 }
 interface IFindAuthorizeActionRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    asyncAction: AsyncActionRepo;
     task: TaskRepo;
 }
 declare function findAuthorizeAction(params: {
@@ -38,5 +40,7 @@ declare function findAuthorizeAction(params: {
          */
         id: string;
     };
+}, options: {
+    useAsyncAction: boolean;
 }): (repos: IFindAuthorizeActionRepos) => Promise<IFindAuthorizeActionResult>;
 export { IFindAuthorizeActionRepos, findAuthorizeAction, };

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

@@ -2,16 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAuthorizeAction = findAuthorizeAction;
 const factory_1 = require("../../../factory");
-function findAuthorizeAction(params) {
+function findAuthorizeAction(params, options) {
     return async (repos) => {
-        // タスク検索
-        const task = (await repos.task.projectFields({
-            limit: 1,
-            page: 1,
-            id: { $eq: params.sameAs.id },
-            project: { id: { $eq: params.project.id } },
-            name: factory_1.factory.taskName.AuthorizePayment
-        }, ['status', 'executionResults'])).shift();
+        // 非同期アクションに対応(2026-07-28~)
+        const { useAsyncAction } = options;
+        let task;
+        if (useAsyncAction) {
+            // まず非同期アクションを参照
+            task = await repos.asyncAction.findAsyncActionById({
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.AuthorizePayment
+            }, ['status', 'executionResults']);
+        }
+        // 非同期アクションが存在しなければタスクを参照
+        if (task === undefined) {
+            task = (await repos.task.projectFields({
+                limit: 1,
+                page: 1,
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.AuthorizePayment
+            }, ['status', 'executionResults'])).shift();
+        }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AuthorizePayment);
         }

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.50"
+  "version": "25.2.0-alpha.52"
 }