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

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' });
 	}