From ff0911fc037bb6f3056c4dc5b6042d3749b286d2 Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Fri, 15 Apr 2022 16:34:18 +0100 Subject: [PATCH] fix --- Backend/api/ScriptRunner.ts | 6 +++--- Backend/test/monitor.test.ts | 6 +++--- Backend/test/project.test.ts | 10 +++++----- Backend/test/schedule.test.ts | 5 ++++- Backend/test/smsTemplate.test.ts | 5 ++++- Backend/test/subscriber.test.ts | 3 ++- Common/Types/ObjectID.ts | 2 +- Common/Types/PositiveNumber.ts | 4 ++-- CommonServer/Config.ts | 2 +- CommonServer/Services/IncidentTimelineService.ts | 5 +++-- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Backend/api/ScriptRunner.ts b/Backend/api/ScriptRunner.ts index f32da1dca4..8420ae974d 100644 --- a/Backend/api/ScriptRunner.ts +++ b/Backend/api/ScriptRunner.ts @@ -48,9 +48,9 @@ router.post( try { const { monitor, resp }: $TSFixMe = req.body; - let status, - reason, - data = {}; + let status: $TSFixMe, + reason: $TSFixMe, + data: $TSFixMe = {}; let matchedCriterion: $TSFixMe; // determine if monitor is up and reasons therefore diff --git a/Backend/test/monitor.test.ts b/Backend/test/monitor.test.ts index da8240d3de..4709ac236b 100755 --- a/Backend/test/monitor.test.ts +++ b/Backend/test/monitor.test.ts @@ -95,7 +95,7 @@ describe('Monitor API', function (): void { ComponentModel.create( { name: 'Test Component' }, - (err, component): void => { + (err: $TSFixMe,component : $TSFixMe): void => { componentId = component; VerificationTokenModel.findOne( { userId }, @@ -485,7 +485,7 @@ describe('API Monitor API', function (): void { ComponentModel.create( { name: 'Test Component' }, - (err, component): void => { + (err: $TSFixMe,component : $TSFixMe): void => { componentId = component; VerificationTokenModel.findOne( { userId }, @@ -709,7 +709,7 @@ describe('IncomingHttpRequest Monitor', function (): void { ComponentModel.create( { name: 'Test Component' }, - (err, component): void => { + (err: $TSFixMe,component : $TSFixMe): void => { componentId = component; VerificationTokenModel.findOne( { userId }, diff --git a/Backend/test/project.test.ts b/Backend/test/project.test.ts index 5a2565d2b3..e08e2a7ea6 100644 --- a/Backend/test/project.test.ts +++ b/Backend/test/project.test.ts @@ -45,7 +45,7 @@ describe('Project API', function (): void { VerificationTokenModel.findOne( { userId }, ( - err: $TSFixMe , + err: $TSFixMe, verificationToken: $TSFixMe ) => { @@ -312,7 +312,7 @@ describe('Project API', function (): void { planId: 'enterprise', }) - .end((err, response): void => { + .end( (err: $TSFixMe,response : $TSFixMe): void => { expect(response).to.have.status(400); done(); }); @@ -332,7 +332,7 @@ describe('Project API', function (): void { planId: 'enterprise', }) - .end((err, response): void => { + .end( (err: $TSFixMe,response : $TSFixMe): void => { expect(response).to.have.status(200); expect(response.body.stripePlanId).to.be.equal( 'enterprise' @@ -358,7 +358,7 @@ describe('Project API', function (): void { newPlan: `${plans[1].category} ${plans[1].details}`, }) - .end((err, response): void => { + .end( (err: $TSFixMe,response : $TSFixMe): void => { expect(response).to.have.status(200); expect(response.body.stripePlanId).to.be.equal(plans[1].planId); @@ -382,7 +382,7 @@ describe('Project API', function (): void { newPlan: `${plans[1].category} ${plans[1].details}`, }) - .end((err, response): void => { + .end( (err: $TSFixMe,response : $TSFixMe): void => { expect(response).to.have.status(200); expect(response.body.stripePlanId).to.be.equal(plans[1].planId); diff --git a/Backend/test/schedule.test.ts b/Backend/test/schedule.test.ts index b21f61e102..7881c3c6f8 100644 --- a/Backend/test/schedule.test.ts +++ b/Backend/test/schedule.test.ts @@ -19,7 +19,10 @@ import AirtableService from '../backend/services/airtableService'; import VerificationTokenModel from '../backend/models/verificationToken'; -let token: $TSFixMe, projectId: ObjectID, scheduleId: $TSFixMe, userId: $TSFixMe; +let token: $TSFixMe, + projectId: ObjectID, + scheduleId: $TSFixMe, + userId: $TSFixMe; describe('Schedule API', function (): void { this.timeout(30000); diff --git a/Backend/test/smsTemplate.test.ts b/Backend/test/smsTemplate.test.ts index 38f87c0aeb..4a145cb410 100644 --- a/Backend/test/smsTemplate.test.ts +++ b/Backend/test/smsTemplate.test.ts @@ -19,7 +19,10 @@ import AirtableService from '../backend/services/airtableService'; import VerificationTokenModel from '../backend/models/verificationToken'; -let token: $TSFixMe, projectId: ObjectID, userId: $TSFixMe, smsTemplateId: $TSFixMe; +let token: $TSFixMe, + projectId: ObjectID, + userId: $TSFixMe, + smsTemplateId: $TSFixMe; describe('SMS Template API', function (): void { this.timeout(20000); diff --git a/Backend/test/subscriber.test.ts b/Backend/test/subscriber.test.ts index 78a6265f78..fbeaacb168 100644 --- a/Backend/test/subscriber.test.ts +++ b/Backend/test/subscriber.test.ts @@ -25,12 +25,13 @@ import ComponentModel from '../backend/models/component'; import ComponentService from '../backend/services/componentService'; let projectId: ObjectID, - userId, + userId: $TSFixMe, monitorId: $TSFixMe, token: $TSFixMe, subscriberId: $TSFixMe, statusPageId: $TSFixMe, componentId: $TSFixMe; + const monitor: $TSFixMe = { name: 'New Monitor', type: 'url', diff --git a/Common/Types/ObjectID.ts b/Common/Types/ObjectID.ts index 58710d9306..e328f626a9 100644 --- a/Common/Types/ObjectID.ts +++ b/Common/Types/ObjectID.ts @@ -14,7 +14,7 @@ export default class ObjectID { this.id = id; } - toString(): string { + public toString(): string { return this.id; } diff --git a/Common/Types/PositiveNumber.ts b/Common/Types/PositiveNumber.ts index 4152d7d958..5d483048ff 100644 --- a/Common/Types/PositiveNumber.ts +++ b/Common/Types/PositiveNumber.ts @@ -17,11 +17,11 @@ export default class PositiveNumber { this.positiveNumber = positiveNumber; } - toString(): string { + public toString(): string { return this.positiveNumber.toString(); } - toNumber(): number { + public toNumber(): number { return this.positiveNumber; } } diff --git a/CommonServer/Config.ts b/CommonServer/Config.ts index f5cfb0e2d9..fbeab64e39 100644 --- a/CommonServer/Config.ts +++ b/CommonServer/Config.ts @@ -21,7 +21,7 @@ export const RealtimeHostname: string = process.env['REALTIME_HOSTNAME'] || ''; export const Version: string = process.env['npm_package_version'] || ''; -export const HttpProtocol: Protocol: Function = ( +export const HttpProtocol: Protocol = ( process.env['HTTP_PROTOCOL'] || '' ).includes('https') ? Protocol.HTTPS diff --git a/CommonServer/Services/IncidentTimelineService.ts b/CommonServer/Services/IncidentTimelineService.ts index 57000f4f0a..8ecaf5f41b 100644 --- a/CommonServer/Services/IncidentTimelineService.ts +++ b/CommonServer/Services/IncidentTimelineService.ts @@ -207,7 +207,7 @@ export default class Service { // this timelines will be used in status page public async getIncidentLastTimelines(incidents: $TSFixMe): void { const skip: $TSFixMe = 0, - limit = 1; + limit: PositiveNumber = 1; const populateIncTimeline: $TSFixMe = [ { path: 'createdById', select: 'name' }, @@ -268,4 +268,5 @@ import flattenArray from '../Utils/flattenArray'; import FindOneBy from '../Types/DB/FindOneBy'; import FindBy from '../Types/DB/FindBy'; -import Query from '../Types/DB/Query'; +import Query from '../Types/DB/Query';import PositiveNumber from 'Common/Types/PositiveNumber'; +