@chevre/domain 26.0.0 → 26.1.0-alpha.0

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

@@ -15,6 +15,23 @@ class CheckMovieTicketActionRepo extends actionProcess_1.ActionProcessRepo {
             recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
         });
     }
+    async findActionBySameAs(params) {
+        return this.actionModel.findOne({
+            typeOf: { $eq: factory_1.factory.actionType.CheckAction }, // 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+            'sameAs.id': { $exists: true, $eq: params.sameAs.id },
+            ...(typeof params.purpose?.id === 'string')
+                ? { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
+                : undefined
+        }, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            actionStatus: 1,
+            error: 1,
+            purpose: 1
+        })
+            .lean()
+            .exec();
+    }
     /**
      * アクションIDからレシピのafterMediaを参照する
      */

package/lib/chevre/repo/action/dedicatedAction/dedicatedActionProcess.d.ts

@@ -0,0 +1,46 @@
+import { Connection } from 'mongoose';
+import { factory } from '../../../factory';
+import type { IAbstractActionModel } from '../../mongoose/schemas/action/abstractAction';
+import { ActionRecipeRepo, IActionRecipe, IRecipeAsActionAttributes } from '../anyAction/actionRecipe';
+type AvailableActionType = factory.actionType.InformAction | factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction | factory.actionType.UseAction;
+type IAction<T extends AvailableActionType> = T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IAction : T extends factory.actionType.UseAction ? factory.action.consume.use.reservation.IAction : never;
+type IActionAttributes<T extends AvailableActionType> = T extends factory.actionType.InformAction ? factory.action.interact.inform.IAttributes : T extends factory.actionType.AddAction ? factory.action.update.add.IAttributes : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAttributes : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAttributes : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IAttributes : T extends factory.actionType.UseAction ? factory.action.consume.use.reservation.IAttributes : never;
+type IResult<T extends AvailableActionType> = T extends factory.actionType.InformAction ? factory.action.interact.inform.IResult : T extends factory.actionType.AddAction ? factory.action.update.add.IResult : T extends factory.actionType.UpdateAction ? factory.action.update.update.IResult : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IResult : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IResult : T extends factory.actionType.UseAction ? factory.action.consume.use.reservation.IResult : never;
+interface IOptions {
+    expireAfterSeconds: number;
+    recipeExpireAfterSeconds: number;
+}
+/**
+ * 専用アクション状態管理リポジトリ
+ * mongoose modelは継承クラスから指定される前提
+ */
+export declare class DedicatedActionProcessRepo<TActionType extends AvailableActionType, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> extends ActionRecipeRepo<TActionRecipe> {
+    private readonly actionModel;
+    private options;
+    protected constructor(params: {
+        connection: Connection;
+        actionModel: IAbstractActionModel;
+    }, options: IOptions);
+    /**
+     * アクション開始
+     */
+    protected startAction<T extends TActionType>(attributes: IActionAttributes<T>, options?: {
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
+    protected completeAction<T extends TActionType>(params: {
+        typeOf: T;
+        id: string;
+        result?: IResult<T>;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<void>;
+    /**
+     * アクション失敗
+     */
+    protected giveUpAction<T extends TActionType>(params: {
+        typeOf: T;
+        id: string;
+        error: Error | Error[] | unknown;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/action/dedicatedAction/dedicatedActionProcess.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DedicatedActionProcessRepo = void 0;
+const factory_1 = require("../../../factory");
+const unknown2actionError_1 = require("../unknown2actionError");
+const actionRecipe_1 = require("../anyAction/actionRecipe");
+/**
+ * 専用アクション状態管理リポジトリ
+ * mongoose modelは継承クラスから指定される前提
+ */
+class DedicatedActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
+    actionModel;
+    options;
+    constructor(params, options) {
+        super(params, options);
+        this.actionModel = params.actionModel;
+        this.options = options;
+    }
+    /**
+     * アクション開始
+     */
+    async startAction(attributes, options) {
+        const startDate = new Date();
+        const expires = new Date(startDate.getTime() + this.options.expireAfterSeconds * 1000);
+        const creatingAction = {
+            ...attributes,
+            actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
+            startDate,
+            expires
+        };
+        const result = await this.actionModel.insertMany(creatingAction, { rawResult: true });
+        const id = result.insertedIds?.[0]?.toHexString();
+        if (typeof id !== 'string') {
+            throw new factory_1.factory.errors.Internal('action not saved');
+        }
+        // add recipe
+        const savingRecipe = options?.recipe;
+        if (savingRecipe?.typeOf === 'Recipe') {
+            await this.upsertRecipe({ ...savingRecipe, recipeFor: { id, typeOf: creatingAction.typeOf } });
+        }
+        return { id, startDate, typeOf: creatingAction.typeOf };
+    }
+    async completeAction(params) {
+        const endDate = new Date();
+        if (params.recipe?.typeOf === 'Recipe') {
+            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
+        }
+        const doc = await this.actionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            actionStatus: { $eq: factory_1.factory.actionStatusType.ActiveActionStatus }
+        }, {
+            $set: {
+                actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
+                endDate,
+                ...((params.result !== undefined) && { result: params.result })
+            }
+        }, { new: false, projection: { _id: 1 } })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
+        }
+    }
+    /**
+     * アクション失敗
+     */
+    async giveUpAction(params) {
+        const endDate = new Date();
+        const actionError = Array.isArray(params.error)
+            ? params.error.map(unknown2actionError_1.unknown2actionError)
+            : (0, unknown2actionError_1.unknown2actionError)(params.error);
+        if (params.recipe?.typeOf === 'Recipe') {
+            await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
+        }
+        const doc = await this.actionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            actionStatus: { $eq: factory_1.factory.actionStatusType.ActiveActionStatus }
+        }, {
+            $set: {
+                actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
+                error: actionError,
+                endDate
+            }
+        }, { new: false, projection: { _id: 1 } })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
+        }
+    }
+}
+exports.DedicatedActionProcessRepo = DedicatedActionProcessRepo;

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

