Merge branch 'dev' into feat/service-layer

backend/src/app.ts

@@ -1,4 +1,4 @@
-import express, { Express, Response } from 'express';
+import express, { Express } from 'express';
 import { initORM } from './orm.js';
 
 import themeRoutes from './routes/themes.js';
@@ -13,12 +13,14 @@ import submissionRouter from './routes/submissions.js';
 import classRouter from './routes/classes.js';
 import questionRouter from './routes/questions.js';
 import authRouter from './routes/auth.js';
+
 import { authenticateUser } from './middleware/auth/auth.js';
 import cors from './middleware/cors.js';
 import { getLogger, Logger } from './logging/initalize.js';
 import { responseTimeLogger } from './logging/responseTimeLogger.js';
 import responseTime from 'response-time';
 import { EnvVars, getNumericEnvVar } from './util/envvars.js';
+import apiRouter from './routes/router.js';
 
 const logger: Logger = getLogger();
 
@@ -30,31 +32,13 @@ app.use(express.json());
 app.use(responseTime(responseTimeLogger));
 app.use(authenticateUser);
 
-// TODO Replace with Express routes
-app.get('/', (_, res: Response) => {
-    logger.debug('GET /');
-    res.json({
-        message: 'Hello Dwengo!🚀',
-    });
-});
-
-app.use('/student', studentRouter);
-app.use('/teacher', teacherRouter);
-app.use('/group', groupRouter);
-app.use('/assignment', assignmentRouter);
-app.use('/submission', submissionRouter);
-app.use('/class', classRouter);
-app.use('/question', questionRouter);
-app.use('/auth', authRouter);
-app.use('/theme', themeRoutes);
-app.use('/learningPath', learningPathRoutes);
-app.use('/learningObject', learningObjectRoutes);
+app.get('/api', apiRouter);
 
 async function startServer() {
     await initORM();
 
     app.listen(port, () => {
-        logger.info(`Server is running at http://localhost:${port}`);
+        logger.info(`Server is running at http://localhost:${port}/api`);
     });
 }
 

backend/src/routes/router.ts

@@ -0,0 +1,35 @@
+import { Response, Router } from 'express';
+import studentRouter from './student';
+import groupRouter from './group';
+import assignmentRouter from './assignment';
+import submissionRouter from './submission';
+import classRouter from './class';
+import questionRouter from './question';
+import authRouter from './auth';
+import themeRoutes from './themes';
+import learningPathRoutes from './learning-paths';
+import learningObjectRoutes from './learning-objects';
+import { getLogger, Logger } from '../logging/initalize';
+
+const router = Router();
+const logger: Logger = getLogger();
+
+router.get('/', (_, res: Response) => {
+    logger.debug('GET /');
+    res.json({
+        message: 'Hello Dwengo!🚀',
+    });
+});
+
+router.use('/student', studentRouter);
+router.use('/group', groupRouter);
+router.use('/assignment', assignmentRouter);
+router.use('/submission', submissionRouter);
+router.use('/class', classRouter);
+router.use('/question', questionRouter);
+router.use('/auth', authRouter);
+router.use('/theme', themeRoutes);
+router.use('/learningPath', learningPathRoutes);
+router.use('/learningObject', learningObjectRoutes);
+
+export default router;