@chevre/domain 25.2.0-alpha.9 → 26.0.0-alpha.0

package/lib/chevre/repo/stockHolder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolderRepo = void 0;
-// import type { RedisClientType } from 'redis';
 const factory_1 = require("../factory");
 const pendingReservation_1 = require("./pendingReservation");
 const SEARCH_OFFERS_MAX_LENGTH = 100;
@@ -9,36 +8,11 @@ const SEARCH_OFFERS_MAX_LENGTH = 100;
  * 保留予約リポジトリ
  */
 class StockHolderRepo {
-    // public static KEY_PREFIX_NEW: string = 'stockHolder';
-    // private readonly redisClient: RedisClientType | undefined;
     pendingReservationRepo;
     constructor(params) {
         const { connection } = params;
-        // this.redisClient = redisClient;
         this.pendingReservationRepo = new pendingReservation_1.PendingReservationRepo(connection);
     }
-    // private static offer2field(params: IOffer, hasTicketedSeat: boolean) {
-    //     if (hasTicketedSeat) {
-    //         return `${params.seatSection}:${params.seatNumber}`;
-    //     } else {
-    //         // 予約IDをfieldにする場合
-    //         const serviceOutputId = params.itemOffered?.serviceOutput?.id;
-    //         if (typeof serviceOutputId === 'string') {
-    //             return serviceOutputId;
-    //         } else {
-    //             throw new factory.errors.Internal('offer2field requires itemOffered.serviceOutput.id');
-    //         }
-    //     }
-    // }
-    // private static createKey(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): string {
-    //     if (!(params.startDate instanceof Date)) {
-    //         throw new factory.errors.Argument('startDate', 'must be Date');
-    //     }
-    //     return `${StockHolderRepo.KEY_PREFIX_NEW}:${params.eventId}`;
-    // }
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -54,16 +28,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            // await this.redisClient.watch(key);
-            // const hashCount = await this.redisClient.hLen(key);
-            // if (hashCount + lockKey.offers.length > maximum) {
-            //     throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
-            // }
-            // await this.lock(lockKey);
         }
     }
     /**
@@ -79,59 +43,11 @@ class StockHolderRepo {
             startDate: lockKey.startDate,
             hasTicketedSeat: lockKey.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-        // await this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.lock(lockKey);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const value = lockKey.holder;
-            // const multi = this.redisClient.multi();
-            // const fields = lockKey.offers.map((offer) => StockHolderRepo.offer2field(offer, lockKey.hasTicketedSeat));
-            // // check uniqueness(2025-04-20~)
-            // const uniqueFields = [...new Set(fields)];
-            // if (uniqueFields.length !== fields.length) {
-            //     throw new factory.errors.Argument('offers', 'offers must be unique');
-            // }
-            // fields.forEach((field) => {
-            //     multi.hSetNX(key, field, value);
-            // });
-            // const results = await multi.expireAt(
-            //     key,
-            //     moment(lockKey.expires)
-            //         .unix()
-            // )
-            //     .exec();
-            // const lockedFields: string[] = [];
-            // if (Array.isArray(results)) {
-            //     results.slice(0, fields.length)
-            //         .forEach((r, index) => {
-            //             if (r === 1 || (<any>r) === true) {
-            //                 lockedFields.push(fields[index]);
-            //             }
-            //         });
-            // }
-            // const lockedAll = lockedFields.length === fields.length;
-            // // expireAtReplyの検証も追加する(2023-04-19~)
-            // const expiredAll = results.slice(fields.length)
-            //     .every((r) => (r === 1 || (<any>r) === true));
-            // if (!lockedAll || !expiredAll) {
-            //     if (lockedFields.length > 0) {
-            //         // 全て仮押さえできなければ仮押さえできたものは解除
-            //         await this.redisClient.multi()
-            //             .hDel(key, lockedFields)
-            //             .exec();
-            //     }
-            //     if (!lockedAll) {
-            //         throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
-            //     } else {
-            //         throw new factory.errors.Internal('timeout cannot be set unexpectedly');
-            //     }
-            // }
         }
     }
     /**
@@ -144,20 +60,11 @@ class StockHolderRepo {
             startDate: params.startDate,
             hasTicketedSeat: params.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-        // await this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.unlock(params);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // await this.redisClient.multi()
-            //     .hDel(key, field)
-            //     .exec();
         }
     }
     /**
@@ -174,16 +81,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-            // const reply = await this.redisClient.hLen(key);
-            // let fieldCount: number = 0;
-            // if (typeof reply === 'number') {
-            //     fieldCount = Number(reply);
-            // }
-            // return fieldCount;
         }
     }
     /**
@@ -200,12 +97,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // return this.redisClient.hGet(key, field);
         }
     }
     async searchHolders(params) {
@@ -223,32 +114,8 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const fields = params.offers.map((o) => {
-            //     return StockHolderRepo.offer2field(o, params.hasTicketedSeat);
-            // });
-            // // Array reply: list of values associated with the given fields, in the same order as they are requested.
-            // const result = await this.redisClient.hmGet(key, fields);
-            // if (!Array.isArray(result)) {
-            //     throw new factory.errors.Internal(`searchAvailability got non-array: ${typeof result}`);
-            // }
-            // // そのまま返却(2023-04-17~)
-            // return result;
         }
     }
-    // public async checkIfConflicted(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): Promise<void> {
-    //     const redisKeyExists = await this.redisKeyExists(params);
-    //     const mongoDocExists = await this.pendingReservationRepo.docExists(params);
-    //     if (redisKeyExists && mongoDocExists) {
-    //         throw new factory.errors.Internal(`repository conflicted. eventId:${params.eventId}`);
-    //     }
-    // }
     /**
      * 新リポジトリを使用するかどうか
      */