@@ -1,6 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/inform';
+import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';
 type StartableActionType = factory.actionType.InformAction;
 type IAction = IDocType & {
     id: string;
@@ -12,7 +13,7 @@ type IFindParams = Pick<factory.action.ISearchConditions, 'limit' | 'page' | 'pr
 /**
  * 通知アクションリポジトリ
  */
-export declare class InformActionRepo {
+export declare class InformActionRepo extends DedicatedActionProcessRepo<StartableActionType, never> {
     private readonly informActionModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<IDocType>[];

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InformActionRepo = void 0;
-const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const inform_1 = require("../mongoose/schemas/action/inform");
-const unknown2actionError_1 = require("./unknown2actionError");
+const dedicatedActionProcess_1 = require("./dedicatedAction/dedicatedActionProcess");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'actionStatus',
@@ -25,10 +24,18 @@ const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * 通知アクションリポジトリ
  */
-class InformActionRepo {
+class InformActionRepo extends dedicatedActionProcess_1.DedicatedActionProcessRepo {
     informActionModel;
     constructor(connection) {
-        this.informActionModel = connection.model(inform_1.modelName, (0, inform_1.createSchema)());
+        const informActionModel = connection.model(inform_1.modelName, (0, inform_1.createSchema)());
+        super({
+            connection,
+            actionModel: informActionModel
+        }, {
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
+        });
+        this.informActionModel = informActionModel;
     }
     static CREATE_MONGO_CONDITIONS(params) {
         const andConditions = [];
@@ -66,54 +73,16 @@ class InformActionRepo {
      * アクション開始
      */
     async startInformAction(attributes) {
-        const startDate = new Date();
-        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
-        const creatingAction = {
-            ...attributes,
-            actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate,
-            expires
-        };
-        const result = await this.informActionModel.insertMany(creatingAction, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory_1.factory.errors.Internal('action not saved');
-        }
-        return { id, startDate, typeOf: creatingAction.typeOf };
+        return this.startAction(attributes);
     }
     async completeInformAction(params) {
-        const doc = await this.informActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
-                result: params.result,
-                endDate: new Date()
-            }
-        }, { new: false, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.informActionModel.modelName);
-        }
+        await this.completeAction(params);
     }
     /**
      * アクション失敗
      */
     async giveUpInformAction(params) {
-        const actionError = Array.isArray(params.error)
-            ? params.error.map(unknown2actionError_1.unknown2actionError)
-            : (0, unknown2actionError_1.unknown2actionError)(params.error);
-        const doc = await this.informActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
-                error: actionError,
-                endDate: new Date()
-            }
-        }, { new: true, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.informActionModel.modelName);
-        }
+        await this.giveUpAction(params);
     }
     async findInformActions(params, inclusion) {
         const conditions = InformActionRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -18,7 +18,7 @@ class PayActionRepo extends actionProcess_1.ActionProcessRepo {
      * デフォルトでCompletedActionStatusのみ参照
      */
     async findPayActionByPaymentMethodId(params) {
-        const payActions = await this.findAnyActions({
+        const payActions = await this.findAnyActionsLegacy({
             limit: 1,
             page: 1,
             actionStatus: (Array.isArray(params.actionStatus?.$in))

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

@@ -1,15 +1,17 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/update';
+import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';
 type StartableActionType = factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction | factory.actionType.DeleteAction;
 type IAction<T extends StartableActionType> = T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IAction : never;
 type IActionAttributes<T extends StartableActionType> = T extends factory.actionType.AddAction ? factory.action.update.add.IAttributes : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAttributes : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAttributes : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IAttributes : never;
+type IResult<T extends StartableActionType> = T extends factory.actionType.AddAction ? factory.action.update.add.IResult : T extends factory.actionType.UpdateAction ? factory.action.update.update.IResult : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IResult : T extends factory.actionType.DeleteAction ? factory.action.update.deleteAction.IResult : never;
 type IKeyOfProjection = keyof IDocType;
 type IFindParams = factory.action.update.update.IFindParams;
 /**
  * リソース編集アクションリポジトリ
  */
-export declare class UpdateActionRepo {
+export declare class UpdateActionRepo extends DedicatedActionProcessRepo<StartableActionType, never> {
     private readonly updateActionModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'object' | 'project' | 'result' | 'startFrom' | 'startThrough' | 'typeOf'>): FilterQuery<IDocType>[];
@@ -17,16 +19,16 @@ export declare class UpdateActionRepo {
      * アクション開始
      */
     startUpdateAction<T extends StartableActionType>(attributes: IActionAttributes<T>): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
-    completeUpdateAction(params: {
-        typeOf: StartableActionType;
+    completeUpdateAction<T extends StartableActionType>(params: {
+        typeOf: T;
         id: string;
-        result: any;
+        result: IResult<T>;
     }): Promise<void>;
     /**
      * アクション失敗
      */
-    giveUpUpdateAction(params: {
-        typeOf: StartableActionType;
+    giveUpUpdateAction<T extends StartableActionType>(params: {
+        typeOf: T;
         id: string;
         error: Error | Error[] | unknown;
     }): Promise<void>;

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateActionRepo = void 0;
-const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const update_1 = require("../mongoose/schemas/action/update");
-const unknown2actionError_1 = require("./unknown2actionError");
+const dedicatedActionProcess_1 = require("./dedicatedAction/dedicatedActionProcess");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'actionStatus',
@@ -24,10 +23,18 @@ const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * リソース編集アクションリポジトリ
  */
-class UpdateActionRepo {
+class UpdateActionRepo extends dedicatedActionProcess_1.DedicatedActionProcessRepo {
     updateActionModel;
     constructor(connection) {
-        this.updateActionModel = connection.model(update_1.modelName, (0, update_1.createSchema)());
+        const updateActionModel = connection.model(update_1.modelName, (0, update_1.createSchema)());
+        super({
+            connection,
+            actionModel: updateActionModel
+        }, {
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
+        });
+        this.updateActionModel = updateActionModel;
     }
     static CREATE_MONGO_CONDITIONS(params) {
         const andConditions = [];
@@ -64,60 +71,16 @@ class UpdateActionRepo {
      * アクション開始
      */
     async startUpdateAction(attributes) {
-        const startDate = new Date();
-        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
-        const creatingAction = {
-            ...attributes,
-            actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate,
-            expires
-        };
-        const result = await this.updateActionModel.insertMany(creatingAction, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory_1.factory.errors.Internal('action not saved');
-        }
-        return { id, startDate, typeOf: creatingAction.typeOf };
+        return this.startAction(attributes); // eslint-disable-line @typescript-eslint/no-explicit-any
     }
     async completeUpdateAction(params) {
-        const doc = await this.updateActionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf }
-        }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
-                result: params.result,
-                endDate: new Date()
-            }
-        }, { new: false, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.updateActionModel.modelName);
-        }
+        await this.completeAction(params);
     }
     /**
      * アクション失敗
      */
     async giveUpUpdateAction(params) {
-        const actionError = Array.isArray(params.error)
-            ? params.error.map(unknown2actionError_1.unknown2actionError)
-            : (0, unknown2actionError_1.unknown2actionError)(params.error);
-        const doc = await this.updateActionModel.findOneAndUpdate({
-            typeOf: { $eq: params.typeOf },
-            _id: { $eq: params.id }
-        }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
-                error: actionError,
-                endDate: new Date()
-            }
-        }, { new: true, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.updateActionModel.modelName);
-        }
+        await this.giveUpAction(params);
     }
     async findUpdateActions(params, inclusion) {
         const conditions = UpdateActionRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -1,6 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/use';
+import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';
 type StartableActionType = factory.actionType.UseAction;
 type IAction = IDocType & {
     id: string;
@@ -10,7 +11,7 @@ type IFindParams = factory.action.consume.use.reservation.IFindParams;
 /**
  * 予約使用アクションリポジトリ
  */
-export declare class UseActionRepo {
+export declare class UseActionRepo extends DedicatedActionProcessRepo<StartableActionType, never> {
     private readonly useActionModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'actionStatus' | 'id' | 'object' | 'project' | 'startFrom' | 'startThrough'>): FilterQuery<IDocType>[];

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UseActionRepo = void 0;
-const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const use_1 = require("../mongoose/schemas/action/use");
-const unknown2actionError_1 = require("./unknown2actionError");
+const dedicatedActionProcess_1 = require("./dedicatedAction/dedicatedActionProcess");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'actionStatus',
@@ -22,10 +21,18 @@ const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * 予約使用アクションリポジトリ
  */
-class UseActionRepo {
+class UseActionRepo extends dedicatedActionProcess_1.DedicatedActionProcessRepo {
     useActionModel;
     constructor(connection) {
-        this.useActionModel = connection.model(use_1.modelName, (0, use_1.createSchema)());
+        const useActionModel = connection.model(use_1.modelName, (0, use_1.createSchema)());
+        super({
+            connection,
+            actionModel: useActionModel
+        }, {
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
+        });
+        this.useActionModel = useActionModel;
     }
     static CREATE_MONGO_CONDITIONS(params) {
         const andConditions = [];
@@ -59,54 +66,16 @@ class UseActionRepo {
      * アクション開始
      */
     async startUseAction(attributes) {
-        const startDate = new Date();
-        const expires = new Date(startDate.getTime() + EXPIRE_AFTER_SECONDS * 1000);
-        const creatingAction = {
-            ...attributes,
-            actionStatus: factory_1.factory.actionStatusType.ActiveActionStatus,
-            startDate,
-            expires
-        };
-        const result = await this.useActionModel.insertMany(creatingAction, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory_1.factory.errors.Internal('action not saved');
-        }
-        return { id, startDate, typeOf: creatingAction.typeOf };
+        return this.startAction(attributes);
     }
     async completeUseAction(params) {
-        const doc = await this.useActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
-                // result: params.result,
-                endDate: new Date()
-            }
-        }, { new: false, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.useActionModel.modelName);
-        }
+        await this.completeAction(params);
     }
     /**
      * アクション失敗
      */
     async giveUpUseAction(params) {
-        const actionError = Array.isArray(params.error)
-            ? params.error.map(unknown2actionError_1.unknown2actionError)
-            : (0, unknown2actionError_1.unknown2actionError)(params.error);
-        const doc = await this.useActionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
-                error: actionError,
-                endDate: new Date()
-            }
-        }, { new: true, projection: { _id: 1 } })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.useActionModel.modelName);
-        }
+        await this.giveUpAction(params);
     }
     async findUseActions(params, inclusion) {
         const conditions = UseActionRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -17,7 +17,7 @@ export declare class AdminActionRepo extends ActionProcessRepo<IAction<Startable
     /**
      * 汎用アクション検索
      */
-    adminFindAnyActions(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAction<factory.actionType>[]>;
+    adminFindAnyActions(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAction<StartableActionType>[]>;
     /**
      * 取引に対するアクションを検索する
      */

package/lib/chevre/repo/adminAction.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminActionRepo = void 0;
 const factory_1 = require("../factory");
+const settings_1 = require("../settings");
 const actionProcess_1 = require("./action/anyAction/actionProcess");
+const createMongoConditions_1 = require("./factory/action/createMongoConditions");
 /**
  * アクション管理リポジトリ
  */
@@ -17,7 +19,31 @@ class AdminActionRepo extends actionProcess_1.ActionProcessRepo {
      * 汎用アクション検索
      */
     async adminFindAnyActions(params, inclusion) {
-        return this.findAnyActions(params, inclusion);
+        const conditions = (0, createMongoConditions_1.createMongoConditions)(params);
+        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((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));
+        }
+        /* istanbul ignore else */
+        if (params.sort?.startDate !== undefined) {
+            query.sort({ startDate: params.sort.startDate });
+        }
+        // const explainResult = await (<any>query).explain();
+        // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
     }
     /**
      * 取引に対するアクションを検索する

package/lib/chevre/repo/factory/action/createMongoConditions.d.ts

@@ -0,0 +1,4 @@
+import { FilterQuery } from 'mongoose';
+import { factory } from '../../../factory';
+import { IDocType } from '../../mongoose/schemas/action';
+export declare function createMongoConditions(params: factory.action.ISearchConditions): FilterQuery<IDocType>[];