merge: fixed merge conflicts with dev
This commit is contained in:
commit
faa2f58145
165 changed files with 3948 additions and 3282 deletions
|
@ -62,10 +62,20 @@ export async function createTeacher(userData: TeacherDTO, update?: boolean): Pro
|
|||
const teacherRepository: TeacherRepository = getTeacherRepository();
|
||||
|
||||
const newTeacher = mapToTeacher(userData);
|
||||
await teacherRepository.save(newTeacher, { preventOverwrite: !update });
|
||||
await teacherRepository.save(newTeacher, { preventOverwrite: true });
|
||||
|
||||
return mapToTeacherDTO(newTeacher);
|
||||
}
|
||||
|
||||
export async function createOrUpdateTeacher(userData: TeacherDTO): Promise<TeacherDTO> {
|
||||
await getTeacherRepository().upsert({
|
||||
username: userData.username,
|
||||
firstName: userData.firstName,
|
||||
lastName: userData.lastName,
|
||||
});
|
||||
return userData;
|
||||
}
|
||||
|
||||
export async function deleteTeacher(username: string): Promise<TeacherDTO> {
|
||||
const teacherRepository: TeacherRepository = getTeacherRepository();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue