Merge pull request #3792 from bluewave-labs/chore/purge-team/groups

purge unused groups route, update tests

server/src/api/controllers/monitorController.ts

@@ -44,7 +44,6 @@ export interface IMonitorController {
 	getMonitorsWithChecksByTeamId: RequestHandler;
 	exportMonitorsToJSON: RequestHandler;
 	getAllGames: RequestHandler;
-	getGroupsByTeamId: RequestHandler;
 	updateNotifications: RequestHandler;
 }
 class MonitorController implements IMonitorController {
@@ -365,16 +364,6 @@ class MonitorController implements IMonitorController {
 		});
 	});
 
-	getGroupsByTeamId = catchAsync(async (req: Request, res: Response) => {
-		const teamId = requireTeamId(req.user?.teamId);
-		const groups = await this.monitorService.getGroupsByTeamId({ teamId });
-
-		return res.status(200).json({
-			msg: "Groups retrieved successfully",
-			data: groups,
-		});
-	});
-
 	updateNotifications = catchAsync(async (req: Request, res: Response) => {
 		updateNotificationsValidation.parse(req.body);
 

server/src/api/routes/monitorRoute.ts

@@ -15,7 +15,6 @@ class MonitorRoutes {
 		// Team routes
 		this.router.get("/team", this.monitorController.getMonitorsByTeamId);
 		this.router.get("/team/with-checks", this.monitorController.getMonitorsWithChecksByTeamId);
-		this.router.get("/team/groups", this.monitorController.getGroupsByTeamId);
 
 		// Uptime routes
 		this.router.get("/uptime/details/:monitorId", this.monitorController.getUptimeDetailsById);

server/src/domain/monitors/monitor.repository.interface.ts

@@ -55,7 +55,6 @@ export interface IMonitorsRepository {
 
 	// other
 	findMonitorsSummaryByTeamId(teamId: string, config?: SummaryConfig): Promise<MonitorsSummary>;
-	findGroupsByTeamId(teamId: string): Promise<string[]>;
 	removeNotificationFromMonitors(notificationId: string): Promise<void>;
 	removeTagFromMonitors(tagId: string): Promise<void>;
 	updateNotifications(teamId: string, monitorIds: string[], notificationIds: string[], action: "add" | "remove" | "set"): Promise<number>;

server/src/domain/monitors/monitor.repository.mongo.ts

@@ -382,14 +382,6 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 		);
 	};
 
-	findGroupsByTeamId = async (teamId: string): Promise<string[]> => {
-		const groups = await MonitorModel.distinct("group", {
-			teamId: new mongoose.Types.ObjectId(teamId),
-			group: { $nin: [null, ""] },
-		});
-		return groups.sort();
-	};
-
 	removeNotificationFromMonitors = async (notificationId: string): Promise<void> => {
 		await MonitorModel.updateMany({ notifications: notificationId }, { $pull: { notifications: notificationId } });
 	};

server/src/domain/monitors/monitor.service.ts

@@ -72,7 +72,6 @@ export interface IMonitorService {
 		order?: "asc" | "desc";
 	}): Promise<MonitorsWithChecksByTeamIdResult>;
 	getAllGames(): GamesMap;
-	getGroupsByTeamId(args: { teamId: string }): Promise<string[]>;
 
 	// update
 	editMonitor(args: { teamId: string; monitorId: string; body: Partial<Monitor> }): Promise<Monitor>;
@@ -422,10 +421,6 @@ export class MonitorService implements IMonitorService {
 		return this.games;
 	};
 
-	getGroupsByTeamId = async ({ teamId }: { teamId: string }): Promise<string[]> => {
-		return await this.monitorsRepository.findGroupsByTeamId(teamId);
-	};
-
 	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Partial<Monitor> }) => {
 		const editedMonitor = await this.monitorsRepository.updateById(monitorId, teamId, body);
 		await this.scheduler.updateJob(editedMonitor);

server/test/helpers/InMemoryMonitorsRepository.ts

@@ -119,10 +119,6 @@ export class InMemoryMonitorsRepository implements IMonitorsRepository {
 		throw new Error("Not implemented");
 	}
 
-	async findGroupsByTeamId(_teamId: string): Promise<string[]> {
-		throw new Error("Not implemented");
-	}
-
 	async removeNotificationFromMonitors(_notificationId: string): Promise<void> {
 		throw new Error("Not implemented");
 	}

server/test/unit/services/monitorService.test.ts

@@ -18,7 +18,6 @@ const createMonitorsRepositoryMock = () =>
 		findByIds: jest.fn(),
 		findMonitorCountByTeamIdAndType: jest.fn(),
 		findMonitorsSummaryByTeamId: jest.fn(),
-		findGroupsByTeamId: jest.fn(),
 		updateById: jest.fn(),
 		updateNotifications: jest.fn(),
 		togglePauseById: jest.fn(),
@@ -746,18 +745,6 @@ describe("MonitorService", () => {
 		});
 	});
 
-	describe("getGroupsByTeamId", () => {
-		it("delegates to repository", async () => {
-			const monitorsRepository = createMonitorsRepositoryMock();
-			(monitorsRepository.findGroupsByTeamId as jest.Mock).mockResolvedValue(["group1", "group2"]);
-			const { service } = createService({ monitorsRepository });
-
-			const result = await service.getGroupsByTeamId({ teamId: TEAM_ID });
-			expect(result).toEqual(["group1", "group2"]);
-			expect(monitorsRepository.findGroupsByTeamId).toHaveBeenCalledWith(TEAM_ID);
-		});
-	});
-
 	describe("editMonitor", () => {
 		it("updates monitor and refreshes job", async () => {
 			const monitorsRepository = createMonitorsRepositoryMock();