Merge remote-tracking branch 'origin/main' into backend_complete

SerpentRace_Backend/src/Api/routers/adminRouter.ts

@@ -107,6 +107,41 @@ router.get('/users/page/:from/:to', adminRequired, async (req: Request, res: Res
     }
 });
 
+<<<<<<< HEAD
+=======
+// Get users by page (admin only) - RECOMMENDED
+router.get('/users/page/:from/:to', adminRequired, async (req: Request, res: Response) => {
+    try {
+        const from = parseInt(req.params.from);
+        const to = parseInt(req.params.to);
+        const includeDeleted = req.query.includeDeleted === 'true';
+        
+        if (isNaN(from) || isNaN(to) || from < 0 || to < from) {
+            return res.status(400).json({ error: 'Invalid page parameters. "from" and "to" must be valid numbers with to >= from >= 0' });
+        }
+        
+        logRequest('Admin get users by page endpoint accessed', req, res, { from, to, includeDeleted });
+        
+        const result = includeDeleted
+            ? await container.userRepository.findByPageIncludingDeleted(from, to)
+            : await container.userRepository.findByPage(from, to);
+        
+        logRequest('Admin users page retrieved successfully', req, res, { 
+            from, 
+            to, 
+            count: result.users.length, 
+            total: result.totalCount,
+            includeDeleted 
+        });
+        
+        res.json(result);
+    } catch (error) {
+        logError('Admin get users by page endpoint error', error as Error, req, res);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+
+>>>>>>> origin/main
 // Get user by ID including soft-deleted ones
 router.get('/users/:userId', 
     adminRequired,
@@ -141,6 +176,7 @@ router.get('/users/:userId',
 });
 
 // Search users including soft-deleted ones
+<<<<<<< HEAD
 // router.get('/users/search/:searchTerm',
 //     adminRequired,
 //     ValidationMiddleware.validateStringLength({ searchTerm: { min: 2, max: 100 } }),
@@ -167,6 +203,34 @@ router.get('/users/:userId',
 //         res.status(500).json({ error: 'Internal server error' });
 //     }
 // });
+=======
+router.get('/users/search/:searchTerm',
+    adminRequired,
+    ValidationMiddleware.validateStringLength({ searchTerm: { min: 2, max: 100 } }),
+    async (req: Request, res: Response) => {
+    try {
+        const { searchTerm } = req.params;
+        const includeDeleted = req.query.includeDeleted === 'true';
+        
+        logRequest('Admin search users endpoint accessed', req, res, { searchTerm, includeDeleted });
+        
+        const users = includeDeleted
+            ? await container.userRepository.searchIncludingDeleted(searchTerm)
+            : await container.userRepository.search(searchTerm);
+
+        logRequest('Admin user search completed', req, res, { 
+            searchTerm,
+            resultCount: Array.isArray(users) ? users.length : (users.totalCount || 0),
+            includeDeleted
+        });
+
+        res.json(users);
+    } catch (error) {
+        logError('Admin search users endpoint error', error as Error, req, res);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+>>>>>>> origin/main
 
 // Update any user (admin only)
 router.patch('/users/:userId',
@@ -358,6 +422,7 @@ router.get('/decks/search/:searchTerm', adminRequired, async (req: Request, res:
     }
 });
 
+<<<<<<< HEAD
 //modify deck (admin only)
 router.patch('/decks/:id', adminRequired, async (req: Request, res: Response) => {
     try {
@@ -382,6 +447,8 @@ router.patch('/decks/:id', adminRequired, async (req: Request, res: Response) =>
     }
 });
 
+=======
+>>>>>>> origin/main
 // Hard delete deck (admin only)
 router.delete('/decks/:id/hard', adminRequired, async (req: Request, res: Response) => {
     try {

SerpentRace_Backend/src/Api/routers/deckRouter.ts

@@ -60,7 +60,11 @@ deckRouter.post('/', authRequired, async (req, res) => {
 	try {
 		const userId = (req as any).user.userId;
 		logRequest('Create deck endpoint accessed', req, res, { name: req.body.name, userId });
+<<<<<<< HEAD
 		req.body.userid = userId; // Set userId in request body
+=======
+		
+>>>>>>> origin/main
 		const result = await container.createDeckCommandHandler.execute(req.body);
 		
 		logRequest('Deck created successfully', req, res, { deckId: result.id, name: req.body.name, userId });
@@ -140,7 +144,11 @@ deckRouter.get('/:id', authRequired, async (req, res) => {
 	}
 });
 
+<<<<<<< HEAD
 deckRouter.patch('/:id', authRequired, async (req, res) => {
+=======
+deckRouter.put('/:id', authRequired, async (req, res) => {
+>>>>>>> origin/main
 	try {
 		const deckId = req.params.id;
 		const userId = (req as any).user.userId;
@@ -164,10 +172,13 @@ deckRouter.patch('/:id', authRequired, async (req, res) => {
 		if (error instanceof Error && error.message.includes('validation')) {
 			return res.status(400).json({ error: 'Invalid input data', details: error.message });
 		}
+<<<<<<< HEAD
 
 		if (error instanceof Error && error.message.includes('admin')) {
 			return res.status(403).json({ error: 'Forbidden: ' + error.message });
 		}
+=======
+>>>>>>> origin/main
 		
 		res.status(500).json({ error: 'Internal server error' });
 	}

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -32,7 +32,11 @@ userRouter.post('/login',
 			logAuth('User login successful', result.user.id, { username: result.user.username }, req, res);
 			res.json(result);
 		} else {
+<<<<<<< HEAD
 			throw new Error(`Login failed: ${result}`);
+=======
+			return ErrorResponseService.sendUnauthorized(res, 'Invalid username or password');
+>>>>>>> origin/main
 		}
 		
 	} catch (error) {
@@ -48,9 +52,12 @@ userRouter.post('/login',
 			if (error.message.includes('not verified')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Please verify your email address');
 			}
+<<<<<<< HEAD
 			if (error.message.includes('restriction')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Please verify your email address');
 			}
+=======
+>>>>>>> origin/main
 			if (error.message.includes('deactivated')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Account has been deactivated');
 			}
@@ -87,8 +94,12 @@ userRouter.post('/create',
 		res.status(201).json(result);
 		
 	} catch (error) {
+<<<<<<< HEAD
 		// Don't log here since CreateUserCommandHandler already logs system errors
 		// Only log validation/user input errors at router level
+=======
+		logError('Create user endpoint error', error as Error, req, res);
+>>>>>>> origin/main
 		
 		if (error instanceof Error) {
 			if (error.message.includes('already exists')) {
@@ -97,10 +108,13 @@ userRouter.post('/create',
 			if (error.message.includes('validation')) {
 				return ErrorResponseService.sendBadRequest(res, error.message);
 			}
+<<<<<<< HEAD
 			// Log unexpected errors that weren't handled by the command handler
 			if (!error.message.includes('Failed to create user')) {
 				logError('Unexpected create user endpoint error', error as Error, req, res);
 			}
+=======
+>>>>>>> origin/main
 		}
 		
 		return ErrorResponseService.sendInternalServerError(res);
@@ -173,6 +187,7 @@ userRouter.patch('/profile', authRequired, async (req, res) => {
 	}
 });
 
+<<<<<<< HEAD
 //Soft delete user (current user)
 userRouter.delete('/profile', authRequired, async (req, res) => {
 	try {
@@ -310,4 +325,6 @@ userRouter.post('/reset-password',
 	}
 });
 
+=======
+>>>>>>> origin/main
 export default userRouter;