From 410caff427efe85f11353ceaca9026872fde2f32 Mon Sep 17 00:00:00 2001
From: Ihar Tsykala <tsykalaihar@gmail.com>
Date: Fri, 4 Oct 2024 16:26:57 +0500
Subject: [PATCH] fix:types of filters for findAndCount and count[3966] (#4210)

Co-authored-by: Ihar <igor.tsykala@envisionblockchain.com>
---
 common/src/database-modules/database-server.ts | 4 ++--
 common/src/helpers/db-helper.ts                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/database-modules/database-server.ts b/common/src/database-modules/database-server.ts
index b6025007fc..b0e1ecd05a 100644
--- a/common/src/database-modules/database-server.ts
+++ b/common/src/database-modules/database-server.ts
@@ -238,7 +238,7 @@ export class DatabaseServer extends AbstractDatabaseServer  {
      * @param filters
      * @param options
      */
-    public async count<T extends BaseEntity>(entityClass: new () => T, filters: FilterObject<T>, options?: FindOptions<unknown>): Promise<number> {
+    public async count<T extends BaseEntity>(entityClass: new () => T, filters: FilterQuery<T>, options?: FindOptions<unknown>): Promise<number> {
         if (this.dryRun) {
 
             const _filters = {
@@ -280,7 +280,7 @@ export class DatabaseServer extends AbstractDatabaseServer  {
      * @param filters
      * @param options
      */
-    public async findAndCount<T extends BaseEntity>(entityClass: new () => T, filters: FilterObject<T> | string | ObjectId, options?: unknown): Promise<[T[], number]> {
+    public async findAndCount<T extends BaseEntity>(entityClass: new () => T, filters: FilterQuery<T> | string | ObjectId, options?: unknown): Promise<[T[], number]> {
         return await new DataBaseHelper(entityClass).findAndCount(filters, options);
     }
 
diff --git a/common/src/helpers/db-helper.ts b/common/src/helpers/db-helper.ts
index 828e0aa308..1d3b926f1c 100644
--- a/common/src/helpers/db-helper.ts
+++ b/common/src/helpers/db-helper.ts
@@ -577,7 +577,7 @@ export class DataBaseHelper<T extends BaseEntity> extends AbstractDataBaseHelper
      * @returns Entities and count
      */
     @CreateRequestContext(() => DataBaseHelper.orm)
-    public async findAndCount(filters: FilterObject<T> | string | ObjectId, options?: unknown): Promise<[T[], number]> {
+    public async findAndCount(filters: FilterQuery<T> | string | ObjectId, options?: unknown): Promise<[T[], number]> {
         return await this._em.findAndCount(this.entityClass, filters, options);
     }
 
@@ -588,7 +588,7 @@ export class DataBaseHelper<T extends BaseEntity> extends AbstractDataBaseHelper
      * @returns Count
      */
     @CreateRequestContext(() => DataBaseHelper.orm)
-    public async count(filters?: FilterObject<T> | string | ObjectId, options?: FindOptions<unknown>): Promise<number> {
+    public async count(filters?: FilterQuery<T> | string | ObjectId, options?: FindOptions<unknown>): Promise<number> {
         return await this._em.count(this.entityClass, filters, options);
     }