CourseFilter: показывать закрепленных студентов других преподавателей

Author: DedSec256

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

@@ -47,14 +47,19 @@ public async Task<CoursePreviewView[]> GetAllCourses()
         }
 
         [HttpGet("getAllData/{courseId}")]
-        [ProducesResponseType(typeof(CourseViewModel), (int)HttpStatusCode.OK)]
+        [ProducesResponseType(typeof(CourseAllData), (int)HttpStatusCode.OK)]
         public async Task<IActionResult> GetAllCourseData(long courseId)
         {
             var courseResult = await _coursesClient.GetAllCourseData(courseId);
             if (!courseResult.Succeeded)
                 return BadRequest(courseResult.Errors[0]);
 
-            var result = await ToCourseViewModel(courseResult.Value);
+            var assignedStudents = await _coursesClient.GetMentorsToAssignedStudents(courseId);
+            var result = new CourseAllData()
+            {
+                Course = await ToCourseViewModel(courseResult.Value),
+                AssignedStudents = assignedStudents
+            };
             return Ok(result);
         }
 

HwProj.Common/HwProj.Models/CoursesService/ViewModels/CourseViewModels.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using HwProj.Models.AuthService.DTO;
+using HwProj.Models.CoursesService.DTO;
 
 namespace HwProj.Models.CoursesService.ViewModels
 {
@@ -57,6 +58,12 @@ public class CourseViewModel
         public HomeworkViewModel[] Homeworks { get; set; }
     }
 
+    public class CourseAllData
+    {
+        public CourseViewModel Course { get; set; }
+        public MentorToAssignedStudentsDTO[] AssignedStudents { get; set; }
+    }
+
     // Модель для списка всех курсов
     public class CoursePreview
     {

HwProj.CoursesService/HwProj.CoursesService.Client/ICoursesServiceClient.cs

@@ -11,6 +11,7 @@ public interface ICoursesServiceClient
         Task<CoursePreview[]> GetAllCourses();
         Task<CourseDTO?> GetCourseById(long courseId);
         Task<Result<CourseDTO>> GetCourseByIdForMentor(long courseId, string mentorId);
+        /// Получить полную информацию о курсе без учетов фильтров для преподавателей
         Task<Result<CourseDTO>> GetAllCourseData(long courseId);
         Task<CourseDTO?> GetCourseByTask(long taskId);
         Task<Result> DeleteCourse(long courseId);

hwproj.front/src/api/api.ts

@@ -299,6 +299,25 @@ export enum CategoryState {
     NUMBER_2 = <any> 2,
     NUMBER_3 = <any> 3
 }
+/**
+ *
+ * @export
+ * @interface CourseAllData
+ */
+export interface CourseAllData {
+    /**
+     *
+     * @type {CourseViewModel}
+     * @memberof CourseAllData
+     */
+    course?: CourseViewModel;
+    /**
+     *
+     * @type {Array<MentorToAssignedStudentsDTO>}
+     * @memberof CourseAllData
+     */
+    assignedStudents?: Array<MentorToAssignedStudentsDTO>;
+}
 /**
  *
  * @export
@@ -1470,6 +1489,25 @@ export interface LoginViewModel {
      */
     rememberMe: boolean;
 }
