fix commonserver compile

This commit is contained in:
Simon Larsen
2022-05-22 12:03:02 +01:00
parent dc7a44b800
commit 88f93915d6
77 changed files with 81 additions and 87 deletions

View File

@@ -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);
}
}

View File

@@ -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(

View File

@@ -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;

View File

@@ -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.

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -20,6 +20,5 @@ class FileService {
*/
}
}
export default new Service();
export default FileService;

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -48,4 +48,4 @@ export default class MailService {
);
}
}
export default new Service();

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -33,4 +33,5 @@ class Service {
);
}
}
export default new Service();

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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> {

View File

@@ -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());