fix: merge errors
This commit is contained in:
parent
066f9e64c6
commit
66a65c1e67
7 changed files with 97 additions and 15 deletions
|
@ -1,5 +1,8 @@
|
|||
import {mapToStudentDTO, StudentDTO} from "./student";
|
||||
import {ClassJoinRequest, ClassJoinRequestStatus} from "../entities/classes/class-join-request.entity";
|
||||
import {getClassJoinRequestRepository} from "../data/repositories";
|
||||
import {Student} from "../entities/users/student.entity";
|
||||
import {Class} from "../entities/classes/class.entity";
|
||||
|
||||
export interface StudentRequestDTO {
|
||||
requester: StudentDTO;
|
||||
|
@ -14,3 +17,11 @@ export function mapToStudentRequestDTO(request: ClassJoinRequest): StudentReques
|
|||
status: request.status,
|
||||
};
|
||||
}
|
||||
|
||||
export function mapToStudentRequest(student: Student, cls: Class) {
|
||||
return getClassJoinRequestRepository().create({
|
||||
requester: student,
|
||||
class: cls,
|
||||
status: ClassJoinRequestStatus.Open,
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue