Fix Object Serialization, Proposal to improve Database-Scheme,

client/src/components/Administration/ProjectAdmin.tsx

@@ -81,7 +81,7 @@ const ProjectAdmin: React.FC = () => {
 
   /* Helper method for fetching all projects of a course */
   const getProjectsForCourse = (course: string): Promise<Project[]> => {
-    return get(`courseProject?projectGroupName=${course}`)
+    return get(`courseProject?courseName=${course}`)
       .then(projects => projects.map((project: { id: string; projectName: string; studentsCanJoinProject: boolean; }) => ({
         id: project.id,
         projectName: project.projectName,
@@ -102,11 +102,11 @@ const ProjectAdmin: React.FC = () => {
         const coursesData = await get("course");
 
         const coursesWithProjects: Course[] = await Promise.all(
-          coursesData.map(async (course: { projectGroupName: string; semester: string; studentsCanCreateProject: boolean; }) => {
-            const projects = await getProjectsForCourse(course.projectGroupName);
+          coursesData.map(async (course: { courseName: string; semester: string; studentsCanCreateProject: boolean; }) => {
+            const projects = await getProjectsForCourse(course.courseName);
             return {
               semester: course.semester,
-              courseName: course.projectGroupName,
+              courseName: course.courseName,
               projects: projects,
               studentsCanCreateProject: course?.studentsCanCreateProject || false,
             };
@@ -125,7 +125,7 @@ const ProjectAdmin: React.FC = () => {
 
   /* Method for creating a course */
   const handleCreateCourse = async (semester: string, courseName: string,) => {
-    const body: { [key: string]: string } = { semester, projectGroupName: courseName };
+    const body: { [key: string]: string } = { semester, courseName: courseName };
 
     const data = await post("course", body).catch((error) => {
       console.error("Error fetching data:", error.message);
@@ -142,7 +142,7 @@ const ProjectAdmin: React.FC = () => {
   const handleCreateProject = async (projectName: string) => {
     if (!selectedCourse) return;
 
-    const body: { [key: string]: string } = { semester: selectedCourse.semester, projectGroupName: selectedCourse.courseName, projectName };
+    const body: { [key: string]: string } = { semester: selectedCourse.semester, courseName: selectedCourse.courseName, projectName };
 
     const data = await post("courseProject", body).catch((error) => {
       console.error("Error fetching data:", error.message);
@@ -160,9 +160,9 @@ const ProjectAdmin: React.FC = () => {
     if (!selectedCourse || !selectedProject) return;
 
     const body: { [key: string]: string } = {
-      projectGroupName: selectedCourse.courseName,
-      newSemester: selectedCourse.semester,
-      newProjectGroupName: courseName,
+      courseName: selectedCourse.courseName,
+      newSemester: selectedCourse.semester, // ToDo remove
+      newCourseName: courseName,
       projectName: selectedProject.projectName,
       newProjectName: projectName,
     };
@@ -183,9 +183,9 @@ const ProjectAdmin: React.FC = () => {
     if (!selectedCourse) return;
 
     const body: { [key: string]: string | boolean } = {
-      projectGroupName: selectedCourse.courseName,
+      courseName: selectedCourse.courseName,
       newSemester: editedCourse.semester,
-      newProjectGroupName: editedCourse.courseName,
+      newCourseName: editedCourse.courseName,
       studentsCanCreateProject: editedCourse.studentsCanCreateProject,
     };
 

client/src/components/Administration/UserAdmin.tsx

@@ -43,7 +43,7 @@ function UserEdit({ user, onClose }: { user: User; onClose: (update: boolean) =>
                 {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ "email": user.email, "newGithubUsername": githubUsername })
+                    body: JSON.stringify({ "userEmail": user.email, "newGithubUsername": githubUsername })
                 })
                 .then(checkError)
                 .catch(console.error));
@@ -53,7 +53,7 @@ function UserEdit({ user, onClose }: { user: User; onClose: (update: boolean) =>
                 {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ "email": user.email, "status": status })
+                    body: JSON.stringify({ "userEmail": user.email, "status": status })
                 })
                 .then(checkError)
                 .catch(console.error));
@@ -63,7 +63,7 @@ function UserEdit({ user, onClose }: { user: User; onClose: (update: boolean) =>
                 {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ "email": user.email, "password": password })
+                    body: JSON.stringify({ "userEmail": user.email, "password": password })
                 })
                 .then(checkError)
                 .catch(console.error));
@@ -166,7 +166,7 @@ const UserAdmin = () => {
         fetch(`/user/confirmation/trigger`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ email: user.email }),
+          body: JSON.stringify({ userEmail: user.email }),
         })
           .then(checkError)
           .catch(console.error);
@@ -205,4 +205,4 @@ const UserAdmin = () => {
     );
 }
 
-export default UserAdmin;
+export default UserAdmin;

client/src/components/Configuration/CourseParticipation.tsx

@@ -25,7 +25,7 @@ const CourseParticipation: React.FC = () => {
   type Project = {
     id: number; 
     projectName: string; 
-    projectGroupName: string;
+    courseName: string;
   };
 
   const navigate = useNavigate();
@@ -43,14 +43,14 @@ const CourseParticipation: React.FC = () => {
     email: string;
   } | null>(null);
 
-  const [projectGroups, setProjectGroups] = useState<string[]>([]);
+  const [courses, setCourses] = useState<string[]>([]);
   const [userProjects, setUserProjects] = useState<string[]>([]);
 
   const [enrolledProjects, setEnrolledProjects] = useState<Project[]>([]);
-  const [selectedEnrolledProjectGroup, setSelectedEnrolledProjectGroup] = useState<string>("");
+  const [selectedEnrolledCourse, setSelectedEnrolledCourse] = useState<string>("");
 
   const [availableProjects, setAvailableProjects] = useState<Project[]>([]);
-  const [selectedAvailableProjectGroup, setSelectedAvailableProjectGroup] = useState<string>("");
+  const [selectedAvailableCourse, setSelectedAvailableCourse] = useState<string>("");
 
   useEffect(() => {
     const fetchUserData = async () => {
@@ -68,11 +68,11 @@ const CourseParticipation: React.FC = () => {
 
     fetchUserData();
 
-    const fetchProjectGroups = async () => {
+    const fetchCourses = async () => {
       try {
         const response = await fetch("http://localhost:3000/course");
         const data = await response.json();
-        setProjectGroups(data.map((item: Project) => item.projectGroupName));
+        setCourses(data.map((item: Project) => item.courseName));
         console.log("Fetched project groups:", data);
       } catch (error: unknown) {
         if (error instanceof Error) {
@@ -81,7 +81,7 @@ const CourseParticipation: React.FC = () => {
       }
     };
 
-    fetchProjectGroups();
+    fetchCourses();
 
     const fetchUserProjects = async() => {
       try {
@@ -102,16 +102,16 @@ const CourseParticipation: React.FC = () => {
 
   useEffect(() => {
     const fetchEnrolledProjects = async () => {
-      if (selectedEnrolledProjectGroup) {
+      if (selectedEnrolledCourse) {
         try {
           const response = await fetch(
-            `http://localhost:3000/courseProject?projectGroupName=${selectedEnrolledProjectGroup}`
+            `http://localhost:3000/courseProject?courseName=${selectedEnrolledCourse}`
           );
           const data = await response.json();
           const mappedProjects = data.map((item: Project) => ({
             id: item.id,
             projectName: item.projectName,
-            projectGroupName: item.projectGroupName || selectedEnrolledProjectGroup,
+            courseName: item.courseName || selectedEnrolledCourse,
           }));
 
           const enrolledProjects = mappedProjects.filter((item: Project) => userProjects.includes(item.projectName));
@@ -128,24 +128,24 @@ const CourseParticipation: React.FC = () => {
     };
 
     fetchEnrolledProjects();
-  }, [selectedEnrolledProjectGroup]);
+  }, [selectedEnrolledCourse]);
 
   const filteredEnrolledProjects = enrolledProjects.filter(
-    (project) => project.projectGroupName === selectedEnrolledProjectGroup
+    (project) => project.courseName === selectedEnrolledCourse
   );
 
   useEffect(() => {
     const fetchAvailableProjects = async () => {
-      if (selectedAvailableProjectGroup) {
+      if (selectedAvailableCourse) {
         try {
           const response = await fetch(
-            `http://localhost:3000/courseProject?projectGroupName=${selectedAvailableProjectGroup}`
+            `http://localhost:3000/courseProject?courseName=${selectedAvailableCourse}`
           );
           const data = await response.json();
           const mappedProjects = data.map((item: Project) => ({
             id: item.id,
             projectName: item.projectName,
-            projectGroupName: item.projectGroupName || selectedAvailableProjectGroup,
+            courseName: item.courseName || selectedAvailableCourse,
           }));
 
           const availableProjectsWithoutEnrolled = mappedProjects.filter((item: Project) => !userProjects.includes(item.projectName));
@@ -162,10 +162,10 @@ const CourseParticipation: React.FC = () => {
     };
 
     fetchAvailableProjects();
-  }, [selectedAvailableProjectGroup]);
+  }, [selectedAvailableCourse]);
 
   const filteredAvailableProjects = availableProjects.filter(
-    (project: Project) => project.projectGroupName === selectedAvailableProjectGroup
+    (project: Project) => project.courseName === selectedAvailableCourse
   );
 
   const handleJoin = async (projectName: string) => {
@@ -176,9 +176,8 @@ const CourseParticipation: React.FC = () => {
 
     const body = {
       projectName,
-      memberName: user.name,
-      memberRole: role,
-      memberEmail: user.email,
+      userEmail: user.email,
+      role: role,
     };
 
     try {
@@ -218,7 +217,7 @@ const CourseParticipation: React.FC = () => {
 
     const body = {
       projectName,
-      memberEmail: user.email,
+      userEmail: user.email,
     };
 
     try {
@@ -263,14 +262,14 @@ const CourseParticipation: React.FC = () => {
           <div className="SelectWrapper">
             <Select
               onValueChange={(value) => {
-                setSelectedEnrolledProjectGroup(value);
+                setSelectedEnrolledCourse(value);
               }}
             >
               <SelectTrigger className="SelectTrigger">
                 <SelectValue placeholder="Select a project group" />
               </SelectTrigger>
               <SelectContent className="SelectContent">
-                {projectGroups.map((group, index) => (
+                {courses.map((group, index) => (
                   <SelectItem key={index} value={group}>
                     {group}
                   </SelectItem>
@@ -322,14 +321,14 @@ const CourseParticipation: React.FC = () => {
           <div className="SelectWrapper">
             <Select
               onValueChange={(value) => {
-                setSelectedAvailableProjectGroup(value);
+                setSelectedAvailableCourse(value);
               }}
             >
               <SelectTrigger className="SelectTrigger">
                 <SelectValue placeholder="Select a project group" />
               </SelectTrigger>
               <SelectContent className="SelectContent">
-                {projectGroups.map((group, index) => (
+                {courses.map((group, index) => (
                   <SelectItem key={index} value={group}>
                     {group}
                   </SelectItem>

client/src/components/Configuration/ProjectConfig.tsx

@@ -77,7 +77,7 @@ const ProjectConfig: React.FC = () => {
             `http://localhost:3000/user/courses?userEmail=${userEmail}`
           );
           const data = await response.json();
-          setCourses(data.map((course: { projectGroupName: string }) => course.projectGroupName));
+          setCourses(data.map((course: { courseName: string }) => course.courseName));
         } catch (error) {
           console.error("Error fetching courses:", error);
         }
@@ -186,9 +186,9 @@ const ProjectConfig: React.FC = () => {
             "Content-Type": "application/json",
           },
           body: JSON.stringify({
-            email: userEmail,
+            userEmail: userEmail,
             URL: newURL,
-            project: selectedProject,
+            projectName: selectedProject,
           }),
         });
         const data = await response.json();
@@ -216,9 +216,8 @@ const ProjectConfig: React.FC = () => {
 
     const body = {
       projectName,
-      memberName: user.name,
-      memberRole: role,
-      memberEmail: user.email,
+      userEmail: user.email,
+      role: role,
     };
 
     try {
@@ -257,7 +256,7 @@ const ProjectConfig: React.FC = () => {
     }
     const body = {
       projectName,
-      memberEmail: user.email,
+      userEmail: user.email,
     };
 
     try {
@@ -290,7 +289,7 @@ const ProjectConfig: React.FC = () => {
 
   const handleCreate = async (projectName: string) => {
     const body = {
-      projectGroupName: selectedCourse,
+      courseName: selectedCourse,
       projectName,
     };
 
@@ -534,4 +533,4 @@ const ProjectConfig: React.FC = () => {
   );
 };
 
-export default ProjectConfig;
+export default ProjectConfig;

client/src/components/Configuration/Settings.tsx

@@ -116,7 +116,7 @@ const Settings: React.FC = () => {
     }
 
     const body = {
-      email: user.email,
+      userEmail: user.email,
       password: newPassword,
     };
 

client/src/components/Configuration/UserPanel.tsx

@@ -118,7 +118,7 @@ const UserPanel: React.FC = () => {
     }
 
     const body = {
-      email: user.email,
+      userEmail: user.email,
       password: newPassword,
     };
     try {
@@ -159,7 +159,7 @@ const UserPanel: React.FC = () => {
     }
 
     const body = {
-      email: user?.email,
+      userEmail: user?.email,
       newGithubUsername: githubUsername,
     };
     let msg = document.getElementById('ErrorMessageGithub');