From 88f93915d60d97fdca680f1d7093ce76cd866092 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Sun, 22 May 2022 12:03:02 +0100
Subject: [PATCH] fix commonserver compile

---
 CommonServer/API/UserAPI.ts                                | 7 +++----
 CommonServer/Middleware/ProbeAuthorization.ts              | 5 ++---
 CommonServer/Middleware/ProjectAuthorization.ts            | 6 ++----
 CommonServer/Middleware/UserAuthorization.ts               | 5 +----
 CommonServer/Services/AlertChargeService.ts                | 2 +-
 CommonServer/Services/ApplicationLogContainer.ts           | 2 +-
 CommonServer/Services/ApplicationLogService.ts             | 2 +-
 .../Services/ApplicationSecurityRunInstanceLogService.ts   | 2 +-
 CommonServer/Services/ApplicationSecurityService.ts        | 2 +-
 CommonServer/Services/AutomatedScriptLogService.ts         | 2 +-
 CommonServer/Services/AutomatedScriptService.ts            | 2 +-
 CommonServer/Services/ComponentService.ts                  | 2 +-
 CommonServer/Services/ContainerSecurityLogService.ts       | 2 +-
 CommonServer/Services/ContainerSecurityService.ts          | 2 +-
 CommonServer/Services/CustomFieldService.ts                | 2 +-
 CommonServer/Services/DockerCredentialService.ts           | 2 +-
 CommonServer/Services/DomainVerificationTokenService.ts    | 2 +-
 CommonServer/Services/EmailLogService.ts                   | 2 +-
 CommonServer/Services/EmailTemplateService.ts              | 2 +-
 CommonServer/Services/EmailVerificationTokenService.ts     | 2 +-
 CommonServer/Services/ErrorEventService.ts                 | 2 +-
 CommonServer/Services/ErrorTrackerContainerService.ts      | 2 +-
 CommonServer/Services/EscalationService.ts                 | 2 +-
 CommonServer/Services/FeedbackService.ts                   | 2 +-
 CommonServer/Services/FileService.ts                       | 1 -
 CommonServer/Services/GitCredentialService.ts              | 2 +-
 CommonServer/Services/IncidentCommunicationSlaService.ts   | 2 +-
 CommonServer/Services/IncidentNoteService.ts               | 2 +-
 CommonServer/Services/IncidentNoteTemplateService.ts       | 2 +-
 CommonServer/Services/IncidentPrioritiesService.ts         | 2 +-
 CommonServer/Services/IncidentSMSActionService.ts          | 2 +-
 CommonServer/Services/IncidentService.ts                   | 2 +-
 CommonServer/Services/IncidentSettingService.ts            | 2 +-
 CommonServer/Services/IncidentTimelineService.ts           | 2 +-
 CommonServer/Services/IncomingCallRoutingLogService.ts     | 2 +-
 CommonServer/Services/IncomingCallRoutingService.ts        | 2 +-
 CommonServer/Services/IncomingRequestService.ts            | 2 +-
 CommonServer/Services/IntegrationService.ts                | 2 +-
 CommonServer/Services/IssueMemberService.ts                | 2 +-
 CommonServer/Services/IssueService.ts                      | 2 +-
 CommonServer/Services/IssueTimelineService.ts              | 2 +-
 CommonServer/Services/LeadService.ts                       | 2 +-
 CommonServer/Services/LighthouseLogService.ts              | 2 +-
 CommonServer/Services/LoginHistoryService.ts               | 2 +-
 CommonServer/Services/MailService.ts                       | 2 +-
 CommonServer/Services/MonitorCustomField.ts                | 2 +-
 CommonServer/Services/MonitorLogService.ts                 | 2 +-
 CommonServer/Services/MonitorService.ts                    | 2 +-
 CommonServer/Services/MonitorSlaService.ts                 | 2 +-
 CommonServer/Services/MonitorStatusService.ts              | 2 +-
 CommonServer/Services/NotificationService.ts               | 2 +-
 CommonServer/Services/OnCallScheduleDutyStatusService.ts   | 2 +-
 CommonServer/Services/PerformanceTrackerMetricService.ts   | 2 +-
 CommonServer/Services/PerformanceTrackerService.ts         | 2 +-
 CommonServer/Services/ProjectService.ts                    | 2 +-
 CommonServer/Services/ProjectSmtpConfigService.ts          | 2 +-
 CommonServer/Services/RealTimeService.ts                   | 1 +
 CommonServer/Services/ResourceLabelService.ts              | 2 +-
 CommonServer/Services/ScheduledEventNoteService.ts         | 2 +-
 CommonServer/Services/ScheduledEventService.ts             | 2 +-
 CommonServer/Services/SmsCountService.ts                   | 2 +-
 CommonServer/Services/SmsProviderService.ts                | 2 +-
 CommonServer/Services/SmsTemplateService.ts                | 2 +-
 CommonServer/Services/SslCertificateManagerService.ts      | 2 +-
 CommonServer/Services/SslCertificateService.ts             | 2 +-
 CommonServer/Services/SsoConfigService.ts                  | 2 +-
 CommonServer/Services/SsoDefaultRolesService.ts            | 2 +-
 CommonServer/Services/StatusPageCategoryService.ts         | 2 +-
 CommonServer/Services/StatusPageService.ts                 | 2 +-
 CommonServer/Services/SubscriberAlertService.ts            | 2 +-
 CommonServer/Services/SubscriberService.ts                 | 2 +-
 CommonServer/Services/TeamService.ts                       | 2 +-
 CommonServer/Services/UserAlertCallLogsService.ts          | 2 +-
 CommonServer/Services/UserAlertService.ts                  | 2 +-
 CommonServer/Services/UserService.ts                       | 2 +-
 .../Tests/TestingUtils/Services/UserTestService.ts         | 4 ++--
 Realtime/Services/RealtimeService.ts                       | 1 +
 77 files changed, 81 insertions(+), 87 deletions(-)

