style: fix linting issues met Prettier
This commit is contained in:
parent
5cea6929f9
commit
a8895cc429
12 changed files with 104 additions and 121 deletions
|
@ -2,7 +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";
|
||||
import { Loaded } from '@mikro-orm/core';
|
||||
|
||||
export class AnswerRepository extends DwengoEntityRepository<Answer> {
|
||||
public async createAnswer(answer: { toQuestion: Question; author: Teacher; content: string }): Promise<Answer> {
|
||||
|
@ -22,7 +22,8 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
|
|||
}
|
||||
public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer> | null> {
|
||||
return this.findOne({
|
||||
toQuestion: question, sequenceNumber
|
||||
toQuestion: question,
|
||||
sequenceNumber,
|
||||
});
|
||||
}
|
||||
public async removeAnswerByQuestionAndSequenceNumber(question: Question, sequenceNumber: number): Promise<void> {
|
||||
|
|
|
@ -3,7 +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";
|
||||
import { Loaded } from '@mikro-orm/core';
|
||||
|
||||
export class QuestionRepository extends DwengoEntityRepository<Question> {
|
||||
public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
|
||||
|
@ -68,7 +68,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
|
|||
learningObjectHruid: loId.hruid,
|
||||
learningObjectLanguage: loId.language,
|
||||
learningObjectVersion: loId.version,
|
||||
sequenceNumber
|
||||
sequenceNumber,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
import express from "express";
|
||||
import {
|
||||
createAnswerHandler,
|
||||
deleteAnswerHandler,
|
||||
getAnswerHandler,
|
||||
getAllAnswersHandler,
|
||||
updateAnswerHandler
|
||||
} from "../controllers/answers";
|
||||
import express from 'express';
|
||||
import { createAnswerHandler, deleteAnswerHandler, getAnswerHandler, getAllAnswersHandler, updateAnswerHandler } from '../controllers/answers';
|
||||
|
||||
const router = express.Router({ mergeParams: true });
|
||||
|
||||
router.get('/', getAllAnswersHandler);
|
||||
|
||||
router.post('/', createAnswerHandler)
|
||||
router.post('/', createAnswerHandler);
|
||||
|
||||
router.get('/:seqAnswer', getAnswerHandler)
|
||||
router.get('/:seqAnswer', getAnswerHandler);
|
||||
|
||||
router.delete('/:seqAnswer', deleteAnswerHandler);
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import {getAnswerRepository} from "../data/repositories";
|
||||
import {Answer} from "../entities/questions/answer.entity";
|
||||
import {mapToAnswerDTO, mapToAnswerDTOId} from "../interfaces/answer";
|
||||
import {fetchTeacher} from "./teachers";
|
||||
import {fetchQuestion} from "./questions";
|
||||
import {QuestionId} from "@dwengo-1/common/interfaces/question";
|
||||
import {AnswerData, AnswerDTO, AnswerId} from "@dwengo-1/common/interfaces/answer";
|
||||
import {NotFoundException} from "../exceptions/not-found-exception";
|
||||
import { getAnswerRepository } from '../data/repositories';
|
||||
import { Answer } from '../entities/questions/answer.entity';
|
||||
import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer';
|
||||
import { fetchTeacher } from './teachers';
|
||||
import { fetchQuestion } from './questions';
|
||||
import { QuestionId } from '@dwengo-1/common/interfaces/question';
|
||||
import { AnswerData, AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
|
||||
import { NotFoundException } from '../exceptions/not-found-exception';
|
||||
|
||||
export async function getAnswersByQuestion(questionId: QuestionId, full: boolean): Promise<AnswerDTO[] | AnswerId[]> {
|
||||
const answerRepository = getAnswerRepository();
|
||||
|
@ -27,7 +27,9 @@ export async function createAnswer(questionId: QuestionId, answerData: AnswerDat
|
|||
const content = answerData.content;
|
||||
|
||||
const answer = await answerRepository.createAnswer({
|
||||
toQuestion, author, content
|
||||
toQuestion,
|
||||
author,
|
||||
content,
|
||||
});
|
||||
return mapToAnswerDTO(answer);
|
||||
}
|
||||
|
@ -37,7 +39,7 @@ async function fetchAnswer(questionId: QuestionId, sequenceNumber: number): Prom
|
|||
const question = await fetchQuestion(questionId);
|
||||
const answer = await answerRepository.findAnswer(question, sequenceNumber);
|
||||
|
||||
if (!answer){
|
||||
if (!answer) {
|
||||
throw new NotFoundException('Answer with questionID and sequence number not found');
|
||||
}
|
||||
|
||||
|
|
|
@ -56,11 +56,11 @@ export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDT
|
|||
const questionRepository = getQuestionRepository();
|
||||
const question = await fetchQuestion(questionId); // Throws error if not found
|
||||
|
||||
const loId : LearningObjectIdentifier = {
|
||||
const loId: LearningObjectIdentifier = {
|
||||
hruid: questionId.learningObjectIdentifier.hruid,
|
||||
language: questionId.learningObjectIdentifier.language,
|
||||
version: questionId.learningObjectIdentifier.version || FALLBACK_VERSION_NUM
|
||||
}
|
||||
version: questionId.learningObjectIdentifier.version || FALLBACK_VERSION_NUM,
|
||||
};
|
||||
|
||||
await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
|
||||
return mapToQuestionDTO(question);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue