@chevre/domain 24.0.0-alpha.26 → 24.0.0-alpha.28

package/lib/chevre/errorHandler.js

@@ -84,7 +84,7 @@ async function handleMongoError(error) {
     // handle CastError(2025-10-27~)
     // CastError: Cast to ObjectId failed for value "xxx" (type string) at path "_id" for model "xxxxxxxxxxxxx"
     if (handledError instanceof mongooseError.CastError) {
-        handledError = new factory_1.errors.Argument(`${handledError.model?.modelName}.${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
+        handledError = new factory_1.errors.Argument(`${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
     }
     return handledError;
 }

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

@@ -12,11 +12,15 @@ export declare class AccountTitleRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle> & factory.accountTitle.IAccountTitle & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle, {}, {}> & factory.accountTitle.IAccountTitle & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle> & factory.accountTitle.IAccountTitle & {
+    } & {
+        __v: number;
+    }, import("mongoose").QueryOptions<factory.accountTitle.IAccountTitle>, (import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle, {}, {}> & factory.accountTitle.IAccountTitle & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

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

@@ -25,8 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptCOAOfferActionRepo = void 0;
 const factory = __importStar(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");
 /**

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

@@ -7,6 +7,7 @@ export type IAcceptPayAction = factory.action.accept.pay.IAction;
 export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAction, IActionRecipe<factory.recipe.RecipeCategory.publishPaymentUrl>> {
     /**
      * 注文取引から検索する
+     * 件数はlimitされない
      */
     findAcceptActionsByPurpose(params: {
         project: {
@@ -27,6 +28,9 @@ export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAct
             id: string;
         };
         object: {
+            /**
+             * 決済取引番号
+             */
             transactionNumber: string;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptPayAction[]>;

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptPayActionRepo = void 0;
 const factory = __importStar(require("../../factory"));
-const settings_1 = require("../../settings");
+// 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");
@@ -35,65 +35,53 @@ const actionProcess_1 = require("./actionProcess");
 class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
     /**
      * 注文取引から検索する
+     * 件数はlimitされない
      */
     async findAcceptActionsByPurpose(params, inclusion) {
-        const andConditions = [
-            { typeOf: { $eq: factory.actionType.AcceptAction } },
-            { 'project.id': { $eq: params.project.id } },
-            { 'object.typeOf': { $exists: true, $eq: factory.assetTransactionType.Pay } },
-            { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
-        ];
-        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({ $and: andConditions }, projection);
-        // if (typeof params.limit === 'number' && params.limit > 0) {
-        //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-        //     query.limit(params.limit)
-        //         .skip(params.limit * (page - 1));
+        return this.findAnyActions({
+            project: { id: { $eq: params.project.id } },
+            typeOf: { $eq: factory.actionType.AcceptAction }, // 採用アクション
+            purpose: { id: { $in: [params.purpose.id] } },
+            object: {
+                typeOf: { $eq: factory.assetTransactionType.Pay } // 対象が決済取引
+            }
+        }, inclusion);
+        // const andConditions: FilterQuery<IAcceptPayAction>[] = [
+        //     { typeOf: { $eq: factory.actionType.AcceptAction } },
+        //     { 'project.id': { $eq: params.project.id } },
+        //     { 'object.typeOf': { $exists: true, $eq: factory.assetTransactionType.Pay } },
+        //     { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
+        // ];
+        // let positiveProjectionFields: IKeyOfProjection[] = AVAILABLE_PROJECT_FIELDS;
+        // if (Array.isArray(inclusion) && inclusion.length > 0) {
+        //     positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         // }
-        // /* 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();
+        // const projection: ProjectionType<IAcceptPayAction> = {
+        //     _id: 0,
+        //     id: { $toString: '$_id' },
+        //     ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+        // };
+        // const query = this.actionModel.find({ $and: andConditions }, projection);
+        // return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+        //     .lean<IAcceptPayAction[]>()
+        //     .exec();
     }
     /**
      * 決済取引番号から完了済の決済採用アクションを参照する
      */
     async findCompletedAcceptActionsByTransactionNumber(params, inclusion) {
-        const andConditions = [
-            { typeOf: { $eq: factory.actionType.AcceptAction } },
-            { actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus } },
-            { 'project.id': { $eq: params.project.id } },
-            { 'purpose.id': { $exists: true, $eq: params.purpose.id } },
-            { 'object.typeOf': { $exists: true, $eq: factory.assetTransactionType.Pay } },
-            { 'object.transactionNumber': { $exists: true, $eq: params.object.transactionNumber } }
-        ];
-        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({ $and: andConditions }, projection);
-        query.limit(1); // ひとまず1つだけでよい
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
+        return this.findAnyActions({
+            limit: 1, // ひとまず1つだけでよい
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            typeOf: { $eq: factory.actionType.AcceptAction }, // 採用アクション
+            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            purpose: { id: { $in: [params.purpose.id] } },
+            object: {
+                transactionNumber: { $eq: params.object.transactionNumber },
+                typeOf: { $eq: factory.assetTransactionType.Pay } // 対象が決済取引
+            }
+        }, inclusion);
     }
 }
 exports.AcceptPayActionRepo = AcceptPayActionRepo;

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

@@ -39,6 +39,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
     protected readonly actionModel: IActionModel;
     protected readonly actionRecipeModel: IActionRecipeModel;
     constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
     /**
      * アクション開始
      */
@@ -111,5 +112,34 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         };
     }): Promise<Pick<TAction, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     private findActionStatusById;
-    protected upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 汎用アクション検索
+     * 継承クラスから呼ぶ想定
+     */
+    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;
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+        sort?: factory.action.ISortOrder;
+    }): Promise<TAction[]>;
+    protected upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<void>;
 }