@chevre/domain 26.0.0-alpha.8 → 26.0.0

package/lib/chevre/eventEmitter/task.d.ts

@@ -16,9 +16,6 @@ interface IReadyTask {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready;
-    remainingNumberOfTries?: never;
-    expires?: Date;
-    executionResult?: never;
 }
 /**
  * タスク名不明の遅延実行中タスク
@@ -27,9 +24,6 @@ interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
     name?: never;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
  * タスク名指定での遅延実行中タスク
@@ -38,35 +32,26 @@ interface IRunningTaskByName {
     id: string;
     status: factory.taskStatus.Running;
     name: factory.taskName;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
- * 実行後タスクイベント
+ * タスクステータス変更イベント発火時パラメータとしてのタスク
  */
-interface IExecutedTask {
+type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName;
+type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
+interface ITaskAsNextFunctionParam {
     id: string;
     status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
     name: factory.taskName;
-    executionResult: factory.task.IExecutionResult;
-    /**
-     * 実行されたタスクの残り試行回数
-     */
-    remainingNumberOfTries: number;
-    expires?: never;
 }
-type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
-type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
-type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
+type IAsyncActionNextFunction = (task: ITaskAsNextFunctionParam) => IOperationExecute<void>;
+type IOnTaskStatusChangedListener = (task: IChangedTask) => void;
 type RedisClientType = ReturnType<typeof createClient>;
 /**
  * タスクイベントエミッター
  */
 declare class TaskEventEmitter extends EventEmitter {
     onTaskStatusChanged(listener: IOnTaskStatusChangedListener): void;
-    emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
+    emitTaskStatusChanged(task: IChangedTask): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecuteSettings, IOnTaskStatusChangedListener, taskEventEmitter, ITaskAsNextFunctionParam, IAsyncActionNextFunction };

package/lib/chevre/eventEmitter/task.js

@@ -14,8 +14,8 @@ class TaskEventEmitter extends events_1.EventEmitter {
         this.on(EventName.OnTaskStatusChanged, listener);
     }
     // support next function required(2025-05-25~)
-    emitTaskStatusChanged(task, next) {
-        this.emit(EventName.OnTaskStatusChanged, task, (typeof next === 'function') ? next : undefined);
+    emitTaskStatusChanged(task) {
+        this.emit(EventName.OnTaskStatusChanged, task);
     }
 }
 const taskEventEmitter = new TaskEventEmitter();

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

@@ -27,13 +27,6 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
         acceptedOffers: [IAcceptedOffer];
         _id?: never;
     })[]>;
