hardware details

server/src/service/business/monitorService.ts

@@ -2,7 +2,7 @@ import { createMonitorsBodyValidation } from "@/validation/joi.js";
 import { NormalizeData, NormalizeDataUptimeDetails } from "@/utils/dataUtils.js";
 import { type Monitor } from "@/types/index.js";
 import type { MonitorType } from "@/types/monitor.js";
-import type { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
+import type { IChecksRepository, IMonitorsRepository, IMonitorStatsRepository } from "@/repositories/index.js";
 import fs from "fs";
 import { fileURLToPath } from "url";
 import path from "path";
@@ -23,17 +23,8 @@ export interface IMonitorService {
 
 	// read
 	getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string; normalize?: boolean }): Promise<any>;
-	getMonitorStatsById(args: {
-		teamId: string;
-		monitorId: string;
-		limit?: number;
-		sortOrder?: 1 | -1;
-		dateRange?: string;
-		numToDisplay?: number;
-		normalize?: boolean;
-	}): Promise<any>;
 	getHardwareDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<any>;
-	getMonitorById(args: { teamId: string; monitorId: string }): Promise<any>;
+	getMonitorById(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 	getMonitorsByTeamId(args: {
 		teamId: string;
 		limit?: number;
@@ -86,7 +77,7 @@ export class MonitorService implements IMonitorService {
 	private games: any;
 	private monitorsRepository: IMonitorsRepository;
 	private checksRepository: IChecksRepository;
-	private fs: any;
+	private monitorStatsRepository: IMonitorStatsRepository;
 
 	constructor({
 		db,
@@ -99,6 +90,7 @@ export class MonitorService implements IMonitorService {
 		games,
 		monitorsRepository,
 		checksRepository,
+		monitorStatsRepository,
 	}: {
 		db: any;
 		jobQueue: any;
@@ -110,6 +102,7 @@ export class MonitorService implements IMonitorService {
 		games: any;
 		monitorsRepository: IMonitorsRepository;
 		checksRepository: IChecksRepository;
+		monitorStatsRepository: IMonitorStatsRepository;
 	}) {
 		this.db = db;
 		this.jobQueue = jobQueue;
@@ -121,6 +114,7 @@ export class MonitorService implements IMonitorService {
 		this.games = games;
 		this.monitorsRepository = monitorsRepository;
 		this.checksRepository = checksRepository;
+		this.monitorStatsRepository = monitorStatsRepository;
 	}
 
 	get serviceName(): string {
@@ -269,10 +263,14 @@ export class MonitorService implements IMonitorService {
 		}
 		const rangeKey = (dateRange as DateRangeKey) ?? "recent";
 		const { start, end } = this.getDateRange(rangeKey);
-		const checksData = await this.checksRepository.findDateRangeChecksByMonitor(monitor.id, start, end, this.getDateFormat(rangeKey));
-		const monitorStats = await this.db.monitorModule.getMonitorStatsById({
-			monitorId,
+		const checksData = await this.checksRepository.findDateRangeChecksByMonitor(monitor.id, start, end, this.getDateFormat(rangeKey), {
+			type: monitor.type,
 		});
+		const monitorStats = await this.monitorStatsRepository.findByMonitorId(monitor.id);
+
+		if (checksData.monitorType !== "uptime") {
+			throw new AppError({ message: `${monitor.type} monitors are not supported for uptime details`, status: 400 });
+		}
 
 		return {
 			monitorData: {
@@ -287,47 +285,41 @@ export class MonitorService implements IMonitorService {
 		};
 	};
 
-	getMonitorStatsById = async ({
-		teamId,
-		monitorId,
-		limit,
-		sortOrder,
-		dateRange,
-		numToDisplay,
-		normalize,
-	}: {
-		teamId: string;
-		monitorId: string;
-		limit?: number;
-		sortOrder?: 1 | -1;
-		dateRange?: string;
-		numToDisplay?: number;
-		normalize?: boolean;
-	}): Promise<any> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
-		const monitorStats = await this.db.monitorModule.getMonitorStatsById({
-			monitorId,
-			limit,
-			sortOrder,
-			dateRange,
-			numToDisplay,
-			normalize,
-		});
-
-		return monitorStats;
-	};
-
 	getHardwareDetailsById = async ({ teamId, monitorId, dateRange }: { teamId: string; monitorId: string; dateRange: string }): Promise<any> => {
 		await this.verifyTeamAccess({ teamId, monitorId });
-		const monitor = await this.db.monitorModule.getHardwareDetailsById({ monitorId, dateRange });
+		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
+		if (!monitor) {
+			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
+		}
+		if (monitor.type !== "hardware") {
+			throw new AppError({ message: `${monitor.type} monitors are not supported for hardware details`, status: 400 });
+		}
 
-		return monitor;
+		const rangeKey = (dateRange as DateRangeKey) ?? "recent";
+		const { start, end } = this.getDateRange(rangeKey);
+		const checksData = await this.checksRepository.findDateRangeChecksByMonitor(monitor.id, start, end, this.getDateFormat(rangeKey), {
+			type: monitor.type,
+		});
+
+		if (checksData.monitorType !== "hardware") {
+			throw new AppError({ message: "Unable to load hardware stats for this monitor", status: 500 });
+		}
+
+		const stats = {
+			aggregateData: checksData.aggregateData,
+			upChecks: checksData.upChecks,
+			checks: checksData.checks,
+		};
+
+		return {
+			...monitor,
+			stats,
+		};
 	};
 
 	getMonitorById = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<any> => {
 		await this.verifyTeamAccess({ teamId, monitorId });
-		const monitor = await this.db.monitorModule.getMonitorById(monitorId);
-
+		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		return monitor;
 	};
 

server/src/service/infrastructure/statusService.js

@@ -7,10 +7,14 @@ class StatusService {
 
 	/**
 	 * @param {{
+	 *  db: any
+	 *  logger: any
 	 *  buffer: import("./bufferService.js").BufferService
 	 *  incidentService: import("../business/incidentService.js").IncidentService
+	 *  monitorsRepository: any
 	 * }}
-	 */ constructor({ db, logger, buffer, incidentService, monitorsRepository }) {
+	 */
+	constructor({ db, logger, buffer, incidentService, monitorsRepository }) {
 		this.db = db;
 		this.logger = logger;
 		this.buffer = buffer;