@@ -258,19 +125,6 @@ class StockHolderRepo {
         }
         // always use mongo(2025-08-17~)
         return true;
-        // let useMongoose = false;
-        // const redisKeyExists = await this.redisKeyExists(params);
-        // if (redisKeyExists) {
-        //     useMongoose = false;
-        // } else {
-        //     // redis keyが存在しなければmongo利用
-        //     useMongoose = true;
-        // }
-        // // check confliction for test
-        // if (USE_STOCK_HOLDER_CHECK_CONFLICT) {
-        //     await this.checkIfConflicted(params);
-        // }
-        // return useMongoose;
     }
 }
 exports.StockHolderRepo = StockHolderRepo;

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

@@ -1,45 +1,29 @@
-import type { AnyKeys, Connection, FilterQuery, ProjectionType, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
 import { IModel, IDocType } from './mongoose/schemas/task';
 import type { IExecutableTask } from '../taskSettings';
-interface IAggregationByStatus {
-    taskCount: number;
-    avgLatency: number;
-    maxLatency: number;
-    minLatency: number;
-    percentilesLatency: {
-        name: string;
-        value: number;
-    }[];
-}
-interface IStatus {
-    status: factory.taskStatus;
-    aggregation: IAggregationByStatus;
-}
-export interface IAggregateTask {
-    statuses: IStatus[];
-}
-interface IOptionOnCreate {
-    emitImmediately: boolean;
-}
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
-type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'>;
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+/**
+ * リトライ可能なタスク作成属性
+ */
+type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'> & {
+    expires?: Date;
+};
 /**
  * タスクリポジトリ
  */
 export declare class TaskRepo {
     readonly taskModel: IModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/deleteTransaction").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").ITask>[];
-    runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'expires' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
+    runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;
         expires: Date;
     }, next: INextFunction): Promise<{
         id: string;
     }>;
-    saveMany(taskAttributes: ICreatingTask[], options: IOptionOnCreate): Promise<{
+    saveMany(taskAttributes: ICreatingTask[]): Promise<{
         id: string;
     }[]>;
     /**
@@ -61,12 +45,10 @@ export declare class TaskRepo {
      */
     createIfNotExistByAlternateName(params: ICreatingTask & {
         alternateName: string;
-    }, options: IOptionOnCreate): Promise<void>;
-    /**
-     * 取引削除タスク冪等作成
-     */
-    createDeleteTransactionTaskIfNotExist(params: Pick<factory.task.IAttributes<factory.taskName.DeleteTransaction>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>, options: IOptionOnCreate): Promise<void>;
-    createOnAssetTransactionStatusChangedTaskIfNotExist(params: Pick<factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>, options: IOptionOnCreate): Promise<void>;
+        identifier: string;
+        expires?: never;
+    }): Promise<void>;
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params: Pick<factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>): Promise<void>;
     /**
      * Ready -> remainingNumberOfTriesが1減る
      * Running -> findOneするだけ
@@ -137,7 +119,7 @@ export declare class TaskRepo {
             name: string;
         };
         nameFilterBeforeRunsAt: boolean;
-    }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */
@@ -190,28 +172,28 @@ export declare class TaskRepo {
         status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
         executionResult: factory.task.IExecutionResult;
     }, next?: INextFunction): Promise<void>;
-    count(params: factory.task.ISearchConditions): Promise<{
-        count: number;
-    }>;
     /**
-     * 検索する
+     * タスクの状態を参照する
+     * 非同期アクション移行が完了したら廃止する(2026-07-29~)
      */
-    projectFields(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
+    findTaskById(params: {
+        id: {
+            $eq: string;
+        };
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        name: factory.taskName;
+    }, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    } | undefined)>;
     deleteByProject(params: {
         project: {
             id: string;
         };
     }): Promise<void>;
-    deleteByName(params: {
-        name: factory.taskName;
-        status?: {
-            $eq?: factory.taskStatus;
-        };
-        runsAt?: {
-            $gte: Date;
-            $lte: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
     /**
      * 不要なタスクを削除する
      */
@@ -229,28 +211,5 @@ export declare class TaskRepo {
     }): Promise<{
         count: number;
     }>;
-    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
-    unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.task.ITask<factory.taskName>>;
-        $unset: AnyKeys<factory.task.ITask<factory.taskName>>;
-    }): Promise<UpdateWriteOpResult>;
-    aggregateTask(params: {
-        project?: {
-            id?: {
-                $ne?: string;
-            };
-        };
-        runsFrom: Date;
-        runsThrough: Date;
-    }): Promise<IAggregateTask>;
-    private agggregateByStatus;
 }
 export {};