Merge remote-tracking branch 'origin/dev' into fix/class-join-request
# Conflicts: # backend/src/controllers/classes.ts # backend/src/data/questions/question-repository.ts # backend/tests/controllers/students.test.ts # backend/tests/controllers/teachers.test.ts
This commit is contained in:
		
						commit
						0a0857deb9
					
				
					 58 changed files with 2058 additions and 277 deletions
				
			
		
							
								
								
									
										16
									
								
								backend/src/routes/answers.ts
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								backend/src/routes/answers.ts
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,16 @@ | |||
| import express from 'express'; | ||||
| import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAllAnswersHandler, updateAnswerHandler } from '../controllers/answers.js'; | ||||
| 
 | ||||
| const router = express.Router({ mergeParams: true }); | ||||
| 
 | ||||
| router.get('/', getAllAnswersHandler); | ||||
| 
 | ||||
| router.post('/', createAnswerHandler); | ||||
| 
 | ||||
| router.get('/:seqAnswer', getAnswerHandler); | ||||
| 
 | ||||
| router.delete('/:seqAnswer', deleteAnswerHandler); | ||||
| 
 | ||||
| router.put('/:seqAnswer', updateAnswerHandler); | ||||
| 
 | ||||
| export default router; | ||||
|  | @ -1,11 +1,7 @@ | |||
| import express from 'express'; | ||||
| import { | ||||
|     createQuestionHandler, | ||||
|     deleteQuestionHandler, | ||||
|     getAllQuestionsHandler, | ||||
|     getQuestionAnswersHandler, | ||||
|     getQuestionHandler, | ||||
| } from '../controllers/questions.js'; | ||||
| import { createQuestionHandler, deleteQuestionHandler, getAllQuestionsHandler, getQuestionHandler } from '../controllers/questions.js'; | ||||
| import answerRoutes from './answers.js'; | ||||
| 
 | ||||
| const router = express.Router({ mergeParams: true }); | ||||
| 
 | ||||
| // Query language
 | ||||
|  | @ -20,6 +16,6 @@ router.delete('/:seq', deleteQuestionHandler); | |||
| // Information about a question with id
 | ||||
| router.get('/:seq', getQuestionHandler); | ||||
| 
 | ||||
| router.get('/answers/:seq', getQuestionAnswersHandler); | ||||
| router.use('/:seq/answers', answerRoutes); | ||||
| 
 | ||||
| export default router; | ||||
|  |  | |||
		Reference in a new issue
	
	 Gabriellvl
						Gabriellvl