@chevre/domain 25.2.0-alpha.48 → 25.2.0-alpha.49

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

@@ -1,11 +1,12 @@
 import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/asyncAction';
+import { IModel, IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
 type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'alternateName' | 'data' | 'description' | 'executionResults' | 'expires' | 'identifier' | 'name' | 'project' | 'runsAt' | 'status'> & {
     expires: Date;
 };
 export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 /**
  * 非同期アクションリポジトリ
  */
@@ -30,6 +31,22 @@ export declare class AsyncActionRepo {
             name: string;
         };
     }): Promise<IExecutableAsyncAction | null>;
+    /**
+     * 非同期アクションの状態を参照する
+     */
+    findAsyncActionById(params: {
+        id: {
+            $eq: string;
+        };
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        name: factory.taskName;
+    }, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    } | undefined)>;
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */

package/lib/chevre/repo/asyncAction.js

@@ -19,6 +19,21 @@ const executableTaskProjection = {
     runsAt: 1,
     expires: 1
 };
+const AVAILABLE_PROJECT_FIELDS = [
+    'alternateName',
+    'identifier',
+    'description',
+    'project',
+    'name',
+    'status',
+    'runsAt',
+    'lastTriedAt',
+    'executionResults',
+    'executor',
+    'data',
+    'dateAborted',
+    'expires'
+];
 /**
  * 非同期アクションリポジトリ
  */
@@ -72,6 +87,35 @@ class AsyncActionRepo {
         }
         return doc;
     }
+    /**
+     * 非同期アクションの状態を参照する
+     */
+    async findAsyncActionById(params, inclusion) {
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        else {
+            // no op
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.asyncActionModel.findOne({
+            _id: { $eq: params.id.$eq },
+            'project.id': { $eq: params.project.id.$eq },
+            name: { $eq: params.name }
+        }, projection);
+        const doc = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+        if (doc === null) {
+            return;
+        }
+        return doc;
+    }
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts

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

package/lib/chevre/service/offer/eventServiceByCOA/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.AcceptCOAOffer
-        }, ['status', 'executionResults'])).shift();
+        // 非同期アクションに対応(2026-07-27~)
+        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.AcceptCOAOffer
+            }, ['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.AcceptCOAOffer
+            }, ['status', 'executionResults'])).shift();
+        }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AcceptCOAOffer);
         }

package/package.json

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