refactor(common): Question

backend/src/controllers/questions.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
 import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.js';
-import { QuestionDTO, QuestionId } from '../interfaces/question.js';
 import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { Language } from '../entities/content/language.js';
+import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question';
 
 function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;

backend/src/interfaces/question.ts

@@ -1,15 +1,6 @@
 import { Question } from '../entities/questions/question.entity.js';
-import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { mapToStudentDTO } from './student.js';
-import { StudentDTO } from 'dwengo-1-common/src/interfaces/student';
+import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question';
-
-export interface QuestionDTO {
-    learningObjectIdentifier: LearningObjectIdentifier;
-    sequenceNumber?: number;
-    author: StudentDTO;
-    timestamp?: string;
-    content: string;
-}
 
 /**
  * Convert a Question entity to a DTO format.
@@ -30,11 +21,6 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
     };
 }
 
-export interface QuestionId {
-    learningObjectIdentifier: LearningObjectIdentifier;
-    sequenceNumber: number;
-}
-
 export function mapToQuestionId(question: QuestionDTO): QuestionId {
     return {
         learningObjectIdentifier: question.learningObjectIdentifier,

backend/src/services/questions.ts

@@ -1,5 +1,5 @@
 import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js';
-import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
+import { mapToQuestionDTO, mapToQuestionId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
 import { mapToAnswerDTO, mapToAnswerId } from '../interfaces/answer.js';
@@ -8,6 +8,7 @@ import { LearningObjectIdentifier } from '../entities/content/learning-object-id
 import { mapToUser } from '../interfaces/user.js';
 import { Student } from '../entities/users/student.entity.js';
 import { mapToStudent } from '../interfaces/student.js';
+import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question';
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();

backend/src/services/teachers.ts

@@ -1,11 +1,12 @@
 import { getClassRepository, getLearningObjectRepository, getQuestionRepository, getTeacherRepository } from '../data/repositories.js';
 import { mapToClassDTO } from '../interfaces/class.js';
 import { getClassStudents } from './classes.js';
-import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
+import { mapToQuestionDTO, mapToQuestionId } from '../interfaces/question.js';
 import { mapToTeacher, mapToTeacherDTO } from '../interfaces/teacher.js';
 import { ClassDTO } from 'dwengo-1-common/src/interfaces/class';
 import { TeacherDTO } from 'dwengo-1-common/src/interfaces/teacher';
 import { StudentDTO } from 'dwengo-1-common/src/interfaces/student';
+import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question';
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {
     const teacherRepository = getTeacherRepository();

common/src/interfaces/answer.d.ts

@@ -1,5 +1,5 @@
-import { QuestionDTO } from 'dwengo-1-backend/src/interfaces/question.js';
 import { UserDTO } from './user';
+import { QuestionDTO } from './question';
 
 export interface AnswerDTO {
     author: UserDTO;

common/src/interfaces/question.d.ts

@@ -0,0 +1,14 @@
+import { StudentDTO } from './student';
+
+export interface QuestionDTO {
+    learningObjectIdentifier: LearningObjectIdentifier;
+    sequenceNumber?: number;
+    author: StudentDTO;
+    timestamp?: string;
+    content: string;
+}
+
+export interface QuestionId {
+    learningObjectIdentifier: LearningObjectIdentifier;
+    sequenceNumber: number;
+}