@chevre/domain 26.0.0-alpha.9 → 26.1.0-alpha.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,20 @@
+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);
+    findActionBySameAs(params: {
+        sameAs: {
+            id: string;
+        };
+        purpose?: {
+            id: string;
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/action/accept/coaOffer").IAction, "error" | "id" | "purpose" | "actionStatus"> | null>;
     /**
      * 完了済の採用アクションを参照する
      */

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

@@ -2,12 +2,35 @@
 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
+        });
+    }
+    async findActionBySameAs(params) {
+        return this.actionModel.findOne({
+            typeOf: { $eq: factory_1.factory.actionType.AcceptAction }, // 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();
+    }
     /**
      * 完了済の採用アクションを参照する
      */

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

@@ -1,10 +1,20 @@
+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);
+    findActionBySameAs(params: {
+        sameAs: {
+            id: string;
+        };
+        purpose?: {
+            id: string;
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/action/accept/pay").IAction, "error" | "id" | "purpose" | "actionStatus"> | null>;
     /**
      * 注文取引から検索する
      * 件数はlimitされない

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

@@ -2,21 +2,42 @@
 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
+        });
+    }
+    async findActionBySameAs(params) {
+        return this.actionModel.findOne({
+            typeOf: { $eq: factory_1.factory.actionType.AcceptAction }, // 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();
+    }
     /**
      * 注文取引から検索する
      * 件数はlimitされない
      */
     async findAcceptActionsByPurpose(params, inclusion) {
         const { actionStatus, limit, page } = params;
-        return this.findAnyActions({
+        return this.findAnyActionsLegacy({
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory_1.factory.actionType.AcceptAction }, // 採用アクション
             purpose: { id: { $in: [params.purpose.id] } },
@@ -34,7 +55,7 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
      * 決済取引番号から完了済の決済採用アクションを参照する
      */
     async findCompletedAcceptActionsByTransactionNumber(params, inclusion) {
-        return this.findAnyActions({
+        return this.findAnyActionsLegacy({
             limit: 1, // ひとまず1つだけでよい
             page: 1,
             project: { id: { $eq: params.project.id } },

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

@@ -0,0 +1,111 @@
+import { Connection } 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);
+    /**
+     * アクション開始
+     */
+    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>;
+    private findActionStatusById;
+    /**
+     * 汎用アクション検索
+     * 継承クラスから呼ぶ想定
+     */
+    protected findAnyActionsLegacy(params: Pick<factory.action.ISearchConditions, 'limit' | 'page' | 'project' | 'id' | 'actionStatus' | 'typeOf' | 'object' | 'purpose' | 'sameAs'> & {
+        sort?: never;
+        actionStatusTypes?: never;
+        agent?: never;
+        about?: never;
+        instrument?: never;
+        location?: never;
+        startFrom?: never;
+        startThrough?: never;
+        result?: never;
+    }, 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[]>;
+}