conitnent based query

client/src/Pages/Uptime/Details/index.tsx

@@ -116,8 +116,9 @@ const UptimeDetailsPage = () => {
 		}
 		const params = new URLSearchParams();
 		params.append("dateRange", dateRange);
+		params.append("continent", selectedLocation);
 		return `/monitors/${monitorId}/geo-checks?${params.toString()}`;
-	}, [monitorId, monitor?.type, monitor?.geoCheckEnabled, dateRange]);
+	}, [monitorId, monitor?.type, monitor?.geoCheckEnabled, dateRange, selectedLocation]);
 
 	const { data: _geoChecksData, isLoading: _geoChecksIsLoading } =
 		useGet<GeoChecksResult>(geoChecksUrl, {}, { keepPreviousData: true });

server/src/controllers/monitorController.ts

@@ -27,6 +27,7 @@ import {
 } from "./controllerUtils.js";
 import { AppError } from "@/utils/AppError.js";
 import { IMonitorService } from "@/service/index.js";
+import { GeoContinent } from "@/types/geoCheck.js";
 
 const SERVICE_NAME = "monitorController";
 class MonitorController {
@@ -141,12 +142,14 @@ class MonitorController {
 
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const dateRange = requireString(req?.query?.dateRange, "dateRange");
+			const continent = optionalString(req?.query?.continent, "continent") as GeoContinent | undefined;
 			const teamId = requireTeamId(req?.user?.teamId);
 
 			const data = await this.monitorService.getGeoChecksByMonitorId({
 				teamId,
 				monitorId,
 				dateRange,
+				continent,
 			});
 
 			return res.status(200).json({

server/src/repositories/geo-checks/IGeoChecksRepository.ts

@@ -1,9 +1,16 @@
 import type { GeoCheck, GroupedGeoCheck } from "@/types/geoCheck.js";
+import type { GeoContinent } from "@/types/geoCheck.js";
 
 export interface IGeoChecksRepository {
 	createGeoChecks(geoChecks: Omit<GeoCheck, "id" | "__v" | "createdAt" | "updatedAt">[]): Promise<GeoCheck[]>;
 	findByMonitorIdAndDateRange(monitorId: string, startDate: Date, endDate: Date): Promise<GeoCheck[]>;
-	findGroupedByMonitorIdAndDateRange(monitorId: string, startDate: Date, endDate: Date, dateFormat: string): Promise<GroupedGeoCheck[]>;
+	findGroupedByMonitorIdAndDateRange(
+		monitorId: string,
+		startDate: Date,
+		endDate: Date,
+		dateFormat: string,
+		continent?: GeoContinent
+	): Promise<GroupedGeoCheck[]>;
 	deleteByMonitorId(monitorId: string): Promise<number>;
 	deleteByTeamId(teamId: string): Promise<number>;
 }

server/src/repositories/geo-checks/MongoGeoChecksRepository.ts

@@ -117,7 +117,13 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 		}
 	};
 
-	findGroupedByMonitorIdAndDateRange = async (monitorId: string, startDate: Date, endDate: Date, dateFormat: string): Promise<GroupedGeoCheck[]> => {
+	findGroupedByMonitorIdAndDateRange = async (
+		monitorId: string,
+		startDate: Date,
+		endDate: Date,
+		dateFormat: string,
+		continent?: string
+	): Promise<GroupedGeoCheck[]> => {
 		try {
 			const pipeline: any[] = [
 				// Match geo checks for this monitor in date range
@@ -134,6 +140,16 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				{
 					$unwind: "$results",
 				},
+				// Filter by continent if specified
+				...(continent
+					? [
+							{
+								$match: {
+									"results.location.continent": continent,
+								},
+							},
+						]
+					: []),
 				// Group by date bucket and continent
 				{
 					$group: {

server/src/service/business/monitorService.ts

@@ -8,6 +8,7 @@ import type {
 	PageSpeedDetailsResult,
 	GamesMap,
 } from "@/types/monitor.js";
+import type { GeoContinent } from "@/types/geoCheck.js";
 import type {
 	IChecksRepository,
 	IGeoChecksRepository,
@@ -37,7 +38,7 @@ export interface IMonitorService {
 	getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string; normalize?: boolean }): Promise<UptimeDetailsResult>;
 	getHardwareDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<HardwareDetailsResult>;
 	getPageSpeedDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<PageSpeedDetailsResult>;
-	getGeoChecksByMonitorId(args: { teamId: string; monitorId: string; dateRange: string }): Promise<any>;
+	getGeoChecksByMonitorId(args: { teamId: string; monitorId: string; dateRange: string; continent?: GeoContinent }): Promise<any>;
 	getMonitorById(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 	getMonitorsByTeamId(args: {
 		teamId: string;
@@ -322,7 +323,17 @@ export class MonitorService implements IMonitorService {
 		};
 	};
 
-	getGeoChecksByMonitorId = async ({ teamId, monitorId, dateRange }: { teamId: string; monitorId: string; dateRange: string }): Promise<any> => {
+	getGeoChecksByMonitorId = async ({
+		teamId,
+		monitorId,
+		dateRange,
+		continent,
+	}: {
+		teamId: string;
+		monitorId: string;
+		dateRange: string;
+		continent?: GeoContinent;
+	}): Promise<any> => {
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
@@ -334,7 +345,13 @@ export class MonitorService implements IMonitorService {
 
 		const rangeKey = (dateRange as DateRangeKey) ?? "recent";
 		const { start, end } = this.getDateRange(rangeKey);
-		const groupedGeoChecks = await this.geoChecksRepository.findGroupedByMonitorIdAndDateRange(monitor.id, start, end, this.getDateFormat(rangeKey));
+		const groupedGeoChecks = await this.geoChecksRepository.findGroupedByMonitorIdAndDateRange(
+			monitor.id,
+			start,
+			end,
+			this.getDateFormat(rangeKey),
+			continent
+		);
 
 		return { groupedGeoChecks };
 	};

server/src/validation/joi.ts

@@ -113,6 +113,7 @@ const getMonitorByIdQueryValidation = joi.object({
 	dateRange: joi.string().valid("recent", "hour", "day", "week", "month", "all"),
 	numToDisplay: joi.number(),
 	normalize: joi.boolean(),
+	continent: joi.string().valid(...GeoContinents),
 });
 
 const getMonitorsByTeamIdParamValidation = joi.object({});