+/**
+ *
+ * @export
+ * @interface MentorToAssignedStudentsDTO
+ */
+export interface MentorToAssignedStudentsDTO {
+    /**
+     *
+     * @type {string}
+     * @memberof MentorToAssignedStudentsDTO
+     */
+    mentorId?: string;
+    /**
+     *
+     * @type {Array<string>}
+     * @memberof MentorToAssignedStudentsDTO
+     */
+    selectedStudentsIds?: Array<string>;
+}
 /**
  *
  * @export
@@ -5172,7 +5210,7 @@ export const CoursesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        coursesGetAllCourseData(courseId: number, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<CourseViewModel> {
+        coursesGetAllCourseData(courseId: number, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<CourseAllData> {
             const localVarFetchArgs = CoursesApiFetchParamCreator(configuration).coursesGetAllCourseData(courseId, options);
             return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {

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

@@ -1,7 +1,7 @@
 import React, {FC, useEffect, useState} from 'react';
-import {HomeworkViewModel, AccountDataDto} from '../../api';
+import {HomeworkViewModel, AccountDataDto, MentorToAssignedStudentsDTO} from '../../api';
 import Grid from "@material-ui/core/Grid";
-import {Autocomplete} from "@mui/material";
+import {Autocomplete, Chip} from "@mui/material";
 import TextField from "@material-ui/core/TextField";
 import ApiSingleton from "../../api/ApiSingleton";
 import ErrorsHandler from "../Utils/ErrorsHandler";
@@ -22,6 +22,8 @@ interface ICourseFilterState {
     courseStudents: AccountDataDto[];
     selectedHomeworks: HomeworkViewModel[];
     selectedStudents: AccountDataDto[];
+    mentors: AccountDataDto[];
+    assignedStudents: MentorToAssignedStudentsDTO[]
 }
 
 // Если преподаватель не выбрал ни одного студента, по умолчанию регистрируем всех. Аналогично с выбором домашних работ
@@ -30,7 +32,9 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
         courseHomeworks: [],
         courseStudents: [],
         selectedHomeworks: [],
-        selectedStudents: []
+        selectedStudents: [],
+        assignedStudents: [],
+        mentors: []
     });
 
     // Состояние для отображения элемента загрузки
@@ -39,35 +43,36 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
     // Состояние для отображения поля выбора студентов
     const [isStudentsSelectionHidden, setIsStudentsSelectionHidden] = useState<boolean>(props.isStudentsSelectionHidden);
 
-    // Если у преподавателя в workspace все студенты, отображаем "Все" в компоненте, значений при этом не выбрано.
-    // Функция, необходимые для корректного отображения выбранных элементов.
-    function getItemsView<T>(selected: T[], all: T[]): T[] {
-        return selected.length === all.length ? [] : selected;
-    }
-
     useEffect(() => {
         const fetchCourseDataForMentor = async () => {
             try {
-                const courseViewModel = await ApiSingleton.coursesApi.coursesGetAllCourseData(props.courseId);
+                const {
+                    course,
+                    assignedStudents
+                } = await ApiSingleton.coursesApi.coursesGetAllCourseData(props.courseId);
+                if (course === undefined || assignedStudents === undefined) return
+
                 const mentorWorkspace =
                     await ApiSingleton.coursesApi.coursesGetMentorWorkspace(props.courseId, props.mentorId);
 
                 props.onSelectedStudentsChange(mentorWorkspace.students ?? [])
                 props.onSelectedHomeworksChange(mentorWorkspace.homeworks ?? [])
 
                 // Для корректного отображения "Все" при инцициализации (получении данных с бэкенда)
-                const allCourseStudentsCount = (courseViewModel.acceptedStudents?.length ?? 0) + (courseViewModel.newStudents?.length ?? 0);
+                const allCourseStudentsCount = (course.acceptedStudents?.length ?? 0) + (course.newStudents?.length ?? 0);
                 const initSelectedStudentsView = mentorWorkspace.students?.length === allCourseStudentsCount ?
                     [] : (mentorWorkspace.students) ?? [];
-                const initSelectedHomeworksView = mentorWorkspace.homeworks?.length === courseViewModel.homeworks?.length ?
+                const initSelectedHomeworksView = mentorWorkspace.homeworks?.length === course.homeworks?.length ?
                     [] : (mentorWorkspace.homeworks ?? []);
 
                 setState(prevState => ({
                     ...prevState,
-                    courseHomeworks: courseViewModel.homeworks ?? [],
-                    courseStudents: courseViewModel.acceptedStudents ?? [],
+                    courseHomeworks: course.homeworks ?? [],
+                    courseStudents: course.acceptedStudents ?? [],
                     selectedStudents: initSelectedStudentsView,
                     selectedHomeworks: initSelectedHomeworksView,
+                    mentors: course.mentors!,
+                    assignedStudents: assignedStudents.filter(x => x.mentorId !== props.mentorId)
                 }))
 
                 setIsLoading(false);
@@ -94,6 +99,14 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
         props.onSelectedHomeworksChange(state.selectedHomeworks)
     }, [state.selectedHomeworks]);
 
+    //TODO: memoize?
+    const getAssignedMentors = (studentId: string) =>
+        state.assignedStudents
+            .filter(x => x.selectedStudentsIds!.includes(studentId))
+            .map(x => state.mentors.find(m => m.userId === x.mentorId))
+            .filter(x => x !== undefined)
+            .map(x => x.name + ' ' + x.surname)
+
     return (
         <div>
             {isLoading ? (
@@ -150,7 +163,11 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                                     multiple
                                     fullWidth
                                     options={state.courseStudents}
-                                    getOptionLabel={(option: AccountDataDto) => option.surname + ' ' + option.name}
+                                    getOptionLabel={(option: AccountDataDto) => {
+                                        const assignedMentors = getAssignedMentors(option.userId!)
+                                        const suffix = assignedMentors.length > 0 ? " (преподаватель " + assignedMentors[0] + ")" : ""
+                                        return option.surname + ' ' + option.name + suffix;
+                                    }}
                                     getOptionKey={(option: AccountDataDto) => option.userId ?? ""}
                                     filterSelectedOptions
                                     isOptionEqualToValue={(option, value) => option.userId === value.userId}
@@ -161,7 +178,19 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                                             label={state.selectedStudents.length === 0 ? "" : `Студенты (${state.selectedStudents.length})`}
                                             placeholder={state.selectedStudents.length === 0 ? "Все студенты" : ""}
                                         />)}
-                                    noOptionsText={'На курсе больше нет студентов'}
+                                    renderTags={(value, getTagProps) =>
+                                        value.map((option, index) => {
+                                            const hasAssignedStudents = getAssignedMentors(option.userId!).length > 0
+                                            return (
+                                                <Chip
+                                                    label={option.surname + ' ' + option.name}
+                                                    {...getTagProps({index})}
+                                                    color={hasAssignedStudents ? "info" : "default"}
+                                                />
+                                            );
+                                        })
+                                    }
+                                    noOptionsText={'На курсе нет студентов'}
                                     value={state.selectedStudents}
                                     onChange={(_, values) => {
                                         setState((prevState) => ({