From c07db3d999022212cc8f60cd7314993c36e2bb77 Mon Sep 17 00:00:00 2001 From: Gabriellvl Date: Mon, 7 Apr 2025 11:53:47 +0200 Subject: [PATCH] fix: lint --- backend/src/data/questions/answer-repository.ts | 5 +++-- backend/src/data/questions/question-repository.ts | 3 ++- backend/src/services/answers.ts | 2 +- backend/src/services/questions.ts | 2 +- backend/tests/controllers/answers.test.ts | 8 ++++---- backend/tests/controllers/questions.test.ts | 14 +++++++------- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts index 94798248..088ad623 100644 --- a/backend/src/data/questions/answer-repository.ts +++ b/backend/src/data/questions/answer-repository.ts @@ -2,6 +2,7 @@ import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; import { Answer } from '../../entities/questions/answer.entity.js'; import { Question } from '../../entities/questions/question.entity.js'; import { Teacher } from '../../entities/users/teacher.entity.js'; +import {Loaded} from "@mikro-orm/core"; export class AnswerRepository extends DwengoEntityRepository { public async createAnswer(answer: { toQuestion: Question; author: Teacher; content: string }): Promise { @@ -19,7 +20,7 @@ export class AnswerRepository extends DwengoEntityRepository { orderBy: { sequenceNumber: 'ASC' }, }); } - public async findAnswer(question: Question, sequenceNumber: number) { + public async findAnswer(question: Question, sequenceNumber: number): Promise | null> { return this.findOne({ toQuestion: question, sequenceNumber }); @@ -30,7 +31,7 @@ export class AnswerRepository extends DwengoEntityRepository { sequenceNumber: sequenceNumber, }); } - public async updateContent(answer: Answer, newContent: string){ + public async updateContent(answer: Answer, newContent: string): Promise { answer.content = newContent; await this.save(answer); return answer; diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 31a856a6..18bcd551 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -3,6 +3,7 @@ import { Question } from '../../entities/questions/question.entity.js'; import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js'; import { Student } from '../../entities/users/student.entity.js'; import { LearningObject } from '../../entities/content/learning-object.entity.js'; +import {Loaded} from "@mikro-orm/core"; export class QuestionRepository extends DwengoEntityRepository { public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise { @@ -62,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository { }); } - public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number){ + public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise | null> { return this.findOne({ learningObjectHruid: loId.hruid, learningObjectLanguage: loId.language, diff --git a/backend/src/services/answers.ts b/backend/src/services/answers.ts index 27b9cb13..4844ff79 100644 --- a/backend/src/services/answers.ts +++ b/backend/src/services/answers.ts @@ -59,7 +59,7 @@ export async function deleteAnswer(questionId: QuestionId, sequenceNumber: numbe return mapToAnswerDTO(answer); } -export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData){ +export async function updateAnswer(questionId: QuestionId, sequenceNumber: number, answerData: AnswerData): Promise { const answerRepository = getAnswerRepository(); const answer = await fetchAnswer(questionId, sequenceNumber); diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index a3c64b9f..71460691 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -52,7 +52,7 @@ export async function createQuestion(loId: LearningObjectIdentifier, questionDat export async function deleteQuestion(questionId: QuestionId): Promise { const questionRepository = getQuestionRepository(); - const question = await fetchQuestion(questionId); // throws error if not found + const question = await fetchQuestion(questionId); // Throws error if not found const loId : LearningObjectIdentifier = { hruid: questionId.learningObjectIdentifier.hruid, diff --git a/backend/tests/controllers/answers.test.ts b/backend/tests/controllers/answers.test.ts index d357fd0c..26d7568c 100644 --- a/backend/tests/controllers/answers.test.ts +++ b/backend/tests/controllers/answers.test.ts @@ -33,7 +33,7 @@ describe('Questions controllers', () => { expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answers: expect.anything()})); const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.answers); + // Console.log(result.answers); expect(result.questions).to.have.length.greaterThan(1); }); @@ -46,8 +46,8 @@ describe('Questions controllers', () => { await getAnswerHandler(req as Request, res as Response); expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answer: expect.anything()})); - // const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.answer); + // Const result = jsonMock.mock.lastCall?.[0]; + // Console.log(result.answer); }); it('Get answer hruid does not exist', async () => { @@ -83,7 +83,7 @@ describe('Questions controllers', () => { expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answer: expect.anything() })); const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.question); + // Console.log(result.question); expect(result.answer.content).to.eq(newContent); }); diff --git a/backend/tests/controllers/questions.test.ts b/backend/tests/controllers/questions.test.ts index 26fd588a..593445c0 100644 --- a/backend/tests/controllers/questions.test.ts +++ b/backend/tests/controllers/questions.test.ts @@ -37,7 +37,7 @@ describe('Questions controllers', () => { expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ questions: expect.anything() })); const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.questions); + // Console.log(result.questions); expect(result.questions).to.have.length.greaterThan(1); }); @@ -50,8 +50,8 @@ describe('Questions controllers', () => { await getQuestionHandler(req as Request, res as Response); expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() })); - // const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.question); + // Const result = jsonMock.mock.lastCall?.[0]; + // Console.log(result.question); }) it('Get question with fallback sequence number and version', async () => { @@ -63,8 +63,8 @@ describe('Questions controllers', () => { await getQuestionHandler(req as Request, res as Response); expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() })); - // const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.question); + // Const result = jsonMock.mock.lastCall?.[0]; + // Console.log(result.question); }) it('Get question hruid does not exist', async () => { @@ -88,7 +88,7 @@ describe('Questions controllers', () => { }) /* - it('Create and delete question', async() => { + It('Create and delete question', async() => { req = { params: { hruid: 'id05', version: '1', seq: '2'}, query: { lang: Language.English }, @@ -117,7 +117,7 @@ describe('Questions controllers', () => { expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ question: expect.anything() })); const result = jsonMock.mock.lastCall?.[0]; - // console.log(result.question); + // Console.log(result.question); expect(result.question.content).to.eq(newContent); }); });