snapshots

server/src/repositories/checks/IChecksRepository.ts

@@ -2,7 +2,7 @@ import type { Check, MonitorType } from "@/types/index.js";
 import type { LatestChecksMap } from "@/repositories/checks/MongoChecksRepistory.js";
 
 export interface IChecksRepository {
-	findLatestChecksByMonitorIds(monitorIds: string[]): Promise<LatestChecksMap>;
+	findLatestChecksByMonitorIds(monitorIds: string[], options?: { limitPerMonitor?: number }): Promise<LatestChecksMap>;
 	findDateRangeChecksByMonitor(
 		monitorId: string,
 		startDate: Date,

server/src/repositories/checks/MongoChecksRepistory.ts

@@ -177,15 +177,18 @@ class MongoChecksRepistory implements IChecksRepository {
 		};
 	};
 
-	findLatestChecksByMonitorIds = async (monitorIds: string[]): Promise<LatestChecksMap> => {
+	findLatestChecksByMonitorIds = async (
+		monitorIds: string[],
+		options?: { limitPerMonitor?: number }
+	): Promise<LatestChecksMap> => {
 		if (monitorIds.length === 0) {
 			return {};
 		}
 		const mongoIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
-		const limitPerMonitor = 25;
+		const limitPerMonitor = options?.limitPerMonitor ?? 25;
 		const maxIntervalMs = Number(10 * 60 * 1000);
 		const bufferMs = Number(maxIntervalMs);
-		const lookbackMs = 25 * maxIntervalMs + bufferMs;
+		const lookbackMs = limitPerMonitor * maxIntervalMs + bufferMs;
 		const cutoffDate = new Date(Date.now() - lookbackMs);
 		const checkGroups = await CheckModel.aggregate([
 			{

server/src/service/business/monitorService.ts

@@ -404,10 +404,22 @@ export class MonitorService implements IMonitorService {
 			order,
 		});
 
-		const monitorIds = monitors?.map((m: any) => m.id) ?? [];
-		const checksMap = await this.checksRepository.findLatestChecksByMonitorIds(monitorIds);
-		const monitorsWithChecks = (monitors ?? []).map((monitor: any) => {
-			const checks = NormalizeData(checksMap[monitor.id] ?? [], 10, 100);
+		const monitorsList = (monitors ?? []) as Monitor[];
+		const snapshotTypes: MonitorType[] = ["hardware", "pagespeed"];
+		const requestedTypes = Array.isArray(type) ? type : type ? [type] : [];
+		const snapshotOnlyRequest =
+			requestedTypes.length > 0 && requestedTypes.every((requestedType) => snapshotTypes.includes(requestedType as MonitorType));
+
+		const limitPerMonitor = snapshotOnlyRequest ? 1 : 25;
+		const checksMap = await this.checksRepository.findLatestChecksByMonitorIds(
+			monitorsList.map((monitor) => monitor.id),
+			{ limitPerMonitor }
+		);
+
+		const monitorsWithChecks = monitorsList.map((monitor: Monitor) => {
+			const rawChecks = checksMap[monitor.id] ?? [];
+			const isSnapshotType = snapshotOnlyRequest || snapshotTypes.includes(monitor.type);
+			const checks = isSnapshotType ? rawChecks.slice(0, 1) : NormalizeData(rawChecks, 10, 100);
 			return {
 				...monitor,
 				checks,