-    aggreateOwnershipInfosByOrder(filter: {
-        orderNumber: {
-            $eq: string;
-        };
-    }): Promise<{
-        identifier: string;
-    }[]>;
     /**
      * 注文オファーを展開して検索する
      * 注文番号指定で1注文ドキュメントから参照する想定

package/lib/chevre/repo/acceptedOffer.js

@@ -105,33 +105,33 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             return orders;
         }
     }
-    async aggreateOwnershipInfosByOrder(filter) {
-        const aggregate = this.orderModel.aggregate([
-            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
-            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
-            {
-                $unwind: {
-                    path: '$acceptedOffers',
-                    includeArrayIndex: 'acceptedOfferIndex'
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    // acceptedOfferIndex: '$acceptedOfferIndex',
-                    // itemOfferedTypeOf: '$acceptedOffers.itemOffered.typeOf',
-                    // customerId: '$customer.id',
-                    // orderNumber: '$orderNumber',
-                    identifier: {
-                        $concat: ['$customer.id', '-', '$acceptedOffers.itemOffered.typeOf', '-', '$orderNumber', '-', { $toString: '$acceptedOfferIndex' }]
-                    }
-                }
-            }
-        ]);
-        return aggregate
-            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-    }
+    // public async aggreateOwnershipInfosByOrder(
+    //     filter: {
+    //         orderNumber: { $eq: string };
+    //     }
+    // ): Promise<{ identifier: string }[]> {
+    //     const aggregate = this.orderModel.aggregate<{ identifier: string }>([
+    //         { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+    //         { $match: { typeOf: { $eq: factory.order.OrderType.Order } } },
+    //         {
+    //             $unwind: {
+    //                 path: '$acceptedOffers',
+    //                 includeArrayIndex: 'acceptedOfferIndex'
+    //             }
+    //         },
+    //         {
+    //             $project: {
+    //                 _id: 0,
+    //                 identifier: {
+    //                     $concat: ['$customer.id', '-', '$acceptedOffers.itemOffered.typeOf', '-', '$orderNumber', '-', { $toString: '$acceptedOfferIndex' }]
+    //                 }
+    //             }
+    //         }
+    //     ]);
+    //     return aggregate
+    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
     /**
      * 注文オファーを展開して検索する
      * 注文番号指定で1注文ドキュメントから参照する想定

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

@@ -1,10 +1,12 @@
+import type { Connection } from 'mongoose';
 import { factory } from '../../factory';
-import { IActionRecipe, IKeyOfProjection, ActionProcessRepo } from './actionProcess';
+import { IActionRecipe, IKeyOfProjection, ActionProcessRepo } from './anyAction/actionProcess';
 export type IAcceptCOAOfferAction = factory.action.accept.coaOffer.IAction;
 /**
  * COAオファー採用リポジトリ
  */
 export declare class AcceptCOAOfferActionRepo extends ActionProcessRepo<IAcceptCOAOfferAction, IActionRecipe<factory.recipe.RecipeCategory.acceptCOAOffer>> {
+    constructor(connection: Connection);
     /**
      * 完了済の採用アクションを参照する
      */

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

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptCOAOfferActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
-const actionProcess_1 = require("./actionProcess");
+const actionProcess_1 = require("./anyAction/actionProcess");
+const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * COAオファー採用リポジトリ
  */
 class AcceptCOAOfferActionRepo extends actionProcess_1.ActionProcessRepo {
+    constructor(connection) {
+        super({ connection }, {
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
+        });
+    }
     /**
      * 完了済の採用アクションを参照する
      */

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

@@ -1,10 +1,12 @@
+import type { Connection } from 'mongoose';
 import { factory } from '../../factory';
-import { IKeyOfProjection, IActionRecipe, ActionProcessRepo } from './actionProcess';
+import { IKeyOfProjection, IActionRecipe, ActionProcessRepo } from './anyAction/actionProcess';
 export type IAcceptPayAction = factory.action.accept.pay.IAction;
 /**
  * 決済採用リポジトリ
  */
 export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAction, IActionRecipe<factory.recipe.RecipeCategory.publishPaymentUrl>> {
+    constructor(connection: Connection);
     /**
      * 注文取引から検索する
      * 件数はlimitされない

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

@@ -2,14 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptPayActionRepo = void 0;
 const factory_1 = require("../../factory");
-// import { MONGO_MAX_TIME_MS } from '../../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
-const actionProcess_1 = require("./actionProcess");
+const actionProcess_1 = require("./anyAction/actionProcess");
+const EXPIRE_AFTER_SECONDS = 2592000; // 30 days
 /**
  * 決済採用リポジトリ
  */
 class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
+    constructor(connection) {
+        super({ connection }, {
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            recipeExpireAfterSeconds: EXPIRE_AFTER_SECONDS
+        });
+    }
     /**
      * 注文取引から検索する
      * 件数はlimitされない

package/lib/chevre/repo/action/anyAction/actionProcess.d.ts

@@ -0,0 +1,120 @@
+import { Connection, FilterQuery } from 'mongoose';
+import { factory } from '../../../factory';
+import { IModel as IActionModel, IDocType } from '../../mongoose/schemas/action';
+import { ActionRecipeRepo, IActionRecipe, IRecipeAsActionAttributes } from './actionRecipe';
+export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
+type IAuthorizeAction = factory.action.authorize.invoice.IAction | factory.action.authorize.offer.eventService.IAction | factory.action.authorize.paymentMethod.any.IAction | factory.action.authorize.ticketedObject.IAction;
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? IAuthorizeAction : T extends factory.actionType.CheckAction ? factory.action.check.paymentMethod.movieTicket.IAction : T extends factory.actionType.CreateAction ? factory.action.create.IAction : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
+export interface ICancelActionAction {
+    typeOf: factory.actionType.CancelAction;
+    agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
+    endTime: Date;
+    startTime: Date;
+    sameAs?: {
+        id: string;
+        typeOf: 'Task';
+    };
+}
+export { IActionRecipe };
+export type IKeyOfProjection = keyof IDocType | 'id';
+export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
+interface IOptions {
+    expireAfterSeconds: number;
+    recipeExpireAfterSeconds: number;
+}
+export declare const DEFAULT_EXPIRE_AFTER_SECONDS = 17280000;
+export declare const RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS = 17280000;
+/**
+ * アクション状態管理リポジトリ
+ */
+export declare class ActionProcessRepo<TAction extends IAction<factory.actionType>, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> extends ActionRecipeRepo<TActionRecipe> {
+    protected readonly actionModel: IActionModel;
+    private options;
+    protected constructor(params: {
+        connection: Connection;
+    }, options: IOptions);
+    static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): FilterQuery<IDocType>[];
+    /**
+     * アクション開始
+     */
+    start<T extends TAction['typeOf']>(attributes: factory.action.IAttributes<T, any, any>, // eslint-disable-line @typescript-eslint/no-explicit-any
+    options?: {
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
+    completeWithVoid(params: {
+        typeOf: TAction['typeOf'];
+        id: string;
+        result: any;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<void>;
+    /**
+     * アクション取消
+     */
+    cancelWithVoid(params: {
+        typeOf: TAction['typeOf'];
+        id: string;
+        cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
+    }): Promise<void>;
+    /**
+     * アクション失敗
+     */
+    giveUp(params: {
+        typeOf: TAction['typeOf'];
+        id: string;
+        error: Error | Error[] | unknown;
+        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
+    }): Promise<void>;
+    findAnyActionById(params: {
+        typeOf: TAction['typeOf'];
+        id: string;
+    }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<TAction>;
+    searchBySameAs(params: {
+        sameAs: {
+            id: {
+                $eq: string;
+            };
+        };
+        purpose?: {
+            id: {
+                $eq: string;
+            };
+        };
+        /**
+         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+         */
+        typeOf: {
+            $eq: TAction['typeOf'];
+        };
+    }): Promise<Pick<TAction, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
+    private findActionStatusById;
+    /**
+     * 汎用アクション検索
+     * 継承クラスから呼ぶ想定
+     */
+    protected findAnyActions(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<TAction[]>;
+    /**
+     * 取引に対する汎用アクション検索
+     * 継承クラスから呼ぶ想定
+     * 件数はlimitされない
+     */
+    protected findAnyActionsByPurpose<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction>(params: {
+        typeOf?: T;
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        object?: {
+            typeOf?: {
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $in?: (factory.action.authorize.offer.eventService.ObjectType.SeatReservation)[];
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+        sort?: factory.action.ISortOrder;
+    }): Promise<TAction[]>;
+}

package/lib/chevre/repo/action/{actionProcess.js → anyAction/actionProcess.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionProcessRepo = exports.AVAILABLE_PROJECT_FIELDS = void 0;
-const factory_1 = require("../../factory");
-const settings_1 = require("../../settings");
-const action_1 = require("../mongoose/schemas/action");
-const actionRecipe_1 = require("../mongoose/schemas/actionRecipe");
+exports.ActionProcessRepo = exports.RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS = exports.DEFAULT_EXPIRE_AFTER_SECONDS = exports.AVAILABLE_PROJECT_FIELDS = void 0;
+const factory_1 = require("../../../factory");
+const settings_1 = require("../../../settings");
+const action_1 = require("../../mongoose/schemas/action");
+const unknown2actionError_1 = require("../unknown2actionError");
+const actionRecipe_1 = require("./actionRecipe");
 exports.AVAILABLE_PROJECT_FIELDS = [
     'project',
     'actionStatus',
@@ -19,43 +20,29 @@ exports.AVAILABLE_PROJECT_FIELDS = [
     'endDate',
     'purpose',
     'potentialActions',
-    // 'amount', // discontinue(2026-07-08~)
-    // 'fromLocation', // discontinue(2026-07-08~)
-    // 'toLocation', // discontinue(2026-07-08~)
     'instrument',
     'location',
-    'replacer',
-    'targetCollection',
     'sameAs',
     'cancelAction',
     'about',
-    'target',
-    'identifier'
+    'identifier',
+    'expires'
 ];
-// 内部で正規化関数を定義（または外部ヘルパーを呼び出す）
-function unknown2actionError(e) {
-    if (e instanceof Error) {
-        // Errorオブジェクトの場合は、既存のロジック通り展開
-        return { ...e, name: e.name, message: e.message };
-    }
-    else {
-        // Error以外（文字列など）が投げられた場合のハンドリング
-        return { name: 'UnknownError', message: String(e) };
-    }
-}
-;
+exports.DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days
+exports.RECIPE_DEFAULT_EXPIRE_AFTER_SECONDS = 17280000; // 200 days
 /**
  * アクション状態管理リポジトリ
  */
-class ActionProcessRepo {
+class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
     actionModel;
-    actionRecipeModel;
-    constructor(connection) {
-        this.actionModel = connection.model(action_1.modelName, (0, action_1.createSchema)());
-        this.actionRecipeModel = connection.model(actionRecipe_1.modelName, (0, actionRecipe_1.createSchema)());
+    options;
+    constructor(params, options) {
+        super(params, options);
+        this.actionModel = params.connection.model(action_1.modelName, (0, action_1.createSchema)());
+        this.options = options;
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
+        const andConditions = [];
         const idIn = params.id?.$in;
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
@@ -272,16 +259,6 @@ class ActionProcessRepo {
                 }
             });
         }
-        // 承認アクションのobject.event廃止につき検索条件も廃止(2026-07-04~)
-        // const objectEventIdIn = params.object?.event?.id?.$in;
-        // if (Array.isArray(objectEventIdIn)) {
-        //     andConditions.push({
-        //         'object.event.id': {
-        //             $exists: true,
-        //             $in: objectEventIdIn
-        //         }
-        //     });
-        // }
         const objectTransactionNumberEq = params.object?.transactionNumber?.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({ 'object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
@@ -322,60 +299,6 @@ class ActionProcessRepo {
                 startDate: { $lte: startDateLte }
             });
         }
-        // const fromLocationTypeOfIn = params.fromLocation?.typeOf?.$in;
-        // if (Array.isArray(fromLocationTypeOfIn)) {
-        //     andConditions.push({
-        //         'fromLocation.typeOf': {
-        //             $exists: true,
-        //             $in: fromLocationTypeOfIn
-        //         }
-        //     });
-        // }
-        // const fromLocationAccountNumberIn = params.fromLocation?.accountNumber?.$in;
-        // if (Array.isArray(fromLocationAccountNumberIn)) {
-        //     andConditions.push({
-        //         'fromLocation.accountNumber': {
-        //             $exists: true,
-        //             $in: fromLocationAccountNumberIn
-        //         }
-        //     });
-        // }
-        // const fromLocationAccountTypeIn = params.fromLocation?.accountType?.$in;
-        // if (Array.isArray(fromLocationAccountTypeIn)) {
-        //     andConditions.push({
-        //         'fromLocation.accountType': {
-        //             $exists: true,
-        //             $in: fromLocationAccountTypeIn
-        //         }
-        //     });
-        // }
-        // const toLocationTypeOfIn = params.toLocation?.typeOf?.$in;
-        // if (Array.isArray(toLocationTypeOfIn)) {
-        //     andConditions.push({
-        //         'toLocation.typeOf': {
-        //             $exists: true,
-        //             $in: toLocationTypeOfIn
-        //         }
-        //     });
-        // }
-        // const toLocationAccountNumberIn = params.toLocation?.accountNumber?.$in;
-        // if (Array.isArray(toLocationAccountNumberIn)) {
-        //     andConditions.push({
-        //         'toLocation.accountNumber': {
-        //             $exists: true,
-        //             $in: toLocationAccountNumberIn
-        //         }
-        //     });
-        // }
-        // const toLocationAccountTypeIn = params.toLocation?.accountType?.$in;
-        // if (Array.isArray(toLocationAccountTypeIn)) {
-        //     andConditions.push({
-        //         'toLocation.accountType': {
-        //             $exists: true,
-        //             $in: toLocationAccountTypeIn
-        //         }
-        //     });
-        // }
         const purposeTypeOfIn = params.purpose?.typeOf?.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({
@@ -453,15 +376,15 @@ class ActionProcessRepo {
     /**
      * アクション開始
      */
-    async start(
-    // public async start<T extends Exclude<TAction['typeOf'], factory.actionType.AcceptAction>>(
-    attributes, // eslint-disable-line @typescript-eslint/no-explicit-any
+    async start(attributes, // eslint-disable-line @typescript-eslint/no-explicit-any
     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
+            startDate,
+            expires
         };
         // reimplemnt with insertMany(2024-08-29~)
         const result = await this.actionModel.insertMany(creatingAction, { rawResult: true });
@@ -477,6 +400,7 @@ class ActionProcessRepo {
         return { id, startDate, typeOf: creatingAction.typeOf };
     }
     async completeWithVoid(params) {
+        const endDate = new Date();
         if (params.recipe?.typeOf === 'Recipe') {
             await this.upsertRecipe({ ...params.recipe, recipeFor: { id: params.id, typeOf: params.typeOf } });
         }
@@ -487,7 +411,7 @@ class ActionProcessRepo {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
                 result: params.result,
-                endDate: new Date()
+                endDate
             }
         }, { new: false, projection: { _id: 1 } })
             .lean()
@@ -538,12 +462,10 @@ class ActionProcessRepo {
      * アクション失敗
      */
     async giveUp(params) {
-        // const actionError: IActionError | IActionError[] = (Array.isArray(params.error))
-        //     ? params.error.map((e) => ({ ...e, message: e.message, name: e.name }))
-        //     : { ...params.error, message: params.error.message, name: params.error.name };
+        const endDate = new Date();
         const actionError = Array.isArray(params.error)
-            ? params.error.map(unknown2actionError)
-            : unknown2actionError(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 } });
         }
@@ -554,7 +476,7 @@ class ActionProcessRepo {
             $set: {
                 actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
                 error: actionError,
-                endDate: new Date()
+                endDate
             }
         }, { new: true, projection: { _id: 1 } })
             .lean()
@@ -563,37 +485,7 @@ class ActionProcessRepo {
             throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
         }
     }
-    /**
-     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
-     */
-    async giveUpStartDatePassedCertainPeriod(params) {
-        return this.actionModel.updateMany({
-            actionStatus: { $eq: factory_1.factory.actionStatusType.ActiveActionStatus },
-            // 一定期間過ぎたもの
-            startDate: { $lt: params.startDate.$lt },
-            ...(typeof params.id?.$eq === 'string') ? { _id: { $eq: params.id.$eq } } : undefined
-        }, {
-            actionStatus: factory_1.factory.actionStatusType.FailedActionStatus,
-            error: params.error,
-            endDate: new Date()
-        })
-            .exec();
-    }
-    async findRecipeByAction(params) {
-        return this.actionRecipeModel.findOne({
-            'project.id': { $eq: params.project.id },
-            'recipeFor.id': { $eq: params.recipeFor.id }
-        }, { step: 1, recipeCategory: 1 }
-        // { lean: true }
-        )
-            .lean()
-            .exec();
-        // if (result === null) {
-        //     throw new factory.errors.NotFound(this.actionRecipeModel.modelName);
-        // }
-        // return result;
-    }
-    async findById(params, inclusion, exclusion) {
+    async findAnyActionById(params, inclusion, exclusion) {
         let positiveProjectionFields = exports.AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => exports.AVAILABLE_PROJECT_FIELDS.includes(key));
@@ -750,26 +642,5 @@ class ActionProcessRepo {
             .lean()
             .exec();
     }
-    async upsertRecipe(savingRecipe) {
-        const dateModified = new Date();
-        const { typeOf, project, recipeCategory, recipeFor, step } = savingRecipe;
-        const filter = {
-            'recipeFor.id': { $eq: recipeFor.id }
-        };
-        const setOnInsert = {
-            project, typeOf, recipeCategory, recipeFor,
-            dateCreated: dateModified
-        };
-        const setKeys = { step, dateModified };
-        const update = {
-            $setOnInsert: setOnInsert,
-            $set: setKeys
-        };
-        await this.actionRecipeModel.updateOne(filter, update, {
-            upsert: true
-            // includeResultMetadata: true
-        })
-            .exec();
-    }
 }
 exports.ActionProcessRepo = ActionProcessRepo;

package/lib/chevre/repo/action/anyAction/actionRecipe.d.ts

@@ -0,0 +1,37 @@
+import { Connection } from 'mongoose';
+import { factory } from '../../../factory';
+import { IModel as IActionRecipeModel } from '../../mongoose/schemas/actionRecipe';
+export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice ? factory.action.authorize.invoice.IAuthorizeInvoiceRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice3ds ? factory.action.authorize.invoice.IAuthorizeInvoice3dsRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : T extends factory.recipe.RecipeCategory.cancelPendingCOAReserve ? factory.action.cancel.coaReserve.ICancelPendingCOAReserveRecipe : T extends factory.recipe.RecipeCategory.returnCOAReserve ? factory.action.transfer.returnAction.reserveTransaction.IReturnCOAReserveRecipe : T extends factory.recipe.RecipeCategory.sendEmailMessage ? factory.action.transfer.send.message.email.IRecipe : never;
+export type IRecipeAsDocument = factory.recipe.IRecipe & {
+    recipeFor: {
+        id: string;
+        typeOf: factory.actionType;
+    };
+    dateCreated: Date;
+    dateModified?: Date;
+    expires: Date;
+};
+export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> = Pick<IActionRecipe<T>, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
+interface IOptions {
+    recipeExpireAfterSeconds: number;
+}
+/**
+ * アクションレシピリポジトリ
+ */
+export declare class ActionRecipeRepo<TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> {
+    protected readonly actionRecipeModel: IActionRecipeModel;
+    private recipeOptions;
+    protected constructor(params: {
+        connection: Connection;
+    }, options: IOptions);
+    findRecipeByAction<T extends TActionRecipe['recipeCategory']>(params: {
+        project: {
+            id: string;
+        };
+        recipeFor: {
+            id: string;
+        };
+    }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
+    upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<void>;
+}
+export {};