refactor: remove nullable group access

Author: semrosin

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

@@ -80,8 +80,8 @@ public async Task<CourseDTO> ApplyFilter(CourseDTO courseDto, string userId)
             var isMentor = courseDto.MentorIds.Contains(userId);
             var isCourseStudent = courseDto.AcceptedStudents.Any(t => t.StudentId == userId);
             var findFiltersFor = isMentor || !isCourseStudent
-                ? new[] { userId }
-                : courseDto.MentorIds.Concat(new[] { userId }).ToArray();
+                ? new[] { userId, GlobalFilterUserId }
+                : courseDto.MentorIds.Concat(new[] { userId, GlobalFilterUserId }).ToArray();
 
             var courseFilters =
                 (await _courseFilterRepository.GetAsync(findFiltersFor, courseDto.Id))
@@ -90,8 +90,7 @@ public async Task<CourseDTO> ApplyFilter(CourseDTO courseDto, string userId)
             if (!isMentor)
             {
                 var studentCourse = courseDto;
-                var groupFilter = await _courseFilterRepository.GetAsync(GlobalFilterUserId, courseDto.Id); // Глобальный фильтр для вычитания групповых домашних заданий
-                if (groupFilter != null)
+                if (courseFilters.TryGetValue(GlobalFilterUserId, out var groupFilter))
                 {
                     studentCourse = ApplyFilterInternal(courseDto, studentCourse, groupFilter, ApplyFilterOperation.Subtract);
                 }

HwProj.CoursesService/HwProj.CoursesService.API/Services/GroupsService.cs

@@ -62,9 +62,12 @@ public async Task DeleteGroupAsync(long groupId)
 
         public async Task UpdateAsync(long groupId, Group updated)
         {
-            var group = (await _groupsRepository.GetGroupsWithGroupMatesAsync(new[] { groupId })).FirstOrDefault();
+            var existingGroupMates = await _groupMatesRepository
+                .FindAll(cm => cm.GroupId == groupId)
+                .ToArrayAsync()
+                .ConfigureAwait(false);
 
-            foreach (var groupMate in group.GroupMates.ToList())
+            foreach (var groupMate in existingGroupMates)
             {
                 await _groupMatesRepository.DeleteAsync(groupMate.Id).ConfigureAwait(false);
             }