From 818be97e77331c30193a2e941ed954e7dfb41fa7 Mon Sep 17 00:00:00 2001
From: Christina Papadogianni <59121443+ChrisPdgn@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:02:45 +0300
Subject: [PATCH] fix(database): fix types in mongoose (#662)

---
 .../src/adapters/mongoose-adapter/MongooseSchema.ts       | 8 ++++----
 modules/database/src/adapters/mongoose-adapter/index.ts   | 1 -
 .../src/admin/customEndpoints/customEndpoints.admin.ts    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts b/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
index 1d7b4588b..bf0d6af06 100644
--- a/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
+++ b/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
@@ -127,7 +127,7 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
       scope?: string;
       populate?: string[];
     },
-  ) {
+  ): Promise<any> {
     let parsedFilter: Indexable | null = parseQuery(this.parseStringToQuery(filterQuery));
     parsedFilter = await this.getAuthorizedQuery(
       'edit',
@@ -158,7 +158,7 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
       scope?: string;
       populate?: string[];
     },
-  ) {
+  ): Promise<any> {
     let parsedFilter: Indexable | null = parseQuery(this.parseStringToQuery(filterQuery));
     parsedFilter = await this.getAuthorizedQuery(
       'edit',
@@ -259,7 +259,7 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
       userId?: string;
       scope?: string;
     },
-  ) {
+  ): Promise<any> {
     let { parsedQuery, modified } = await this.getPaginatedAuthorizedQuery(
       'read',
       parseQuery(this.parseStringToQuery(query)),
@@ -296,7 +296,7 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
       select?: string;
       populate?: string[];
     },
-  ) {
+  ): Promise<any> {
     let parsedQuery: Indexable | null = parseQuery(this.parseStringToQuery(query));
     parsedQuery = await this.getAuthorizedQuery(
       'read',
diff --git a/modules/database/src/adapters/mongoose-adapter/index.ts b/modules/database/src/adapters/mongoose-adapter/index.ts
index 5305c93bb..5f927c6d1 100644
--- a/modules/database/src/adapters/mongoose-adapter/index.ts
+++ b/modules/database/src/adapters/mongoose-adapter/index.ts
@@ -29,7 +29,6 @@ export class MongooseAdapter extends DatabaseAdapter<MongooseSchema> {
   mongoose: Mongoose;
   connectionString: string;
   options: ConnectOptions = {
-    keepAlive: true,
     minPoolSize: 5,
     connectTimeoutMS: this.maxConnTimeoutMs,
     serverSelectionTimeoutMS: this.maxConnTimeoutMs,
diff --git a/modules/database/src/admin/customEndpoints/customEndpoints.admin.ts b/modules/database/src/admin/customEndpoints/customEndpoints.admin.ts
index 14a6114c9..476926e6e 100644
--- a/modules/database/src/admin/customEndpoints/customEndpoints.admin.ts
+++ b/modules/database/src/admin/customEndpoints/customEndpoints.admin.ts
@@ -36,7 +36,7 @@ export class CustomEndpointsAdmin {
       .getSchemaModel('CustomEndpoints')
       .model.findMany({})
       .then(r =>
-        r.map(obj => {
+        r.map((obj: any) => {
           delete obj._id;
           delete obj.selectedSchema;
           delete obj.createdAt;