fix: merge + fixes
This commit is contained in:
		
							parent
							
								
									7d8a0fcbb2
								
							
						
					
					
						commit
						3c1eb82ce3
					
				
					 20 changed files with 52 additions and 41 deletions
				
			
		|  | @ -1,6 +1,7 @@ | |||
| import { Question } from '../entities/questions/question.entity.js'; | ||||
| import { mapToStudentDTO } from './student.js'; | ||||
| import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; | ||||
| import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content'; | ||||
| 
 | ||||
| function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier { | ||||
|     return { | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ import { ClassJoinRequest, ClassJoinRequestStatus } from '../entities/classes/cl | |||
| import { getClassJoinRequestRepository } from '../data/repositories.js'; | ||||
| import { Student } from '../entities/users/student.entity.js'; | ||||
| import { Class } from '../entities/classes/class.entity.js'; | ||||
| import { ClassJoinRequestDTO } from 'dwengo-1-common/src/interfaces/class-join-request'; | ||||
| import { ClassJoinRequestDTO } from 'common/src/interfaces/class-join-request'; | ||||
| 
 | ||||
| export function mapToStudentRequestDTO(request: ClassJoinRequest): ClassJoinRequestDTO { | ||||
|     return { | ||||
|  |  | |||
		Reference in a new issue
	
	 Gabriellvl
						Gabriellvl