Merge pull request #3114 from bluewave-labs/fix/log-controller

js->ts

server/src/config/controllers.js

@@ -41,7 +41,7 @@ export const initializeControllers = (services) => {
 
 	controllers.maintenanceWindowController = new MaintenanceWindowController(services.maintenanceWindowService);
 	controllers.queueController = new QueueController(services.jobQueue);
-	controllers.logController = new LogController(commonDependencies);
+	controllers.logController = new LogController(services.logger);
 	controllers.statusPageController = new StatusPageController(services.db);
 	controllers.notificationController = new NotificationController(services.notificationService, services.db);
 	controllers.diagnosticController = new DiagnosticController(commonDependencies, {

server/src/controllers/v1/logController.js

@@ -1,26 +0,0 @@
-import BaseController from "./baseController.js";
-const SERVICE_NAME = "LogController";
-
-class LogController extends BaseController {
-	static SERVICE_NAME = SERVICE_NAME;
-	constructor(commonDependencies) {
-		super(commonDependencies);
-	}
-
-	get serviceName() {
-		return LogController.SERVICE_NAME;
-	}
-
-	getLogs = this.asyncHandler(
-		async (req, res) => {
-			const logs = await this.logger.getLogs();
-			res.success({
-				msg: "Logs fetched successfully",
-				data: logs,
-			});
-		},
-		SERVICE_NAME,
-		"getLogs"
-	);
-}
-export default LogController;

server/src/controllers/v1/logController.ts

@@ -0,0 +1,28 @@
+import { Request, Response, NextFunction } from "express";
+
+const SERVICE_NAME = "LogController";
+
+class LogController {
+	static SERVICE_NAME = SERVICE_NAME;
+	private logger: any;
+	constructor(logger: any) {
+		this.logger = logger;
+	}
+	get serviceName() {
+		return LogController.SERVICE_NAME;
+	}
+
+	getLogs = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const logs = await this.logger.getLogs();
+			res.status(200).json({
+				success: true,
+				msg: "Logs fetched successfully",
+				data: logs,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+}
+export default LogController;