cleanup on delete, cleanup orphans

server/src/config/services.ts

@@ -200,7 +200,8 @@ export const initializeServices = async ({
 		monitorStatsRepository,
 		checksRepository,
 		incidentsRepository,
-		geoChecksService
+		geoChecksService,
+		geoChecksRepository
 	);
 
 	const superSimpleQueue = await SuperSimpleQueue.create(logger, superSimpleQueueHelper, monitorsRepository);

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

@@ -26,4 +26,5 @@ export interface IGeoChecksRepository {
 	): Promise<GroupedGeoCheck[]>;
 	deleteByMonitorId(monitorId: string): Promise<number>;
 	deleteByTeamId(teamId: string): Promise<number>;
+	deleteByMonitorIdsNotIn(monitorIds: string[]): Promise<number>;
 }

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

@@ -341,6 +341,21 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 			throw error;
 		}
 	};
+
+	deleteByMonitorIdsNotIn = async (monitorIds: string[]): Promise<number> => {
+		try {
+			const objectIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
+			const result = await GeoCheckModel.deleteMany({ "metadata.monitorId": { $nin: objectIds } });
+			return result.deletedCount || 0;
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error deleting orphaned geo checks: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "deleteByMonitorIdsNotIn",
+			});
+			throw error;
+		}
+	};
 }
 
 export { MongoGeoChecksRepository };

server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts

@@ -12,6 +12,7 @@ import {
 	IMonitorStatsRepository,
 	IChecksRepository,
 	IIncidentsRepository,
+	IGeoChecksRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
 import { IBufferService } from "../bufferService.js";
@@ -55,6 +56,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 	private checksRepository: IChecksRepository;
 	private incidentsRepository: IIncidentsRepository;
 	private geoChecksService: IGeoChecksService;
+	private geoChecksRepository: IGeoChecksRepository;
 
 	constructor(
 		logger: ILogger,
@@ -70,7 +72,8 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		monitorStatsRepository: IMonitorStatsRepository,
 		checksRepository: IChecksRepository,
 		incidentsRepository: IIncidentsRepository,
-		geoChecksService: IGeoChecksService
+		geoChecksService: IGeoChecksService,
+		geoChecksRepository: IGeoChecksRepository
 	) {
 		this.logger = logger;
 		this.networkService = networkService;
@@ -86,6 +89,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		this.checksRepository = checksRepository;
 		this.incidentsRepository = incidentsRepository;
 		this.geoChecksService = geoChecksService;
+		this.geoChecksRepository = geoChecksRepository;
 	}
 
 	get serviceName() {
@@ -240,6 +244,16 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					});
 				}
 
+				// Remove orphaned geo checks
+				const deletedGeoChecksCount = await this.geoChecksRepository.deleteByMonitorIdsNotIn(allMonitorIds);
+				if (deletedGeoChecksCount > 0) {
+					this.logger.info({
+						message: `Deleted ${deletedGeoChecksCount} orphaned geo checks`,
+						service: SERVICE_NAME,
+						method: "getCleanupOrphanedJob",
+					});
+				}
+
 				this.logger.info({
 					message: "Cleanup of orphaned data completed",
 					service: SERVICE_NAME,