From 3b51b0f1f653a49fa20e801b689054e6b7fc03ac Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Mon, 31 Mar 2025 21:41:14 +0200
Subject: [PATCH] refactor(common): User

---
 backend/src/interfaces/teacher-invitation.ts |  3 ++-
 backend/src/interfaces/user.ts               | 14 +-------------
 common/src/interfaces/answer.d.ts            |  2 +-
 common/src/interfaces/user.d.ts              | 12 ++++++++++++
 4 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 common/src/interfaces/user.d.ts

diff --git a/backend/src/interfaces/teacher-invitation.ts b/backend/src/interfaces/teacher-invitation.ts
index a28aed5c..8a792280 100644
--- a/backend/src/interfaces/teacher-invitation.ts
+++ b/backend/src/interfaces/teacher-invitation.ts
@@ -1,7 +1,8 @@
 import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
 import { mapToClassDTO } from './class.js';
-import { mapToUserDTO, UserDTO } from './user.js';
+import { mapToUserDTO } from './user.js';
 import { ClassDTO } from 'dwengo-1-common/src/interfaces/class';
+import { UserDTO } from 'dwengo-1-common/src/interfaces/user';
 
 export interface TeacherInvitationDTO {
     sender: string | UserDTO;
diff --git a/backend/src/interfaces/user.ts b/backend/src/interfaces/user.ts
index 58f0dd5a..ecc9dd77 100644
--- a/backend/src/interfaces/user.ts
+++ b/backend/src/interfaces/user.ts
@@ -1,17 +1,5 @@
 import { User } from '../entities/users/user.entity.js';
-
-export interface UserDTO {
-    id?: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    endpoints?: {
-        self: string;
-        classes: string;
-        questions: string;
-        invitations: string;
-    };
-}
+import { UserDTO } from 'dwengo-1-common/src/interfaces/user';
 
 export function mapToUserDTO(user: User): UserDTO {
     return {
diff --git a/common/src/interfaces/answer.d.ts b/common/src/interfaces/answer.d.ts
index 88cc07be..b8fc9b55 100644
--- a/common/src/interfaces/answer.d.ts
+++ b/common/src/interfaces/answer.d.ts
@@ -1,5 +1,5 @@
-import { UserDTO } from 'dwengo-1-backend/src/interfaces/user.js';
 import { QuestionDTO } from 'dwengo-1-backend/src/interfaces/question.js';
+import { UserDTO } from './user';
 
 export interface AnswerDTO {
     author: UserDTO;
diff --git a/common/src/interfaces/user.d.ts b/common/src/interfaces/user.d.ts
new file mode 100644
index 00000000..e7bbe2ed
--- /dev/null
+++ b/common/src/interfaces/user.d.ts
@@ -0,0 +1,12 @@
+export interface UserDTO {
+    id?: string;
+    username: string;
+    firstName: string;
+    lastName: string;
+    endpoints?: {
+        self: string;
+        classes: string;
+        questions: string;
+        invitations: string;
+    };
+}