fix: return filter logic to frontend

Author: semrosin

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System;
 using System.Net;
 using System.Threading.Tasks;
 using AutoMapper;
@@ -270,64 +269,15 @@ public async Task<IActionResult> GetMentorWorkspace(long courseId, string mentor
         if (!mentorCourseView.Succeeded)
             return BadRequest(mentorCourseView.Errors[0]);
 
-        var courseResult = await _coursesClient.GetCourseDataRaw(courseId);
-        if (!courseResult.Succeeded)
-            return BadRequest(courseResult.Errors[0]);
+        var studentIds = mentorCourseView.Value.CourseMates.Select(t => t.StudentId).ToArray();
+        var students = await AuthServiceClient.GetAccountsData(studentIds);
 
-        var workspace = await CourseToMentorWorkspaceViewModel(courseResult.Value, mentorCourseView.Value);
-        return Ok(workspace);
-    }
-
-    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
+        return Ok(new WorkspaceViewModel
         {
-            Homeworks = selectedHomeworks,
-            Students = selectedStudents,
-            Groups = selectedGroups,
-        };
+            Homeworks = mentorCourseView.Value.Homeworks,
+            Students = students.OrderBy(x => x.Surname).ThenBy(x => x.Name).ToArray(),
+            Groups = mentorCourseView.Value.Groups,
+        });
     }
 
     private async Task<CourseViewModel> ToCourseViewModel(CourseDTO course)

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

@@ -1,7 +1,7 @@
 import * as React from "react";
 import {FC, useEffect, useState, useMemo} from "react";
 import {useNavigate, useParams, useSearchParams} from "react-router-dom";
-import {AccountDataDto, CourseViewModel, GroupViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "@/api";
+import {AccountDataDto, CourseViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "@/api";
 import StudentStats from "./StudentStats";
 import NewCourseStudents from "./NewCourseStudents";
 import ApiSingleton from "../../api/ApiSingleton";

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

@@ -63,14 +63,38 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                 const mentorWorkspace =
                     await ApiSingleton.coursesApi.coursesGetMentorWorkspace(props.courseId, props.mentorId);
 
+                const courseGroups = course.groups?.filter(g => g.name?.trim()) ?? [];
+                const selectedGroups = (mentorWorkspace.groups?.length === courseGroups.length
+                        ? []
+                        : mentorWorkspace.groups ?? []
+                    )
+                    .filter(g => g.name?.trim());
+
+                const selectedGroupsStudents = selectedGroups.flatMap(g => g.studentsIds ?? []);
+                const selectedStudentsWithoutGroups = mentorWorkspace.students
+                    ?.filter(st => !selectedGroupsStudents.includes(st.userId!)) ?? [];
+                const allCourseStudentsCount = (course.acceptedStudents?.length ?? 0) + (course.newStudents?.length ?? 0);
+                const selectedStudents = selectedStudentsWithoutGroups.length === allCourseStudentsCount
+                    ? []
+                    : selectedStudentsWithoutGroups;
+
+                const availableHomeworks = course.homeworks
+                    ?.filter(h =>
+                        !h.groupId
+                        || selectedGroups.length === 0
+                        || selectedGroups.some(g => g.id === h.groupId));
+                const selectedHomeworks = mentorWorkspace.homeworks?.length === availableHomeworks?.length
+                    ? []
+                    : mentorWorkspace.homeworks ?? [];
+
                 setState(prevState => ({
                     ...prevState,
                     courseHomeworks: course.homeworks ?? [],
                     courseStudents: course.acceptedStudents ?? [],
-                    courseGroups: course.groups?.filter(g => g.name?.trim()) ?? [],
-                    selectedHomeworks: mentorWorkspace.homeworks ?? [],
-                    selectedStudents: mentorWorkspace.students ?? [],
-                    selectedGroups: mentorWorkspace.groups ?? [],
+                    courseGroups,
+                    selectedHomeworks,
+                    selectedStudents,
+                    selectedGroups,
                     mentors: course.mentors!,
                     assignedStudents: assignedStudents.filter(x => x.mentorId !== props.mentorId)
                 }))