refactor: move filter update to backend

Author: semrosin

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

@@ -1,6 +1,8 @@
 using System.Linq;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 using AutoMapper;
+using HwProj.Common.Net8;
 using HwProj.CoursesService.API.Filters;
 using HwProj.CoursesService.API.Models;
 using HwProj.CoursesService.API.Services;
@@ -15,11 +17,19 @@ public class CourseGroupsController : Controller
     {
         private readonly IGroupsService _groupsService;
         private readonly IMapper _mapper;
+        private readonly ICourseFilterService _courseFilterService;
+        private readonly ICoursesService _coursesService;
 
-        public CourseGroupsController(IMapper mapper, IGroupsService groupsService)
+        public CourseGroupsController(
+            IMapper mapper,
+            IGroupsService groupsService,
+            ICourseFilterService courseFilterService,
+            ICoursesService coursesService)
         {
             _mapper = mapper;
             _groupsService = groupsService;
+            _courseFilterService = courseFilterService;
+            _coursesService = coursesService;
         }
 
         [HttpGet("{courseId}/getAll")]
@@ -47,6 +57,15 @@ public async Task<IActionResult> CreateGroup([FromBody] CreateGroupViewModel gro
                 GroupMates = groupViewModel.GroupMatesIds.Select(t => new GroupMate() { StudentId = t }).ToList()
             };
             var id = await _groupsService.AddGroupAsync(group);
+
+            var userId = Request.GetUserIdFromHeader();
+            var courseMentorIds = await _coursesService.GetCourseLecturers(groupViewModel.CourseId);
+            if (userId != null && courseMentorIds.Contains(userId))
+                await _courseFilterService.AddToFilter(groupViewModel.CourseId, userId, new Filter
+                {
+                    GroupIds = new List<long> { id }
+                });
+
             return Ok(id);
         }
 

HwProj.CoursesService/HwProj.CoursesService.API/Controllers/HomeworksController.cs

@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
 using HwProj.CoursesService.API.Domains;
 using HwProj.CoursesService.API.Filters;
+using HwProj.CoursesService.API.Models;
 using HwProj.CoursesService.API.Services;
+using HwProj.Common.Net8;
 using HwProj.Models.CoursesService.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Linq;
@@ -13,10 +15,12 @@ namespace HwProj.CoursesService.API.Controllers
     public class HomeworksController : Controller
     {
         private readonly IHomeworksService _homeworksService;
+        private readonly ICourseFilterService _courseFilterService;
 
-        public HomeworksController(IHomeworksService homeworksService)
+        public HomeworksController(IHomeworksService homeworksService, ICourseFilterService courseFilterService)
         {
             _homeworksService = homeworksService;
+            _courseFilterService = courseFilterService;
         }
 
         [HttpPost("{courseId}/add")]
@@ -28,6 +32,13 @@ public async Task<IActionResult> AddHomework(long courseId,
             if (validationResult.Any()) return BadRequest(validationResult);
 
             var newHomework = await _homeworksService.AddHomeworkAsync(courseId, homeworkViewModel);
+            var mentorId = Request.GetUserIdFromHeader();
+            if (mentorId != null)
+                await _courseFilterService.AddToFilter(courseId, mentorId, new Filter
+                {
+                    HomeworkIds = new System.Collections.Generic.List<long> { newHomework.Id }
+                });
+
             return Ok(newHomework.ToHomeworkViewModel());
         }
 

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

@@ -281,5 +281,42 @@ public async Task UpdateGroupFilters(long courseId, long homeworkId, Group group
                     await AddCourseFilter(newFilter, courseId, filterId);
             }
         }
+
+        public async Task AddToFilter(long courseId, string userId, Filter filter)
+        {
+            var existingCourseFilter = await _courseFilterRepository.GetAsync(userId, courseId);
+            if (existingCourseFilter?.Filter is null)
+                return;
+
+            var targetFilter = existingCourseFilter.Filter.FillEmptyFields();
+            filter.FillEmptyFields();
+
+            var hasChanges =
+                AddToFilterList(targetFilter.GroupIds, filter.GroupIds)
+                | AddToFilterList(targetFilter.StudentIds, filter.StudentIds)
+                | AddToFilterList(targetFilter.HomeworkIds, filter.HomeworkIds)
+                | AddToFilterList(targetFilter.MentorIds, filter.MentorIds);
+
+            if (hasChanges)
+                await UpdateAsync(existingCourseFilter.Id, targetFilter);
+        }
+
+        private static bool AddToFilterList<T>(List<T> target, IEnumerable<T> itemsToAdd)
+        {
+            if (!target.Any())
+                return false;
+
+            var hasChanges = false;
+            foreach (var item in itemsToAdd.Distinct())
+            {
+                if (target.Contains(item))
+                    continue;
+
+                target.Add(item);
+                hasChanges = true;
+            }
+
+            return hasChanges;
+        }
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Services/ICourseFilterService.cs

@@ -16,5 +16,6 @@ public interface ICourseFilterService
         Task<CourseDTO> ApplyFilter(CourseDTO courseDto, string userId);
         Task<MentorToAssignedStudentsDTO[]> GetAssignedStudentsIds(long courseId, string[] mentorsIds);
         Task UpdateGroupFilters(long courseId, long homeworkId, Group group);
+        Task AddToFilter(long courseId, string filterId, Filter filter);
     }
 }