refactor: merge room endpoints into single chain

Author: mdawoud27

apps/meteor/app/api/server/v1/rooms.ts

@@ -120,61 +120,6 @@ API.v1.addRoute(
 	},
 );
 
-const roomDeleteEndpoint = API.v1.post(
-	'rooms.delete',
-	{
-		authRequired: true,
-		body: ajv.compile<{ roomId: string }>({
-			type: 'object',
-			properties: {
-				roomId: {
-					type: 'string',
-					description: 'The ID of the room to delete.',
-				},
-			},
-			required: ['roomId'],
-			additionalProperties: false,
-		}),
-		response: {
-			200: ajv.compile<void>({
-				type: 'object',
-				properties: {
-					success: {
-						type: 'boolean',
-						enum: [true],
-						description: 'Indicates if the request was successful.',
-					},
-				},
-				required: ['success'],
-				additionalProperties: false,
-			}),
-			400: validateBadRequestErrorResponse,
-			401: validateUnauthorizedErrorResponse,
-		},
-	},
-	async function action() {
-		const { roomId } = this.bodyParams;
-
-		const room = await Rooms.findOneById(roomId);
-
-		if (!room) {
-			throw new MeteorError('error-invalid-room', 'Invalid room', {
-				method: 'eraseRoom',
-			});
-		}
-
-		if (room.teamMain) {
-			throw new Meteor.Error('error-cannot-delete-team-channel', 'Cannot delete a team channel', {
-				method: 'eraseRoom',
-			});
-		}
-
-		await eraseRoom(room, this.user);
-
-		return API.v1.success();
-	},
-);
-
 API.v1.addRoute(
 	'rooms.get',
 	{ authRequired: true },
@@ -305,56 +250,6 @@ API.v1.addRoute(
 	},
 );
 
-const saveNotificationBodySchema = ajv.compile<{
-	roomId: string;
-	notifications: Record<string, string>;
-}>({
-	type: 'object',
-	properties: {
-		roomId: { type: 'string', minLength: 1 },
-		notifications: {
-			type: 'object',
-			minProperties: 1,
-			additionalProperties: { type: 'string' },
-		},
-	},
-	required: ['roomId', 'notifications'],
-	additionalProperties: false,
-});
-
-const saveNotificationResponseSchema = ajv.compile({
-	type: 'object',
-	properties: {
-		success: { type: 'boolean', enum: [true] },
-	},
-	required: ['success'],
-	additionalProperties: false,
-});
-
-const roomsSaveNotificationEndpoint = API.v1.post(
-	'rooms.saveNotification',
-	{
-		authRequired: true,
-		body: saveNotificationBodySchema,
-		response: {
-			200: saveNotificationResponseSchema,
-			400: validateBadRequestErrorResponse,
-			401: validateUnauthorizedErrorResponse,
-		},
-	},
-	async function action() {
-		const { roomId, notifications } = this.bodyParams;
-
-		await Promise.all(
-			Object.entries(notifications as Notifications).map(async ([notificationKey, notificationValue]) =>
-				saveNotificationSettingsMethod(this.userId, roomId, notificationKey as NotificationFieldType, notificationValue),
-			),
-		);
-
-		return API.v1.success({ success: true });
-	},
-);
-
 API.v1.addRoute(
 	'rooms.cleanHistory',
 	{ authRequired: true, validateParams: isRoomsCleanHistoryProps },
@@ -1028,6 +923,36 @@ const RoomsMuteUnmuteUserSchema = {
 
 const isRoomsMuteUnmuteUserProps = ajv.compile<RoomsMuteUnmuteUser>(RoomsMuteUnmuteUserSchema);
 
+type SaveNotificationBody = {
+	roomId: string;
+	notifications: Record<string, string>;
+};
+
+const saveNotificationBodySchema = {
+	type: 'object',
+	properties: {
+		roomId: { type: 'string', minLength: 1 },
+		notifications: {
+			type: 'object',
+			minProperties: 1,
+			additionalProperties: { type: 'string' },
+		},
+	},
+	required: ['roomId', 'notifications'],
+	additionalProperties: false,
+};
+
+const isSaveNotificationBodyProps = ajv.compile<SaveNotificationBody>(saveNotificationBodySchema);
+
+const saveNotificationResponseSchema = ajv.compile({
+	type: 'object',
+	properties: {
+		success: { type: 'boolean', enum: [true] },
+	},
+	required: ['success'],
+	additionalProperties: false,
+});
+
 export const roomEndpoints = API.v1
 	.get(
 		'rooms.roles',
@@ -1171,6 +1096,29 @@ export const roomEndpoints = API.v1
 			}
 		},
 	)
+	.post(
+		'rooms.saveNotification',
+		{
+			authRequired: true,
+			body: isSaveNotificationBodyProps,
+			response: {
+				200: saveNotificationResponseSchema,
+				400: validateBadRequestErrorResponse,
+				401: validateUnauthorizedErrorResponse,
+			},
+		},
+		async function action() {
+			const { roomId, notifications } = this.bodyParams;
+
+			await Promise.all(
+				Object.entries(notifications as Notifications).map(async ([notificationKey, notificationValue]) =>
+					saveNotificationSettingsMethod(this.userId, roomId, notificationKey as NotificationFieldType, notificationValue),
+				),
+			);
+
+			return API.v1.success({ success: true });
+		},
+	)
 	.post(
 		'rooms.favorite',
 		{
@@ -1203,6 +1151,60 @@ export const roomEndpoints = API.v1
 			return API.v1.success();
 		},
 	)
+	.post(
+		'rooms.delete',
+		{
+			authRequired: true,
+			body: ajv.compile<{ roomId: string }>({
+				type: 'object',
+				properties: {
+					roomId: {
+						type: 'string',
+						description: 'The ID of the room to delete.',
+					},
+				},
+				required: ['roomId'],
+				additionalProperties: false,
+			}),
+			response: {
+				200: ajv.compile<void>({
+					type: 'object',
+					properties: {
+						success: {
+							type: 'boolean',
+							enum: [true],
+							description: 'Indicates if the request was successful.',
+						},
+					},
+					required: ['success'],
+					additionalProperties: false,
+				}),
+				400: validateBadRequestErrorResponse,
+				401: validateUnauthorizedErrorResponse,
+			},
+		},
+		async function action() {
+			const { roomId } = this.bodyParams;
+
+			const room = await Rooms.findOneById(roomId);
+
+			if (!room) {
+				throw new MeteorError('error-invalid-room', 'Invalid room', {
+					method: 'eraseRoom',
+				});
+			}
+
+			if (room.teamMain) {
+				throw new Meteor.Error('error-cannot-delete-team-channel', 'Cannot delete a team channel', {
+					method: 'eraseRoom',
+				});
+			}
+
+			await eraseRoom(room, this.user);
+
+			return API.v1.success();
+		},
+	)
 	.post(
 		'rooms.leave',
 		{
@@ -1296,10 +1298,7 @@ export const roomEndpoints = API.v1
 		},
 	);
 
-type RoomEndpoints = ExtractRoutesFromAPI<typeof roomEndpoints> &
-	ExtractRoutesFromAPI<typeof roomEndpoints> &
-	ExtractRoutesFromAPI<typeof roomDeleteEndpoint> &
-	ExtractRoutesFromAPI<typeof roomsSaveNotificationEndpoint>;
+type RoomEndpoints = ExtractRoutesFromAPI<typeof roomEndpoints>;
 
 declare module '@rocket.chat/rest-typings' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-empty-interface