diff --git a/Common/Server/Services/ProjectService.ts b/Common/Server/Services/ProjectService.ts index e919cfd53d..f0adb347ae 100755 --- a/Common/Server/Services/ProjectService.ts +++ b/Common/Server/Services/ProjectService.ts @@ -1446,8 +1446,9 @@ export class ProjectService extends DatabaseService { }): Promise> { const select: Select | undefined = params?.select || ({ _id: true } as Select); - const props: DatabaseCommonInteractionProps = - params?.props || { isRoot: true }; + const props: DatabaseCommonInteractionProps = params?.props || { + isRoot: true, + }; return await this.findAllBy({ query: this.getActiveProjectStatusQuery(), diff --git a/Worker/Jobs/Announcement/SendNotificationToSubscribers.ts b/Worker/Jobs/Announcement/SendNotificationToSubscribers.ts index dd65ee2377..748f2d1911 100644 --- a/Worker/Jobs/Announcement/SendNotificationToSubscribers.ts +++ b/Worker/Jobs/Announcement/SendNotificationToSubscribers.ts @@ -1,5 +1,4 @@ import RunCron from "../../Utils/Cron"; -import { FileRoute } from "Common/ServiceRoute"; import Hostname from "Common/Types/API/Hostname"; import Protocol from "Common/Types/API/Protocol"; import URL from "Common/Types/API/URL"; diff --git a/Worker/Jobs/Incident/KeepCurrentStateConsistent.ts b/Worker/Jobs/Incident/KeepCurrentStateConsistent.ts index 821b448273..5a90744721 100644 --- a/Worker/Jobs/Incident/KeepCurrentStateConsistent.ts +++ b/Worker/Jobs/Incident/KeepCurrentStateConsistent.ts @@ -12,12 +12,13 @@ RunCron( async () => { try { // get all projects, then get all incidents for each project, then refresh the current state of each incident. - const projects: Array = await ProjectService.getAllActiveProjects({ - select: { - _id: true, - }, - skip: 0, - }); + const projects: Array = + await ProjectService.getAllActiveProjects({ + select: { + _id: true, + }, + skip: 0, + }); for (const project of projects) { try { diff --git a/Worker/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts b/Worker/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts index 7734f65907..41d527257b 100644 --- a/Worker/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts +++ b/Worker/Jobs/IncomingRequestMonitor/CheckHeartbeat.ts @@ -49,8 +49,8 @@ RunCron( }, }); - const incomingRequestMonitors: Array = await MonitorService.findAllBy( - { + const incomingRequestMonitors: Array = + await MonitorService.findAllBy({ query: { ...MonitorService.getEnabledMonitorQuery(), monitorType: MonitorType.IncomingRequest, @@ -73,8 +73,7 @@ RunCron( sort: { incomingRequestMonitorHeartbeatCheckedAt: SortOrder.Ascending, }, - }, - ); + }); const totalIncomingRequestMonitors: Array = [ ...newIncomingRequestMonitors, diff --git a/Worker/Jobs/OnCallPolicy/DeleteOldTimeLogs.ts b/Worker/Jobs/OnCallPolicy/DeleteOldTimeLogs.ts index 037ee590db..d971fd8fbf 100644 --- a/Worker/Jobs/OnCallPolicy/DeleteOldTimeLogs.ts +++ b/Worker/Jobs/OnCallPolicy/DeleteOldTimeLogs.ts @@ -24,16 +24,17 @@ RunCron( // get time logs older than 6 months. EndsAt is more than 6 months ago. while (true) { - const deletedCount: number = await OnCallDutyPolicyTimeLogService.deleteBy({ - query: { - endsAt: QueryHelper.lessThanEqualTo(sixMonthsAgo), - }, - props: { - isRoot: true, - }, - limit: TIME_LOG_DELETE_BATCH_SIZE, - skip: 0, - }); + const deletedCount: number = + await OnCallDutyPolicyTimeLogService.deleteBy({ + query: { + endsAt: QueryHelper.lessThanEqualTo(sixMonthsAgo), + }, + props: { + isRoot: true, + }, + limit: TIME_LOG_DELETE_BATCH_SIZE, + skip: 0, + }); if (deletedCount === 0) { break; diff --git a/Worker/Jobs/PaymentProvider/SendDailyEmailsToOwnersIfSubscriptionIsOverdue.ts b/Worker/Jobs/PaymentProvider/SendDailyEmailsToOwnersIfSubscriptionIsOverdue.ts index 878fd5b749..bcd3f4633a 100644 --- a/Worker/Jobs/PaymentProvider/SendDailyEmailsToOwnersIfSubscriptionIsOverdue.ts +++ b/Worker/Jobs/PaymentProvider/SendDailyEmailsToOwnersIfSubscriptionIsOverdue.ts @@ -38,22 +38,21 @@ RunCron( skip: 0, }); - const subscriptionPastdue: Array = - await ProjectService.findAllBy({ - query: { - paymentProviderSubscriptionStatus: SubscriptionStatus.PastDue, - }, - select: { - _id: true, - paymentProviderSubscriptionId: true, - paymentProviderMeteredSubscriptionId: true, - }, - props: { - isRoot: true, - ignoreHooks: true, - }, - skip: 0, - }); + const subscriptionPastdue: Array = await ProjectService.findAllBy({ + query: { + paymentProviderSubscriptionStatus: SubscriptionStatus.PastDue, + }, + select: { + _id: true, + paymentProviderSubscriptionId: true, + paymentProviderMeteredSubscriptionId: true, + }, + props: { + isRoot: true, + ignoreHooks: true, + }, + skip: 0, + }); const allPastDueProjects: Array = [ ...merteredSubscriptionPastdue, diff --git a/Worker/Jobs/UserOnCallLog/ExecutePendingExecutions.ts b/Worker/Jobs/UserOnCallLog/ExecutePendingExecutions.ts index dcdcb68a83..447d4cc1bf 100644 --- a/Worker/Jobs/UserOnCallLog/ExecutePendingExecutions.ts +++ b/Worker/Jobs/UserOnCallLog/ExecutePendingExecutions.ts @@ -13,6 +13,7 @@ import UserNotificationRule from "Common/Models/DatabaseModels/UserNotificationR import UserOnCallLog from "Common/Models/DatabaseModels/UserOnCallLog"; import Alert from "Common/Models/DatabaseModels/Alert"; import AlertService from "Common/Server/Services/AlertService"; +import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; RunCron( "UserOnCallLog:ExecutePendingExecutions",