refactor: Update Database class to initialize dataSourceOptions and d…

…ataSource as null
yonasBSD · Aug 13, 2024 · f36ea78 · f36ea78
1 parent 14cf7f0
commit f36ea78
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/Common/Server/Infrastructure/PostgresDatabase.ts b/Common/Server/Infrastructure/PostgresDatabase.ts
@@ -8,8 +8,8 @@ export type DatabaseSourceOptions = DataSourceOptions;
 export type DatabaseSource = DataSource;
 
 export default class Database {
-  protected dataSourceOptions!: DataSourceOptions;
-  protected dataSource!: DataSource | null;
+  protected dataSourceOptions: DataSourceOptions | null = null;
+  protected dataSource: DataSource | null = null;
 
   public getDatasourceOptions(): DataSourceOptions {
     this.dataSourceOptions = DatabaseDataSourceOptions;
@@ -96,6 +96,8 @@ export default class Database {
     await dropDatabase({
       options: this.getDatasourceOptions(),
     });
+    this.dataSource = null;
+    this.dataSourceOptions = null;
   }
 
   public async createDatabase(): Promise<void> {
@@ -118,3 +120,5 @@ export default class Database {
 }
 
 export const PostgresAppInstance: Database = new Database();
+
+
diff --git a/Common/Tests/Server/Services/ScheduledMaintenanceService.test.ts b/Common/Tests/Server/Services/ScheduledMaintenanceService.test.ts
@@ -13,6 +13,7 @@ import ProjectService from "../../../Server/Services/ProjectService";
 import ScheduledMaintenanceStateService from "../../../Server/Services/ScheduledMaintenanceStateService";
 import UserServiceHelper from "../TestingUtils/Services/UserServiceHelper";
 import UserService from "../../../Server/Services/UserService";
+import User from "../../../Models/DatabaseModels/User";
 
 describe("ScheduledMaintenanceService", () => {
   let testDatabase: Database;
@@ -31,7 +32,7 @@ describe("ScheduledMaintenanceService", () => {
     it("should trigger workflows only once", async () => {
       // Prepare scheduled maintenance
 
-      let user = UserServiceHelper.generateRandomUser();
+      let user: User = UserServiceHelper.generateRandomUser();
 
       user = await UserService.create({
         data: user,

diff --git a/Common/Tests/Server/TestingUtils/TestDatabase.ts b/Common/Tests/Server/TestingUtils/TestDatabase.ts
@@ -14,3 +14,5 @@ export default class TestDatabase extends PostgresDatabase {
     return this.dataSourceOptions;
   }
 }
+
+export const TestPostgresAppInstance: TestDatabase = new TestDatabase();
diff --git a/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts b/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts
@@ -1,26 +1,8 @@
-import TestDatabase from "../TestDatabase";
+import TestDatabase, { TestPostgresAppInstance } from "../TestDatabase";
 
 export class TestDatabaseMock {
   public static async getDbMock(): Promise<TestDatabase> {
-    const testDatabase: TestDatabase = new TestDatabase();
-
-    jest.mock("../../../../Server/Infrastructure/PostgresDatabase", () => {
-      const actualModule: any = jest.requireActual(
-        "../../../Server/Infrastructure/PostgresDatabase",
-      );
-      return {
-        __esModule: true,
-        default: actualModule.default,
-        PostgresAppInstance: {
-          getDataSource: () => {
-            return testDatabase.getDataSource();
-          },
-          isConnected: () => {
-            return testDatabase.isConnected();
-          },
-        },
-      };
-    });
+    const testDatabase: TestDatabase = TestPostgresAppInstance;
 
     await testDatabase.createAndConnect();
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,5 @@ export default class TestDatabase extends PostgresDatabase { @@
         return this.dataSourceOptions;
       }
     }
+    export const TestPostgresAppInstance: TestDatabase = new TestDatabase();