refactor: move selected view logic to backend

Author: semrosin

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/CoursesController.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System;
 using System.Net;
 using System.Threading.Tasks;
 using AutoMapper;
@@ -269,16 +270,64 @@ public async Task<IActionResult> GetMentorWorkspace(long courseId, string mentor
         if (!mentorCourseView.Succeeded)
             return BadRequest(mentorCourseView.Errors[0]);
 
-        var studentIds = mentorCourseView.Value.CourseMates.Select(t => t.StudentId).ToArray();
-        var students = await AuthServiceClient.GetAccountsData(studentIds);
+        var courseResult = await _coursesClient.GetCourseDataRaw(courseId);
+        if (!courseResult.Succeeded)
+            return BadRequest(courseResult.Errors[0]);
+
+        var workspace = await CourseToMentorWorkspaceViewModel(courseResult.Value, mentorCourseView.Value);
+        return Ok(workspace);
+    }
 
-        var workspace = new WorkspaceViewModel
+    private async Task<WorkspaceViewModel> CourseToMentorWorkspaceViewModel(CourseDTO course, CourseDTO mentorCourseView)
+    {
+        var courseGroups = (course.Groups ?? Array.Empty<GroupViewModel>())
+            .Where(g => !string.IsNullOrWhiteSpace(g.Name))
+            .ToArray();
+
+        var filteredGroups = (mentorCourseView.Groups ?? Array.Empty<GroupViewModel>())
+            .Where(g => !string.IsNullOrWhiteSpace(g.Name))
+            .ToArray();
+
+        var selectedGroups = filteredGroups.Length == courseGroups.Length
+            ? Array.Empty<GroupViewModel>()
+            : filteredGroups;
+
+        var selectedGroupsStudentIds = selectedGroups
+            .SelectMany(g => g.StudentsIds ?? Array.Empty<string>())
+            .ToHashSet();
+
+        var selectedStudentIdsWithoutGroups = (mentorCourseView.CourseMates ?? Array.Empty<CourseMateViewModel>())
+            .Select(t => t.StudentId)
+            .Where(studentId => !selectedGroupsStudentIds.Contains(studentId))
+            .ToArray();
+
+        var selectedStudentsData = selectedStudentIdsWithoutGroups.Length == (course.CourseMates?.Length ?? 0)
+            ? Array.Empty<AccountDataDto>()
+            : await AuthServiceClient.GetAccountsData(selectedStudentIdsWithoutGroups);
+
+        var selectedStudents = selectedStudentsData
+            .Where(x => x != null)
+            .OrderBy(x => x.Surname)
+            .ThenBy(x => x.Name)
+            .ToArray();
+
+        var availableHomeworks = selectedGroups.Any()
+            ? (course.Homeworks ?? Array.Empty<HomeworkViewModel>())
+                .Where(h => h.GroupId == null || selectedGroups.Any(g => g.Id == h.GroupId))
+                .ToArray()
+            : course.Homeworks ?? Array.Empty<HomeworkViewModel>();
+
+        var filteredHomeworks = mentorCourseView.Homeworks ?? Array.Empty<HomeworkViewModel>();
+        var selectedHomeworks = filteredHomeworks.Length == availableHomeworks.Length
+            ? Array.Empty<HomeworkViewModel>()
+            : filteredHomeworks;
+
+        return new WorkspaceViewModel
         {
-            Homeworks = mentorCourseView.Value.Homeworks,
-            Students = students.OrderBy(x => x.Surname).ThenBy(x => x.Name).ToArray(),
-            Groups = mentorCourseView.Value.Groups,
+            Homeworks = selectedHomeworks,
+            Students = selectedStudents,
+            Groups = selectedGroups,
         };
-        return Ok(workspace);
     }
 
     private async Task<CourseViewModel> ToCourseViewModel(CourseDTO course)

hwproj.front/src/components/Common/GroupSelector.tsx

@@ -23,7 +23,6 @@ interface GroupSelectorProps {
     onGroupsUpdate: () => Promise<void>,
     selectedGroupId?: number,
     choiceDisabled?: boolean,
-    onCreateNewGroup?: (group: GroupViewModel) => Promise<void>,
 }
 
 const GroupSelector: FC<GroupSelectorProps> = (props) => {
@@ -87,11 +86,6 @@ const GroupSelector: FC<GroupSelectorProps> = (props) => {
                     groupMatesIds: formState.memberIds,
                     courseId: props.courseId,
                 });
