refactor: get groupmates

Author: semrosin

HwProj.CoursesService/HwProj.CoursesService.API/Services/CourseFilterService.cs

@@ -91,9 +91,8 @@ public async Task<CourseDTO> ApplyFilter(CourseDTO courseDto, string userId)
             {
                 var studentCourse = courseDto;
                 if (courseFilters.TryGetValue(GlobalFilterUserId, out var groupFilter))
-                {
                     studentCourse = ApplyFilterInternal(courseDto, studentCourse, groupFilter, ApplyFilterOperation.Subtract);
-                }
+
                 return courseFilters.TryGetValue(userId, out var studentFilter)
                         ? ApplyFilterInternal(courseDto, studentCourse, studentFilter, ApplyFilterOperation.Union)
                         : studentCourse;
@@ -144,9 +143,7 @@ private CourseDTO ApplyFilterInternal(CourseDTO initialCourseDto, CourseDTO edit
             var filter = courseFilter?.Filter;
 
             if (filter == null)
-            {
                 return editingCourseDto;
-            }
 
             var homeworks = filter.HomeworkIds.Any()
                 ? filterType switch

HwProj.CoursesService/HwProj.CoursesService.API/Services/HomeworksService.cs

@@ -8,8 +8,6 @@
 using HwProj.Models;
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.NotificationService.Events.CoursesService;
-using HwProj.CoursesService.API.Repositories.Groups;
-using Microsoft.EntityFrameworkCore;
 
 namespace HwProj.CoursesService.API.Services
 {
@@ -18,16 +16,16 @@ public class HomeworksService : IHomeworksService
         private readonly IHomeworksRepository _homeworksRepository;
         private readonly IEventBus _eventBus;
         private readonly ICoursesRepository _coursesRepository;
-        private readonly IGroupMatesRepository _groupMatesRepository;
+        private readonly IGroupsService _groupsService;
         private readonly ICourseFilterService _courseFilterService;
 
         public HomeworksService(IHomeworksRepository homeworksRepository, IEventBus eventBus, ICoursesRepository coursesRepository,
-            IGroupMatesRepository groupMatesRepository, IGroupsService groupsService, ICourseFilterService courseFilterService)
+            IGroupsService groupsService, ICourseFilterService courseFilterService)
         {
             _homeworksRepository = homeworksRepository;
             _eventBus = eventBus;
             _coursesRepository = coursesRepository;
-            _groupMatesRepository = groupMatesRepository;
+            _groupsService = groupsService;
             _courseFilterService = courseFilterService;
         }
 
@@ -44,7 +42,9 @@ public async Task<Homework> AddHomeworkAsync(long courseId, CreateHomeworkViewMo
 
             if(homework.GroupId != null)
             {
-                var groupMates = await _groupMatesRepository.FindAll(gm => gm.GroupId == homework.GroupId).ToArrayAsync();
+                var group = (await _groupsService.GetGroupsAsync(new [] { homework.GroupId.Value })).FirstOrDefault();
+                var groupMates = group?.GroupMates.ToArray() ?? Array.Empty<GroupMate>();
+
                 await _courseFilterService.UpdateGroupFilters(courseId, homework.Id, groupMates);
                 notificationStudentIds = groupMates.Select(gm => gm.StudentId).ToArray();
             }
@@ -103,9 +103,10 @@ public async Task<Homework> UpdateHomeworkAsync(long homeworkId, CreateHomeworkV
 
             if (update.GroupId != null)
             {
-                var groupMates = await _groupMatesRepository.FindAll(gm => gm.GroupId == update.GroupId).ToArrayAsync();
-                await _courseFilterService.UpdateGroupFilters(course.Id, homework.Id, groupMates);
+                var group = (await _groupsService.GetGroupsAsync(new [] { update.GroupId.Value })).FirstOrDefault();
+                var groupMates = group?.GroupMates.ToArray() ?? Array.Empty<GroupMate>();
 
+                await _courseFilterService.UpdateGroupFilters(course.Id, homework.Id, groupMates);
                 notificationStudentIds = groupMates.Select(gm => gm.StudentId).ToArray();
             }