Закрепление домашних работ за студентами

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/CourseGroupsController.cs

@@ -74,14 +74,6 @@ public async Task<IActionResult> AddStudentInGroup(long courseId, long groupId,
         return Ok();
     }
 
-    [HttpPost("{courseId}/removeStudentFromGroup/{groupId}")]
-    [Authorize(Roles = Roles.LecturerRole)]
-    public async Task<IActionResult> RemoveStudentFromGroup(long courseId, long groupId, [FromQuery] string userId)
-    {
-        await _coursesClient.RemoveStudentFromGroup(courseId, groupId, userId);
-        return Ok();
-    }
-
     [HttpGet("get/{groupId}")]
     [ProducesResponseType(typeof(GroupViewModel), (int)HttpStatusCode.OK)]
     public async Task<IActionResult> GetGroup(long groupId)

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

@@ -243,7 +243,7 @@ public async Task<IActionResult> EditMentorWorkspace(
             return BadRequest("Пользователь с такой почтой не является преподавателем или экспертом");
 
         var courseFilterModel = _mapper.Map<CreateCourseFilterDTO>(editMentorWorkspaceDto);
-        courseFilterModel.UserId = mentorId;
+        courseFilterModel.Id = mentorId;
 
         var courseFilterCreationResult =
             await _coursesClient.CreateOrUpdateCourseFilter(courseId, courseFilterModel);
@@ -308,6 +308,7 @@ private async Task<CourseViewModel> ToCourseViewModel(CourseDTO course)
             AcceptedStudents = acceptedStudents.ToArray(),
             NewStudents = newStudents.ToArray(),
             Homeworks = course.Homeworks,
+            Groups = course.Groups,
             IsCompleted = course.IsCompleted,
             IsOpen = course.IsOpen
         };

HwProj.Common/HwProj.Models/CoursesService/CourseFilterModels.cs

@@ -4,14 +4,14 @@ namespace HwProj.Models.CoursesService
 {
     public class CreateCourseFilterModel
     {
-        public string UserId { get; set; }
+        public string Id { get; set; }
 
         public long CourseId { get; set; }
-        
+
         public List<string> StudentIds { get; set; } = new List<string>();
-        
+
         public List<long> HomeworkIds { get; set; } = new List<long>();
-        
+
         public List<string> MentorIds { get; set; } = new List<string>();
     }
 }

HwProj.Common/HwProj.Models/CoursesService/DTO/CreateCourseFilterDTO.cs

@@ -4,7 +4,7 @@ namespace HwProj.Models.CoursesService.DTO
 {
     public class CreateCourseFilterDTO
     {
-        public string UserId { get; set; }
+        public string Id { get; set; }
 
         public List<string> StudentIds { get; set; } = new List<string>();
 

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

@@ -52,6 +52,7 @@ public class CourseViewModel
         public bool IsOpen { get; set; }
         public bool IsCompleted { get; set; }
 
+        public GroupViewModel[] Groups { get; set; }
         public AccountDataDto[] Mentors { get; set; }
         public AccountDataDto[] AcceptedStudents { get; set; }
         public AccountDataDto[] NewStudents { get; set; }

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

@@ -6,6 +6,7 @@ namespace HwProj.Models.CoursesService.ViewModels
     public class GroupViewModel
     {
         public long Id { get; set; }
+        public string Name { get; set; }
         public string[] StudentsIds { get; set; }
     }
 

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

@@ -27,6 +27,8 @@ public class CreateHomeworkViewModel
         public List<PostTaskViewModel> Tasks { get; set; } = new List<PostTaskViewModel>();
 
         public ActionOptions? ActionOptions { get; set; }
+
+        public long? GroupId { get; set; }
     }
 
     public class HomeworkViewModel
@@ -58,5 +60,7 @@ public class HomeworkViewModel
         public List<string> Tags { get; set; } = new List<string>();
 
         public List<HomeworkTaskViewModel> Tasks { get; set; } = new List<HomeworkTaskViewModel>();
+
+        public long? GroupId { get; set; }
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/AutomapperProfile.cs

@@ -21,6 +21,11 @@ public AutomapperProfile()
 
             CreateMap<CreateCourseFilterDTO, CreateCourseFilterModel>();
             CreateMap<Filter, CourseFilterDTO>();
+
+            CreateMap<UpdateGroupViewModel, Group>().ReverseMap();
+            CreateMap<Group, UserGroupDescription>();
+
+            CreateMap<GroupMateViewModel, GroupMate>().ReverseMap();
         }
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Controllers/CourseGroupsController.cs

@@ -30,6 +30,7 @@ public async Task<GroupViewModel[]> GetAll(long courseId)
             var result = groups.Select(t => new GroupViewModel
             {
                 Id = t.Id,
+                Name = t.Name,
                 StudentsIds = t.GroupMates.Select(s => s.StudentId).ToArray()
             }).ToArray();
 
@@ -80,22 +81,14 @@ public async Task<IActionResult> AddStudentInGroup(long groupId, [FromQuery] str
             return Ok();
         }
 
-        [HttpPost("{courseId}/removeStudentFromGroup/{groupId}")]
-        [ServiceFilter(typeof(CourseMentorOnlyAttribute))]
-        public async Task<IActionResult> RemoveStudentFromGroup(long groupId, [FromQuery] string userId)
-        {
-            return await _groupsService.DeleteGroupMateAsync(groupId, userId)
-                ? Ok()
-                : NotFound() as IActionResult;
-        }
-
         [HttpGet]
         public async Task<IActionResult> Get([FromBody] long[] groupIds)
         {
             var groups = await _groupsService.GetGroupsAsync(groupIds);
             var result = groups.Select(group => new GroupViewModel
             {
                 Id = group.Id,
+                Name = group.Name,
                 StudentsIds = group.GroupMates.Select(g => g.StudentId).ToArray()
             }).ToArray();
             return Ok(result) as IActionResult;

HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs

@@ -32,6 +32,7 @@ public static HomeworkViewModel ToHomeworkViewModel(this Homework homework)
                 IsDeferred = DateTime.UtcNow < homework.PublicationDate,
                 Tasks = homework.Tasks.Select(t => t.ToHomeworkTaskViewModel()).ToList(),
                 Tags = tags.ToList(),
+                GroupId = homework.GroupId,
             };
         }
 
@@ -147,6 +148,7 @@ public static Homework ToHomework(this CreateHomeworkViewModel homework)
                 PublicationDate = homework.PublicationDate,
                 Tasks = homework.Tasks.Select(t => t.ToHomeworkTask()).ToList(),
                 Tags = string.Join(";", homework.Tags),
+                GroupId = homework.GroupId,
             };
 
         public static CourseTemplate ToCourseTemplate(this CreateCourseViewModel createCourseViewModel)

HwProj.CoursesService/HwProj.CoursesService.API/Domains/Validations.cs

@@ -112,6 +112,11 @@ public static List<string> ValidateHomework(CreateHomeworkViewModel homework, Ho
                 errors.Add("Нельзя изменить дату публикации домашнего задания, если она уже показана студента");
             }
 
+            if (previousState.GroupId != homework.GroupId)
+            {
+                errors.Add("Нельзя изменить группу для домашнего задания, если оно уже опубликовано");
+            }
+
             return errors;
         }
     }