diff --git a/CommonServer/API/UserAPI.ts b/CommonServer/API/UserAPI.ts
index e27aef84e5..7054180a06 100644
--- a/CommonServer/API/UserAPI.ts
+++ b/CommonServer/API/UserAPI.ts
@@ -1,10 +1,9 @@
 import User from 'Common/Models/User';
-import UserService from '../Services/UserService';
+import UserService, { Service as UserServiceType } from '../Services/UserService';
 import BaseAPI from './BaseAPI';
-import Service from '../Services/Index';
 
-export default class UserAPI extends BaseAPI<User, UserService> {
+export default class UserAPI extends BaseAPI<User, UserServiceType> {
     public constructor() {
-        super(User, Service.UserService);
+        super(User, UserService);
     }
 }
diff --git a/CommonServer/Middleware/ProbeAuthorization.ts b/CommonServer/Middleware/ProbeAuthorization.ts
index f135861eef..28a1898f70 100644
--- a/CommonServer/Middleware/ProbeAuthorization.ts
+++ b/CommonServer/Middleware/ProbeAuthorization.ts
@@ -1,5 +1,5 @@
-import Services from '../Services/Index';
-import ProbeServiceClass from '../Services/ProbeService';
+
+import ProbeService from '../Services/ProbeService';
 import BadDataException from 'Common/Types/Exception/BadDataException';
 import Version from 'Common/Types/Version';
 
@@ -15,7 +15,6 @@ import ObjectID from 'Common/Types/ObjectID';
 import LocalCache from '../Infrastructure/LocalCache';
 import Probe from 'Common/Models/Probe';
 
-const ProbeService: ProbeServiceClass = Services.ProbeService;
 
 export default class ProbeMiddleware {
     public static async isAuthorizedProbeMiddleware(
diff --git a/CommonServer/Middleware/ProjectAuthorization.ts b/CommonServer/Middleware/ProjectAuthorization.ts
index 91c8c8fc62..10859d4002 100644
--- a/CommonServer/Middleware/ProjectAuthorization.ts
+++ b/CommonServer/Middleware/ProjectAuthorization.ts
@@ -1,4 +1,4 @@
-import ProjectServiceType from '../Services/ProjectService';
+import ProjectService from '../Services/ProjectService';
 import BadDataException from 'Common/Types/Exception/BadDataException';
 import ObjectID from 'Common/Types/ObjectID';
 import {
@@ -8,12 +8,10 @@ import {
     NextFunction,
     OneUptimeRequest,
 } from '../Utils/Express';
-import Services from '../Services/Index';
+
 import PositiveNumber from 'Common/Types/PositiveNumber';
 import Role from 'Common/Types/Role';
 
-const ProjectService: ProjectServiceType = Services.ProjectService;
-
 export default class ProjectMiddleware {
     public static getProjectId(req: ExpressRequest): ObjectID | null {
         let projectId: ObjectID | null = null;
diff --git a/CommonServer/Middleware/UserAuthorization.ts b/CommonServer/Middleware/UserAuthorization.ts
index 99da372a14..0d51d62f2b 100644
--- a/CommonServer/Middleware/UserAuthorization.ts
+++ b/CommonServer/Middleware/UserAuthorization.ts
@@ -5,15 +5,12 @@ import {
     OneUptimeRequest,
     AuthorizationType,
 } from '../Utils/Express';
-import Service from '../Services/Index';
-import UserServiceType from '../Services/UserService';
+import UserService from '../Services/UserService';
 import ProjectMiddleware from './ProjectAuthorization';
 import JSONWebToken from '../Utils/JsonWebToken';
 import ObjectID from 'Common/Types/ObjectID';
 import UserRole from 'Common/Types/UserRole';
 
-const UserService: UserServiceType = Service.UserService;
-
 export default class UserMiddleware {
     /*
      * Description: Checking if user is authorized to access the page and decode jwt to get user data.
diff --git a/CommonServer/Services/AlertChargeService.ts b/CommonServer/Services/AlertChargeService.ts
index 760d81fabf..4c41dd1d6c 100644
--- a/CommonServer/Services/AlertChargeService.ts
+++ b/CommonServer/Services/AlertChargeService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/AlertCharge';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ApplicationLogContainer.ts b/CommonServer/Services/ApplicationLogContainer.ts
index 7868bd8d33..678bfe2235 100644
--- a/CommonServer/Services/ApplicationLogContainer.ts
+++ b/CommonServer/Services/ApplicationLogContainer.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ApplicationLogContainer';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ApplicationLogService.ts b/CommonServer/Services/ApplicationLogService.ts
index cf69c21074..10cfb9c226 100644
--- a/CommonServer/Services/ApplicationLogService.ts
+++ b/CommonServer/Services/ApplicationLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ApplicationLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ApplicationSecurityRunInstanceLogService.ts b/CommonServer/Services/ApplicationSecurityRunInstanceLogService.ts
index 727be88314..4fd490d07d 100644
--- a/CommonServer/Services/ApplicationSecurityRunInstanceLogService.ts
+++ b/CommonServer/Services/ApplicationSecurityRunInstanceLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ApplicationSecurityRunInstanceLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ApplicationSecurityService.ts b/CommonServer/Services/ApplicationSecurityService.ts
index 8dc55939ea..a09353179d 100644
--- a/CommonServer/Services/ApplicationSecurityService.ts
+++ b/CommonServer/Services/ApplicationSecurityService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ApplicationSecurity';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/AutomatedScriptLogService.ts b/CommonServer/Services/AutomatedScriptLogService.ts
index 36797a495e..b8800e7d8a 100644
--- a/CommonServer/Services/AutomatedScriptLogService.ts
+++ b/CommonServer/Services/AutomatedScriptLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/AutomatedScriptLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/AutomatedScriptService.ts b/CommonServer/Services/AutomatedScriptService.ts
index 675e63146b..0d9719b5ac 100644
--- a/CommonServer/Services/AutomatedScriptService.ts
+++ b/CommonServer/Services/AutomatedScriptService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/AutomatedScript';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ComponentService.ts b/CommonServer/Services/ComponentService.ts
index 58940f8c9d..8d92115ca0 100644
--- a/CommonServer/Services/ComponentService.ts
+++ b/CommonServer/Services/ComponentService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Component';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ContainerSecurityLogService.ts b/CommonServer/Services/ContainerSecurityLogService.ts
index c6437afe9e..d94d9056ec 100644
--- a/CommonServer/Services/ContainerSecurityLogService.ts
+++ b/CommonServer/Services/ContainerSecurityLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ContainerSecurityLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ContainerSecurityService.ts b/CommonServer/Services/ContainerSecurityService.ts
index 2d3a125da0..e1f0c18752 100644
--- a/CommonServer/Services/ContainerSecurityService.ts
+++ b/CommonServer/Services/ContainerSecurityService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ContainerSecurity';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/CustomFieldService.ts b/CommonServer/Services/CustomFieldService.ts
index 267cd4c347..3f9240339a 100644
--- a/CommonServer/Services/CustomFieldService.ts
+++ b/CommonServer/Services/CustomFieldService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/CustomField';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/DockerCredentialService.ts b/CommonServer/Services/DockerCredentialService.ts
index fc034fd995..3a6e5e7a19 100644
--- a/CommonServer/Services/DockerCredentialService.ts
+++ b/CommonServer/Services/DockerCredentialService.ts
@@ -9,7 +9,7 @@ import Hostname from 'Common/Types/API/Hostname';
 import Route from 'Common/Types/API/Route';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 
diff --git a/CommonServer/Services/DomainVerificationTokenService.ts b/CommonServer/Services/DomainVerificationTokenService.ts
index 1ab0e1d079..6d18b2373e 100644
--- a/CommonServer/Services/DomainVerificationTokenService.ts
+++ b/CommonServer/Services/DomainVerificationTokenService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/DomainVerificationToken';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/EmailLogService.ts b/CommonServer/Services/EmailLogService.ts
index 72982c6c02..04aa55d8e2 100644
--- a/CommonServer/Services/EmailLogService.ts
+++ b/CommonServer/Services/EmailLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/EmailLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/EmailTemplateService.ts b/CommonServer/Services/EmailTemplateService.ts
index 9eebe961ec..7757745aaf 100755
--- a/CommonServer/Services/EmailTemplateService.ts
+++ b/CommonServer/Services/EmailTemplateService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/EmailTemplate';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/EmailVerificationTokenService.ts b/CommonServer/Services/EmailVerificationTokenService.ts
index 0ddb4f5dac..0832b0c649 100644
--- a/CommonServer/Services/EmailVerificationTokenService.ts
+++ b/CommonServer/Services/EmailVerificationTokenService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/EmailVerificationToken';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ErrorEventService.ts b/CommonServer/Services/ErrorEventService.ts
index 169dac4a08..bdd7ddcdf3 100644
--- a/CommonServer/Services/ErrorEventService.ts
+++ b/CommonServer/Services/ErrorEventService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ErrorEvent';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ErrorTrackerContainerService.ts b/CommonServer/Services/ErrorTrackerContainerService.ts
index 9ad16a195b..bc729a80e6 100644
--- a/CommonServer/Services/ErrorTrackerContainerService.ts
+++ b/CommonServer/Services/ErrorTrackerContainerService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ErrorTrackerContainer';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/EscalationService.ts b/CommonServer/Services/EscalationService.ts
index 7e88db0659..8c98d6bae7 100755
--- a/CommonServer/Services/EscalationService.ts
+++ b/CommonServer/Services/EscalationService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Escalation';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/FeedbackService.ts b/CommonServer/Services/FeedbackService.ts
index c92e8b53cf..04d5138aed 100755
--- a/CommonServer/Services/FeedbackService.ts
+++ b/CommonServer/Services/FeedbackService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Feedback';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/FileService.ts b/CommonServer/Services/FileService.ts
index cbbd945cfb..1680606817 100755
--- a/CommonServer/Services/FileService.ts
+++ b/CommonServer/Services/FileService.ts
@@ -20,6 +20,5 @@ class FileService {
          */
     }
 }
-export default new Service();
 
 export default FileService;
diff --git a/CommonServer/Services/GitCredentialService.ts b/CommonServer/Services/GitCredentialService.ts
index 9a27fc9c87..71332a0fcf 100644
--- a/CommonServer/Services/GitCredentialService.ts
+++ b/CommonServer/Services/GitCredentialService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/GitCredential';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentCommunicationSlaService.ts b/CommonServer/Services/IncidentCommunicationSlaService.ts
index 0953cff5fe..8266f9a729 100644
--- a/CommonServer/Services/IncidentCommunicationSlaService.ts
+++ b/CommonServer/Services/IncidentCommunicationSlaService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentCommunicationSla';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentNoteService.ts b/CommonServer/Services/IncidentNoteService.ts
index a6f446f290..de5f0e65b1 100644
--- a/CommonServer/Services/IncidentNoteService.ts
+++ b/CommonServer/Services/IncidentNoteService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentNote';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentNoteTemplateService.ts b/CommonServer/Services/IncidentNoteTemplateService.ts
index 5c30325778..be25c3a685 100644
--- a/CommonServer/Services/IncidentNoteTemplateService.ts
+++ b/CommonServer/Services/IncidentNoteTemplateService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentNoteTemplate';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentPrioritiesService.ts b/CommonServer/Services/IncidentPrioritiesService.ts
index e0f8a477a7..38efd1f45b 100644
--- a/CommonServer/Services/IncidentPrioritiesService.ts
+++ b/CommonServer/Services/IncidentPrioritiesService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentPriority';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentSMSActionService.ts b/CommonServer/Services/IncidentSMSActionService.ts
index ca59808c23..05c7966c07 100755
--- a/CommonServer/Services/IncidentSMSActionService.ts
+++ b/CommonServer/Services/IncidentSMSActionService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentSMSAction';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentService.ts b/CommonServer/Services/IncidentService.ts
index f77e3f4c5b..808f01063c 100755
--- a/CommonServer/Services/IncidentService.ts
+++ b/CommonServer/Services/IncidentService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Incident';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentSettingService.ts b/CommonServer/Services/IncidentSettingService.ts
index 07c0b8179c..c3aa4a4b97 100644
--- a/CommonServer/Services/IncidentSettingService.ts
+++ b/CommonServer/Services/IncidentSettingService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentSetting';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncidentTimelineService.ts b/CommonServer/Services/IncidentTimelineService.ts
index d3e49e0f45..cfc2a331e8 100644
--- a/CommonServer/Services/IncidentTimelineService.ts
+++ b/CommonServer/Services/IncidentTimelineService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncidentTimeline';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncomingCallRoutingLogService.ts b/CommonServer/Services/IncomingCallRoutingLogService.ts
index b9e9f811b4..7d23263832 100644
--- a/CommonServer/Services/IncomingCallRoutingLogService.ts
+++ b/CommonServer/Services/IncomingCallRoutingLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncomingCallRoutingLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncomingCallRoutingService.ts b/CommonServer/Services/IncomingCallRoutingService.ts
index 126f9e6cff..89b729d77b 100644
--- a/CommonServer/Services/IncomingCallRoutingService.ts
+++ b/CommonServer/Services/IncomingCallRoutingService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncomingCallRouting';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IncomingRequestService.ts b/CommonServer/Services/IncomingRequestService.ts
index c172388a0d..5bc49c22cf 100644
--- a/CommonServer/Services/IncomingRequestService.ts
+++ b/CommonServer/Services/IncomingRequestService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IncomingRequest';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IntegrationService.ts b/CommonServer/Services/IntegrationService.ts
index 5e93e67e52..6d916e32ba 100755
--- a/CommonServer/Services/IntegrationService.ts
+++ b/CommonServer/Services/IntegrationService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Integration';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IssueMemberService.ts b/CommonServer/Services/IssueMemberService.ts
index 7bbf1ca9af..992f79b915 100644
--- a/CommonServer/Services/IssueMemberService.ts
+++ b/CommonServer/Services/IssueMemberService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IssueMember';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IssueService.ts b/CommonServer/Services/IssueService.ts
index 1b86c66917..ee8e838630 100644
--- a/CommonServer/Services/IssueService.ts
+++ b/CommonServer/Services/IssueService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Issue';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/IssueTimelineService.ts b/CommonServer/Services/IssueTimelineService.ts
index 4b9b32bbdd..6c3ff1f25c 100644
--- a/CommonServer/Services/IssueTimelineService.ts
+++ b/CommonServer/Services/IssueTimelineService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/IssueTimeline';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/LeadService.ts b/CommonServer/Services/LeadService.ts
index 3f4624275e..c5e2e1f95b 100755
--- a/CommonServer/Services/LeadService.ts
+++ b/CommonServer/Services/LeadService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Lead';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/LighthouseLogService.ts b/CommonServer/Services/LighthouseLogService.ts
index b4ec34fa45..38b09061bd 100644
--- a/CommonServer/Services/LighthouseLogService.ts
+++ b/CommonServer/Services/LighthouseLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/LighthouseLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/LoginHistoryService.ts b/CommonServer/Services/LoginHistoryService.ts
index 3273bf1563..0e5da298b5 100644
--- a/CommonServer/Services/LoginHistoryService.ts
+++ b/CommonServer/Services/LoginHistoryService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/LoginHistory';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/MailService.ts b/CommonServer/Services/MailService.ts
index 1d82d8ad2f..2757071689 100644
--- a/CommonServer/Services/MailService.ts
+++ b/CommonServer/Services/MailService.ts
@@ -48,4 +48,4 @@ export default class MailService {
         );
     }
 }
-export default new Service();
+
diff --git a/CommonServer/Services/MonitorCustomField.ts b/CommonServer/Services/MonitorCustomField.ts
index bd8a495311..9077c88551 100644
--- a/CommonServer/Services/MonitorCustomField.ts
+++ b/CommonServer/Services/MonitorCustomField.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/MonitorCustomField';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/MonitorLogService.ts b/CommonServer/Services/MonitorLogService.ts
index c0d1134558..551b0a2b50 100644
--- a/CommonServer/Services/MonitorLogService.ts
+++ b/CommonServer/Services/MonitorLogService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/MonitorLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/MonitorService.ts b/CommonServer/Services/MonitorService.ts
index 9ee91e90db..82d8f5fc9a 100644
--- a/CommonServer/Services/MonitorService.ts
+++ b/CommonServer/Services/MonitorService.ts
@@ -9,7 +9,7 @@ import { In, IsNull, LessThan } from 'typeorm';
 import MonitorType from 'Common/Types/Monitor/MonitorType';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 
diff --git a/CommonServer/Services/MonitorSlaService.ts b/CommonServer/Services/MonitorSlaService.ts
index 5d0d0493af..50224585a5 100644
--- a/CommonServer/Services/MonitorSlaService.ts
+++ b/CommonServer/Services/MonitorSlaService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/MonitorSla';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/MonitorStatusService.ts b/CommonServer/Services/MonitorStatusService.ts
index d7b263a851..9fadd4b573 100644
--- a/CommonServer/Services/MonitorStatusService.ts
+++ b/CommonServer/Services/MonitorStatusService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/MonitorStatus';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/NotificationService.ts b/CommonServer/Services/NotificationService.ts
index 527eda375f..0fe9d638bd 100755
--- a/CommonServer/Services/NotificationService.ts
+++ b/CommonServer/Services/NotificationService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Notification';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/OnCallScheduleDutyStatusService.ts b/CommonServer/Services/OnCallScheduleDutyStatusService.ts
index 0d45848af7..9ebd4230f9 100644
--- a/CommonServer/Services/OnCallScheduleDutyStatusService.ts
+++ b/CommonServer/Services/OnCallScheduleDutyStatusService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/OnCallDutyScheduleStatus';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/PerformanceTrackerMetricService.ts b/CommonServer/Services/PerformanceTrackerMetricService.ts
index 5b8ffa092d..4894e3edcc 100644
--- a/CommonServer/Services/PerformanceTrackerMetricService.ts
+++ b/CommonServer/Services/PerformanceTrackerMetricService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/PerformanceTrackerMetric';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/PerformanceTrackerService.ts b/CommonServer/Services/PerformanceTrackerService.ts
index 27c15d3d81..a6d51e25bd 100644
--- a/CommonServer/Services/PerformanceTrackerService.ts
+++ b/CommonServer/Services/PerformanceTrackerService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/PerformanceTracker';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ProjectService.ts b/CommonServer/Services/ProjectService.ts
index ced59d1b28..6ae17c7ad8 100755
--- a/CommonServer/Services/ProjectService.ts
+++ b/CommonServer/Services/ProjectService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Project';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ProjectSmtpConfigService.ts b/CommonServer/Services/ProjectSmtpConfigService.ts
index bf44e65745..9fc6ff7369 100755
--- a/CommonServer/Services/ProjectSmtpConfigService.ts
+++ b/CommonServer/Services/ProjectSmtpConfigService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ProjectSmtpConfig';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/RealTimeService.ts b/CommonServer/Services/RealTimeService.ts
index dd313969ed..7f363b4bb1 100755
--- a/CommonServer/Services/RealTimeService.ts
+++ b/CommonServer/Services/RealTimeService.ts
@@ -33,4 +33,5 @@ class Service {
         );
     }
 }
+
 export default new Service();
diff --git a/CommonServer/Services/ResourceLabelService.ts b/CommonServer/Services/ResourceLabelService.ts
index 66a59b1d9c..a59ecf6f63 100755
--- a/CommonServer/Services/ResourceLabelService.ts
+++ b/CommonServer/Services/ResourceLabelService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ResourceLabel';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ScheduledEventNoteService.ts b/CommonServer/Services/ScheduledEventNoteService.ts
index d714738f8a..7914011c24 100644
--- a/CommonServer/Services/ScheduledEventNoteService.ts
+++ b/CommonServer/Services/ScheduledEventNoteService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ScheduledEvent';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/ScheduledEventService.ts b/CommonServer/Services/ScheduledEventService.ts
index d714738f8a..7914011c24 100755
--- a/CommonServer/Services/ScheduledEventService.ts
+++ b/CommonServer/Services/ScheduledEventService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/ScheduledEvent';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SmsCountService.ts b/CommonServer/Services/SmsCountService.ts
index dd61bda06d..00cd8e392a 100644
--- a/CommonServer/Services/SmsCountService.ts
+++ b/CommonServer/Services/SmsCountService.ts
@@ -8,7 +8,7 @@ import User from 'Common/Models/User';
 import { MoreThan } from 'typeorm';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 
diff --git a/CommonServer/Services/SmsProviderService.ts b/CommonServer/Services/SmsProviderService.ts
index ccab5b05a4..d8351f0c0b 100755
--- a/CommonServer/Services/SmsProviderService.ts
+++ b/CommonServer/Services/SmsProviderService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SmsProvider';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SmsTemplateService.ts b/CommonServer/Services/SmsTemplateService.ts
index cb92073a08..7e7a512946 100755
--- a/CommonServer/Services/SmsTemplateService.ts
+++ b/CommonServer/Services/SmsTemplateService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SmsTemplate';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SslCertificateManagerService.ts b/CommonServer/Services/SslCertificateManagerService.ts
index 703a1985c7..021d9a9eb1 100644
--- a/CommonServer/Services/SslCertificateManagerService.ts
+++ b/CommonServer/Services/SslCertificateManagerService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SslCertificateManager';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SslCertificateService.ts b/CommonServer/Services/SslCertificateService.ts
index d1bc749326..d4481f5ff5 100644
--- a/CommonServer/Services/SslCertificateService.ts
+++ b/CommonServer/Services/SslCertificateService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SslCertificate';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SsoConfigService.ts b/CommonServer/Services/SsoConfigService.ts
index 618884bcda..9b13c3b5b5 100644
--- a/CommonServer/Services/SsoConfigService.ts
+++ b/CommonServer/Services/SsoConfigService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SsoConfig';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SsoDefaultRolesService.ts b/CommonServer/Services/SsoDefaultRolesService.ts
index 406de789b0..7bb9a98eed 100644
--- a/CommonServer/Services/SsoDefaultRolesService.ts
+++ b/CommonServer/Services/SsoDefaultRolesService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SsoDefaultRole';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/StatusPageCategoryService.ts b/CommonServer/Services/StatusPageCategoryService.ts
index 49f45935a5..95f5f32444 100644
--- a/CommonServer/Services/StatusPageCategoryService.ts
+++ b/CommonServer/Services/StatusPageCategoryService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/StatusPageCategory';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/StatusPageService.ts b/CommonServer/Services/StatusPageService.ts
index 5218b88fd3..069c5672d5 100755
--- a/CommonServer/Services/StatusPageService.ts
+++ b/CommonServer/Services/StatusPageService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/StatusPage';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SubscriberAlertService.ts b/CommonServer/Services/SubscriberAlertService.ts
index 8dc91c1633..26330ac2b9 100755
--- a/CommonServer/Services/SubscriberAlertService.ts
+++ b/CommonServer/Services/SubscriberAlertService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/SubscriberAlert';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/SubscriberService.ts b/CommonServer/Services/SubscriberService.ts
index 022d89b9f1..b6655e6866 100755
--- a/CommonServer/Services/SubscriberService.ts
+++ b/CommonServer/Services/SubscriberService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Subscriber';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/TeamService.ts b/CommonServer/Services/TeamService.ts
index 2df0211f07..301fe52cb4 100644
--- a/CommonServer/Services/TeamService.ts
+++ b/CommonServer/Services/TeamService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/Team';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/UserAlertCallLogsService.ts b/CommonServer/Services/UserAlertCallLogsService.ts
index 216ecfdd9e..d5a8b9a019 100644
--- a/CommonServer/Services/UserAlertCallLogsService.ts
+++ b/CommonServer/Services/UserAlertCallLogsService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/UserAlertCallLog';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/UserAlertService.ts b/CommonServer/Services/UserAlertService.ts
index 72cedeff2f..14265fa84d 100644
--- a/CommonServer/Services/UserAlertService.ts
+++ b/CommonServer/Services/UserAlertService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/UserAlert';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Services/UserService.ts b/CommonServer/Services/UserService.ts
index eb3ed8ec05..6f5752b6f4 100755
--- a/CommonServer/Services/UserService.ts
+++ b/CommonServer/Services/UserService.ts
@@ -3,7 +3,7 @@ import Model from 'Common/Models/User';
 import DatabaseService from './DatabaseService';
 
 export class Service extends DatabaseService<Model> {
-    public constructor() {
+    public constructor(postgresDatabase?: PostgresDatabase) {
         super(Model, postgresDatabase);
     }
 }
diff --git a/CommonServer/Tests/TestingUtils/Services/UserTestService.ts b/CommonServer/Tests/TestingUtils/Services/UserTestService.ts
index b9616f8945..703c14378b 100644
--- a/CommonServer/Tests/TestingUtils/Services/UserTestService.ts
+++ b/CommonServer/Tests/TestingUtils/Services/UserTestService.ts
@@ -3,11 +3,11 @@ import Faker from 'Common/Tests/TestingUtils/Faker';
 import CompanySize from 'Common/Types/Company/CompanySize';
 import JobRole from 'Common/Types/Company/JobRole';
 import PostgresDatabase from '../../../Infrastructure/PostgresDatabase';
-import UserService from '../../../Services/UserService';
+import {Service as UserService} from '../../../Services/UserService';
 
 export default class UserTestService {
     private database: PostgresDatabase;
-    public constructor() {
+    public constructor(database: PostgresDatabase) {
         this.database = database;
     }
     public async generateRandomUser(): Promise<User> {
diff --git a/Realtime/Services/RealtimeService.ts b/Realtime/Services/RealtimeService.ts
index 3bd2886531..92693d6fe3 100644
--- a/Realtime/Services/RealtimeService.ts
+++ b/Realtime/Services/RealtimeService.ts
@@ -1,6 +1,7 @@
 import { JSONObjectOrArray } from 'Common/Types/JSON';
 import io, { Socket } from 'CommonServer/Infrastructure/SocketIO';
 import ObjectID from 'Common/Types/ObjectID';
+
 io.sockets.on('connection', (socket: Socket) => {
     socket.on('project', async (projectId: ObjectID) => {
         await socket.join(projectId.toString());