From e78849f5683f3c2edda03ff1d26f091d7ca600b7 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Thu, 13 Mar 2025 17:45:28 +0000 Subject: [PATCH] style: fix linting issues met ESLint --- backend/src/controllers/groups.ts | 2 +- backend/src/controllers/questions.ts | 30 +++++++++---------- backend/src/controllers/submissions.ts | 16 +++++----- .../src/data/questions/question-repository.ts | 6 ++-- backend/src/data/users/student-repository.ts | 4 +-- .../entities/assignments/assignment.entity.ts | 16 +++------- .../src/entities/assignments/group.entity.ts | 4 +-- .../classes/class-join-request.entity.ts | 4 +-- backend/src/entities/classes/class.entity.ts | 4 +-- .../src/entities/content/attachment.entity.ts | 8 ++--- backend/src/interfaces/class.ts | 8 ++--- backend/src/interfaces/group.ts | 4 +-- backend/src/interfaces/submission.ts | 6 ++-- backend/src/routes/questions.ts | 2 +- backend/src/services/class.ts | 10 ++----- backend/src/services/learning-objects.ts | 16 +++------- backend/src/services/questions.ts | 10 +++---- backend/src/services/students.ts | 8 ++--- backend/src/services/submissions.ts | 2 +- backend/src/services/teachers.ts | 16 +++------- backend/src/services/users.ts | 4 +-- 21 files changed, 64 insertions(+), 116 deletions(-) diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 5fd90553..9ef5b93c 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -83,7 +83,7 @@ export async function getGroupSubmissionsHandler( res: Response, ): Promise { const classId = req.params.classid; - // const full = req.query.full === 'true'; + // Const full = req.query.full === 'true'; const assignmentId = +req.params.assignmentid; diff --git a/backend/src/controllers/questions.ts b/backend/src/controllers/questions.ts index 2b57f4c9..b4451aa2 100644 --- a/backend/src/controllers/questions.ts +++ b/backend/src/controllers/questions.ts @@ -32,7 +32,7 @@ function getQuestionId(req: Request, res: Response): QuestionId | null { const learningObjectIdentifier = getObjectId(req,res); if (!learningObjectIdentifier) - return null + {return null} return { learningObjectIdentifier, @@ -48,28 +48,28 @@ export async function getAllQuestionsHandler( const full = req.query.full === 'true'; if (!objectId) - return + {return} const questions = await getAllQuestions(objectId, full); if (!questions) - res.status(404).json({ error: `Questions not found.` }); + {res.status(404).json({ error: `Questions not found.` });} else - res.json(questions); + {res.json(questions);} } export async function getQuestionHandler(req: Request, res: Response): Promise { const questionId = getQuestionId(req, res); if (!questionId) - return + {return} const question = await getQuestion(questionId); if (!question) - res.status(404).json({ error: `Question not found.` }); + {res.status(404).json({ error: `Question not found.` });} else - res.json(question) + {res.json(question)} } export async function getQuestionAnswersHandler(req: Request, res: Response): Promise { @@ -77,14 +77,14 @@ export async function getQuestionAnswersHandler(req: Request, res: Response): Pr const full = req.query.full === 'true'; if (!questionId) - return + {return} const answers = getAnswersByQuestion(questionId, full); if (!answers) - res.status(404).json({ error: `Questions not found.` }); + {res.status(404).json({ error: `Questions not found.` });} else - res.json(answers) + {res.json(answers)} } export async function createQuestionHandler(req: Request, res: Response): Promise { @@ -98,23 +98,23 @@ export async function createQuestionHandler(req: Request, res: Response): Promis const question = await createQuestion(questionDTO); if (!question) - res.status(400).json({error: 'Could not add question'}); + {res.status(400).json({error: 'Could not add question'});} else - res.json(question) + {res.json(question)} } export async function deleteQuestionHandler(req: Request, res: Response): Promise { const questionId = getQuestionId(req, res); if (!questionId) - return + {return} const question = await deleteQuestion(questionId); if (!question) - res.status(400).json({error: 'Could not find nor delete question'}); + {res.status(400).json({error: 'Could not find nor delete question'});} else - res.json(question) + {res.json(question)} } diff --git a/backend/src/controllers/submissions.ts b/backend/src/controllers/submissions.ts index 4080d1e7..96f0185c 100644 --- a/backend/src/controllers/submissions.ts +++ b/backend/src/controllers/submissions.ts @@ -20,8 +20,8 @@ export async function getSubmissionHandler( return; } - let lang = languageMap[req.query.language as string] || Language.Dutch; - let version = (req.query.version || 1) as number; + const lang = languageMap[req.query.language as string] || Language.Dutch; + const version = (req.query.version || 1) as number; const submission = await getSubmission(lohruid, lang, version, submissionNumber); @@ -39,22 +39,22 @@ export async function createSubmissionHandler(req: Request, res: Response){ const submission = await createSubmission(submissionDTO); if (!submission) - res.status(404).json({ error: 'Submission not added' }); + {res.status(404).json({ error: 'Submission not added' });} else - res.json(submission) + {res.json(submission)} } export async function deleteSubmissionHandler(req: Request, res: Response){ const hruid = req.params.hruid; const submissionNumber = +req.params.id; - let lang = languageMap[req.query.language as string] || Language.Dutch; - let version = (req.query.version || 1) as number; + const lang = languageMap[req.query.language as string] || Language.Dutch; + const version = (req.query.version || 1) as number; const submission = await deleteSubmission(hruid, lang, version, submissionNumber); if (!submission) - res.status(404).json({ error: 'Submission not found' }); + {res.status(404).json({ error: 'Submission not found' });} else - res.json(submission) + {res.json(submission)} } diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index dc8502d1..e24d48b8 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -50,13 +50,11 @@ export class QuestionRepository extends DwengoEntityRepository { public async findAllByLearningObjects( learningObjects: LearningObject[] ): Promise { - const objectIdentifiers = learningObjects.map((lo) => { - return { + const objectIdentifiers = learningObjects.map((lo) => ({ learningObjectHruid: lo.hruid, learningObjectLanguage: lo.language, learningObjectVersion: lo.version, - }; - }); + })); return this.findAll({ where: { $or: objectIdentifiers }, diff --git a/backend/src/data/users/student-repository.ts b/backend/src/data/users/student-repository.ts index d3be9081..f3cf7b6a 100644 --- a/backend/src/data/users/student-repository.ts +++ b/backend/src/data/users/student-repository.ts @@ -1,9 +1,9 @@ import { Student } from '../../entities/users/student.entity.js'; import { User } from '../../entities/users/user.entity.js'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; -// import { UserRepository } from './user-repository.js'; +// Import { UserRepository } from './user-repository.js'; -// export class StudentRepository extends UserRepository {} +// Export class StudentRepository extends UserRepository {} export class StudentRepository extends DwengoEntityRepository { public findByUsername(username: string): Promise { diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts index 4992cca4..a1f53386 100644 --- a/backend/src/entities/assignments/assignment.entity.ts +++ b/backend/src/entities/assignments/assignment.entity.ts @@ -13,15 +13,11 @@ import { Language } from '../content/language.js'; import { AssignmentRepository } from '../../data/assignments/assignment-repository.js'; @Entity({ - repository: () => { - return AssignmentRepository; - }, + repository: () => AssignmentRepository, }) export class Assignment { @ManyToOne({ - entity: () => { - return Class; - }, + entity: () => Class, primary: true, }) within!: Class; @@ -39,16 +35,12 @@ export class Assignment { learningPathHruid!: string; @Enum({ - items: () => { - return Language; - }, + items: () => Language, }) learningPathLanguage!: Language; @OneToMany({ - entity: () => { - return Group; - }, + entity: () => Group, mappedBy: 'assignment', }) groups!: Group[]; diff --git a/backend/src/entities/assignments/group.entity.ts b/backend/src/entities/assignments/group.entity.ts index a961ed53..213e0f38 100644 --- a/backend/src/entities/assignments/group.entity.ts +++ b/backend/src/entities/assignments/group.entity.ts @@ -4,9 +4,7 @@ import { Student } from '../users/student.entity.js'; import { GroupRepository } from '../../data/assignments/group-repository.js'; @Entity({ - repository: () => { - return GroupRepository; - }, + repository: () => GroupRepository, }) export class Group { @ManyToOne({ diff --git a/backend/src/entities/classes/class-join-request.entity.ts b/backend/src/entities/classes/class-join-request.entity.ts index bf7e6355..bdef1f52 100644 --- a/backend/src/entities/classes/class-join-request.entity.ts +++ b/backend/src/entities/classes/class-join-request.entity.ts @@ -4,9 +4,7 @@ import { Class } from './class.entity.js'; import { ClassJoinRequestRepository } from '../../data/classes/class-join-request-repository.js'; @Entity({ - repository: () => { - return ClassJoinRequestRepository; - }, + repository: () => ClassJoinRequestRepository, }) export class ClassJoinRequest { @ManyToOne({ diff --git a/backend/src/entities/classes/class.entity.ts b/backend/src/entities/classes/class.entity.ts index a2c016ef..a484deff 100644 --- a/backend/src/entities/classes/class.entity.ts +++ b/backend/src/entities/classes/class.entity.ts @@ -11,9 +11,7 @@ import { Student } from '../users/student.entity.js'; import { ClassRepository } from '../../data/classes/class-repository.js'; @Entity({ - repository: () => { - return ClassRepository; - }, + repository: () => ClassRepository, }) export class Class { @PrimaryKey() diff --git a/backend/src/entities/content/attachment.entity.ts b/backend/src/entities/content/attachment.entity.ts index 3903f055..80104f28 100644 --- a/backend/src/entities/content/attachment.entity.ts +++ b/backend/src/entities/content/attachment.entity.ts @@ -3,15 +3,11 @@ import { LearningObject } from './learning-object.entity.js'; import { AttachmentRepository } from '../../data/content/attachment-repository.js'; @Entity({ - repository: () => { - return AttachmentRepository; - }, + repository: () => AttachmentRepository, }) export class Attachment { @ManyToOne({ - entity: () => { - return LearningObject; - }, + entity: () => LearningObject, primary: true, }) learningObject!: LearningObject; diff --git a/backend/src/interfaces/class.ts b/backend/src/interfaces/class.ts index 379a8635..e04ce2d4 100644 --- a/backend/src/interfaces/class.ts +++ b/backend/src/interfaces/class.ts @@ -21,12 +21,8 @@ export function mapToClassDTO(cls: Class): ClassDTO { return { id: cls.classId!, displayName: cls.displayName, - teachers: cls.teachers.map((teacher) => { - return teacher.username; - }), - students: cls.students.map((student) => { - return student.username; - }), + teachers: cls.teachers.map((teacher) => teacher.username), + students: cls.students.map((student) => student.username), joinRequests: [], // TODO }; } diff --git a/backend/src/interfaces/group.ts b/backend/src/interfaces/group.ts index 2dd3f2c1..a25c5b8e 100644 --- a/backend/src/interfaces/group.ts +++ b/backend/src/interfaces/group.ts @@ -20,8 +20,6 @@ export function mapToGroupDTOId(group: Group): GroupDTO { return { assignment: group.assignment.id!, groupNumber: group.groupNumber!, - members: group.members.map((member) => { - return member.username; - }), + members: group.members.map((member) => member.username), }; } diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts index 2400075f..40b76fad 100644 --- a/backend/src/interfaces/submission.ts +++ b/backend/src/interfaces/submission.ts @@ -36,10 +36,10 @@ export function mapToSubmission(submissionDTO: SubmissionDTO): Submission { submission.learningObjectHruid = submissionDTO.learningObjectHruid; submission.learningObjectLanguage = submissionDTO.learningObjectLanguage; submission.learningObjectVersion = submissionDTO.learningObjectVersion; - // submission.submissionNumber = submissionDTO.submissionNumber; + // Submission.submissionNumber = submissionDTO.submissionNumber; submission.submitter = mapToStudent(submissionDTO.submitter) ; - // submission.submissionTime = submissionDTO.time; - // submission.onBehalfOf = submissionDTO.group!; + // Submission.submissionTime = submissionDTO.time; + // Submission.onBehalfOf = submissionDTO.group!; // TODO fix group submission.content = submissionDTO.content; diff --git a/backend/src/routes/questions.ts b/backend/src/routes/questions.ts index d635a85e..d9a4dd9d 100644 --- a/backend/src/routes/questions.ts +++ b/backend/src/routes/questions.ts @@ -7,7 +7,7 @@ import { } from "../controllers/questions.js"; const router = express.Router({ mergeParams: true }); -// query language +// Query language // Root endpoint used to search objects router.get('/', getAllQuestionsHandler); diff --git a/backend/src/services/class.ts b/backend/src/services/class.ts index a7f5f7ea..4b76d0cd 100644 --- a/backend/src/services/class.ts +++ b/backend/src/services/class.ts @@ -29,9 +29,7 @@ export async function getAllClasses( if (full) { return classes.map(mapToClassDTO); } - return classes.map((cls) => { - return cls.classId!; - }); + return classes.map((cls) => cls.classId!); } export async function createClass(classData: ClassDTO): Promise { @@ -45,7 +43,7 @@ export async function createClass(classData: ClassDTO): Promise { const students = (await Promise.all(studentUsernames.map(id => studentRepository.findByUsername(id)))) .filter(student => student != null); - //const cls = mapToClass(classData, teachers, students); + //Const cls = mapToClass(classData, teachers, students); const classRepository = getClassRepository(); @@ -91,9 +89,7 @@ export async function getClassStudents(classId: string): Promise { export async function getClassStudentsIds(classId: string): Promise { const students: StudentDTO[] = await fetchClassStudents(classId); - return students.map((student) => { - return student.username; - }); + return students.map((student) => student.username); } export async function getClassTeacherInvitations( diff --git a/backend/src/services/learning-objects.ts b/backend/src/services/learning-objects.ts index 4f7d66a8..dfde4da7 100644 --- a/backend/src/services/learning-objects.ts +++ b/backend/src/services/learning-objects.ts @@ -85,23 +85,15 @@ async function fetchLearningObjects( const nodes: LearningObjectNode[] = learningPathResponse.data[0].nodes; if (!full) { - return nodes.map((node) => { - return node.learningobject_hruid; - }); + return nodes.map((node) => node.learningobject_hruid); } return await Promise.all( - nodes.map(async (node) => { - return getLearningObjectById( + nodes.map(async (node) => getLearningObjectById( node.learningobject_hruid, language - ); - }) - ).then((objects) => { - return objects.filter((obj): obj is FilteredLearningObject => { - return obj !== null; - }); - }); + )) + ).then((objects) => objects.filter((obj): obj is FilteredLearningObject => obj !== null)); } catch (error) { console.error('❌ Error fetching learning objects:', error); return []; diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index 6be684f9..238ebd45 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -45,7 +45,7 @@ export async function getQuestion(questionId: QuestionId): Promise { export async function getAllStudentIds(): Promise { const users = await getAllStudents(); - return users.map((user) => { - return user.username; - }); + return users.map((user) => user.username); } export async function getStudent(username: string): Promise { @@ -98,9 +96,7 @@ export async function getStudentAssignments(username: string, full: boolean): Pr const assignments = ( await Promise.all( - classes.map(async (cls) => { - return await getAllAssignments(cls.classId!, full); - }) + classes.map(async (cls) => await getAllAssignments(cls.classId!, full)) ) ).flat(); diff --git a/backend/src/services/submissions.ts b/backend/src/services/submissions.ts index ce6f7bff..c9135001 100644 --- a/backend/src/services/submissions.ts +++ b/backend/src/services/submissions.ts @@ -46,7 +46,7 @@ export async function deleteSubmission( const submission = getSubmission(learningObjectHruid, language, version, submissionNumber); if (!submission) - return null + {return null} const loId = new LearningObjectIdentifier(learningObjectHruid, language, version); await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(loId, submissionNumber); diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index 12325857..2f462ed9 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -27,9 +27,7 @@ export async function getAllTeachers(): Promise { export async function getAllTeacherIds(): Promise { const users = await getAllTeachers(); - return users.map((user) => { - return user.username; - }); + return users.map((user) => user.username); } export async function getTeacher(username: string): Promise { @@ -89,9 +87,7 @@ export async function getClassesByTeacher(username: string): Promise export async function getClassIdsByTeacher(username: string): Promise { const classes = await fetchClassesByTeacher(username); - return classes.map((cls) => { - return cls.id; - }); + return classes.map((cls) => cls.id); } export async function fetchStudentsByTeacher(username: string) { @@ -99,9 +95,7 @@ export async function fetchStudentsByTeacher(username: string) { return ( await Promise.all( - classes.map(async (id) => { - return getClassStudents(id); - }) + classes.map(async (id) => getClassStudents(id)) ) ).flat(); } @@ -112,9 +106,7 @@ export async function getStudentsByTeacher(username: string): Promise { const students = await fetchStudentsByTeacher(username); - return students.map((student) => { - return student.username; - }); + return students.map((student) => student.username); } export async function fetchTeacherQuestions(username: string): Promise { diff --git a/backend/src/services/users.ts b/backend/src/services/users.ts index fc1ea599..65ed5d4c 100644 --- a/backend/src/services/users.ts +++ b/backend/src/services/users.ts @@ -16,9 +16,7 @@ export class UserService { async getAllUserIds(): Promise { const users = await this.getAllUsers(); - return users.map((user) => { - return user.username; - }); + return users.map((user) => user.username); } async getUserByUsername(username: string): Promise {