-                await props.onCreateNewGroup?.({
-                    id: groupId,
-                    name: formState.name.trim(),
-                    studentsIds: formState.memberIds,
-                });
                 await props.onGroupsUpdate();
                 props.onGroupIdChange(groupId);
             }

hwproj.front/src/components/Courses/CourseFilter.tsx

@@ -7,7 +7,6 @@ import ApiSingleton from "../../api/ApiSingleton";
 import ErrorsHandler from "../Utils/ErrorsHandler";
 import {DotLottieReact} from '@lottiefiles/dotlottie-react';
 import Button from "@material-ui/core/Button";
-import {getSelectedCourseView} from "./MentorWorkspaceUtils";
 
 interface ICourseFilterProps {
     courseId: number;
@@ -64,11 +63,14 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                 const mentorWorkspace =
                     await ApiSingleton.coursesApi.coursesGetMentorWorkspace(props.courseId, props.mentorId);
 
-                const selectedCourseView = getSelectedCourseView(course, mentorWorkspace);
-
                 setState(prevState => ({
                     ...prevState,
-                    ...selectedCourseView,
+                    courseHomeworks: course.homeworks ?? [],
+                    courseStudents: course.acceptedStudents ?? [],
+                    courseGroups: course.groups?.filter(g => g.name?.trim()) ?? [],
+                    selectedHomeworks: mentorWorkspace.homeworks ?? [],
+                    selectedStudents: mentorWorkspace.students ?? [],
+                    selectedGroups: mentorWorkspace.groups ?? [],
                     mentors: course.mentors!,
                     assignedStudents: assignedStudents.filter(x => x.mentorId !== props.mentorId)
                 }))

hwproj.front/src/components/Courses/MentorWorkspaceUtils.ts

@@ -22,7 +22,6 @@ import {FC, useEffect, useState} from "react"
 import Utils from "services/Utils";
 import {
     HomeworkViewModel, ActionOptions, HomeworkTaskViewModel, PostTaskViewModel, AccountDataDto, GroupViewModel,
-    WorkspaceViewModel, CourseViewModel
 } from "@/api";
 import ApiSingleton from "../../api/ApiSingleton";
 import Tags from "../Common/Tags";
@@ -46,7 +45,6 @@ import GroupIcon from '@mui/icons-material/Group';
 import AssignmentIcon from '@mui/icons-material/Assignment';
 import ErrorsHandler from "@/components/Utils/ErrorsHandler";
 import {enqueueSnackbar} from "notistack";
-import {getSelectedCourseView} from "../Courses/MentorWorkspaceUtils";
 
 export interface HomeworkAndFilesInfo {
     homework: HomeworkViewModel & { isModified?: boolean },
@@ -129,29 +127,19 @@ const CourseHomeworkEditor: FC<{
     const [description, setDescription] = useState<string>(loadedHomework.description!)
     const [selectedGroupId, setSelectedGroupId] = useState(loadedHomework.groupId)
     const [courseStudents, setCourseStudents] = useState<AccountDataDto[]>([])
-    const [course, setCourse] = useState<CourseViewModel | undefined>(undefined)
-    const [mentorWorkspace, setMentorWorkspace] = useState<WorkspaceViewModel | undefined>(undefined)
     const [page, setPage] = useState<"homework" | "group">("homework")
 
     useEffect(() => {
-        const loadMentorWorkspace = async () => {
+        const loadCourseStudents = async () => {
             try {
-                const [courseData, mentorWorkspace] = await Promise.all([
-                    ApiSingleton.coursesApi.coursesGetAllCourseData(courseId),
-                    isNewHomework
-                        ? ApiSingleton.coursesApi.coursesGetMentorWorkspace(courseId, props.mentorId)
-                            .catch(() => undefined)
-                        : Promise.resolve(undefined)
-                ]);
+                const courseData = await ApiSingleton.coursesApi.coursesGetAllCourseData(courseId);
                 setCourseStudents(courseData.course?.acceptedStudents || [])
-                setCourse(courseData.course)
-                setMentorWorkspace(mentorWorkspace)
             } catch (error) {
                 console.error('Failed to load course data:', error)
             }
         }
-        loadMentorWorkspace()
-    }, [courseId, props.mentorId, isNewHomework])
+        loadCourseStudents()
+    }, [courseId])
 
     const [hasErrors, setHasErrors] = useState<boolean>(false)
 
@@ -242,62 +230,6 @@ const CourseHomeworkEditor: FC<{
         props.onUpdate({homework: loadedHomework, isDeleted: true})
     }
 
-    const updateMentorFilter = async (update: {
-        newGroup?: GroupViewModel,
-        newHomework?: HomeworkViewModel
-    }) => {
-        if (!course || !mentorWorkspace) return;
-
-        const {newGroup, newHomework} = update;
-        const selectedCourseView = getSelectedCourseView(course, mentorWorkspace);
-        let updatedGroups = selectedCourseView.selectedGroups;
-        let updatedHomeworks = selectedCourseView.selectedHomeworks;
-        let hasChanges = false;
-
-        if (newGroup?.id !== undefined &&
-            selectedCourseView.selectedGroups.length > 0 &&
-            !selectedCourseView.selectedGroups.some(g => g.id === newGroup.id)) {
-            updatedGroups = [...selectedCourseView.selectedGroups, newGroup];
-            hasChanges = true;
-        }
-
-        if (newHomework?.id !== undefined &&
-            selectedCourseView.selectedHomeworks.length > 0 &&
-            !selectedCourseView.selectedHomeworks.some(h => h.id === newHomework.id)) {
-            updatedHomeworks = [...selectedCourseView.selectedHomeworks, newHomework];
-            hasChanges = true;
-        }
-
-        setCourse(prev => prev ? ({
-            ...prev,
-            groups: newGroup?.id !== undefined && !prev.groups?.some(g => g.id === newGroup.id)
-                ? [...(prev.groups ?? []), newGroup]
-                : prev.groups,
-            homeworks: newHomework?.id !== undefined && !prev.homeworks?.some(h => h.id === newHomework.id)
-                ? [...(prev.homeworks ?? []), newHomework]
-                : prev.homeworks,
-        }) : prev);
-
-        if (!hasChanges) return;
-
-        await ApiSingleton.coursesApi.coursesEditMentorWorkspace(
-            courseId,
-            props.mentorId,
-            {
-                homeworkIds: updatedHomeworks.map(h => h.id).filter((id): id is number => id !== undefined),
-                studentIds: selectedCourseView.selectedStudents.map(s => s.userId).filter((id): id is string => id !== undefined),
-                groupIds: updatedGroups.map(g => g.id).filter((id): id is number => id !== undefined),
-            }
-        );
-
-        setMentorWorkspace(prev => prev ? ({
-            ...prev,
-            homeworks: updatedHomeworks,
-            students: selectedCourseView.selectedStudents,
-            groups: updatedGroups
-        }) : prev);
-    }
-
     const getDeleteMessage = (homeworkName: string, filesInfo: IFileInfo[]) => {
         let message = `Вы точно хотите удалить задание "${homeworkName}"?`;
         if (filesInfo.length > 0) {
@@ -341,10 +273,6 @@ const CourseHomeworkEditor: FC<{
                 ? await ApiSingleton.homeworksApi.homeworksAddHomework(courseId!, update)
                 : await ApiSingleton.homeworksApi.homeworksUpdateHomework(+homeworkId!, update)
 
-            if (isNewHomework && updatedHomework.value) {
-                await updateMentorFilter({newHomework: updatedHomework.value});
-            }
-            
             const updatedHomeworkId = updatedHomework.value!.id!
             await handleFilesChange(
                 courseId, CourseUnitType.Homework, updatedHomeworkId,
@@ -516,8 +444,7 @@ const CourseHomeworkEditor: FC<{
                     selectedGroupId={selectedGroupId}
                     choiceDisabled={!isNewHomework}
                     onGroupsUpdate={props.onGroupsUpdate}
-                    onCreateNewGroup={(newGroup: GroupViewModel) => updateMentorFilter({newGroup})}
-                    groups={mentorWorkspace?.groups ?? props.groups}
+                    groups={props.groups}
                 />
             </CardContent>
             {!isNewHomework && !isPublished &&