fix: filter if usage

Author: semrosin

HwProj.CoursesService/HwProj.CoursesService.API/Repositories/CourseFilterRepository.cs

@@ -18,7 +18,7 @@ public CourseFilterRepository(CourseContext context) : base(context)
             var userToCourseFilter = await Context.Set<UserToCourseFilter>()
                 .Include(ucf => ucf.CourseFilter)
                 .AsNoTracking()
-                .FirstOrDefaultAsync(u => u.UserId == userId && u.CourseId == courseId);
+                .FirstOrDefaultAsync(u => u.Id == userId && u.CourseId == courseId);
 
             return userToCourseFilter?.CourseFilter;
         }
@@ -27,7 +27,7 @@ public async Task<List<UserToCourseFilter>> GetAsync(string[] userIds, long cour
         {
             return await Context.Set<UserToCourseFilter>()
                 .AsNoTracking()
-                .Where(u => userIds.Contains(u.UserId) && u.CourseId == courseId)
+                .Where(u => userIds.Contains(u.Id) && u.CourseId == courseId)
                 .Include(ucf => ucf.CourseFilter)
                 .ToListAsync();
         }
@@ -36,7 +36,7 @@ public async Task<List<UserToCourseFilter>> GetAsync(string userId, long[] cours
         {
             return await Context.Set<UserToCourseFilter>()
                 .AsNoTracking()
-                .Where(u => u.UserId == userId && courseIds.Contains(u.CourseId))
+                .Where(u => u.Id == userId && courseIds.Contains(u.CourseId))
                 .Include(ucf => ucf.CourseFilter)
                 .ToListAsync();
         }
@@ -53,7 +53,7 @@ public async Task<long> AddAsync(CourseFilter courseFilter, string userId, long
                 {
                     CourseFilterId = filterId,
                     CourseId = courseId,
-                    UserId = userId
+                    Id = userId
                 };
 
                 Context.Set<UserToCourseFilter>().Add(userToCourseFilter);

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

@@ -33,14 +33,14 @@ public async Task<Result<long>> CreateOrUpdateCourseFilter(CreateCourseFilterMod
             var filter = CourseFilterUtils.CreateFilter(courseFilterModel);
 
             var existingCourseFilter =
-                await _courseFilterRepository.GetAsync(courseFilterModel.UserId, courseFilterModel.CourseId);
+                await _courseFilterRepository.GetAsync(courseFilterModel.Id, courseFilterModel.CourseId);
             if (existingCourseFilter != null)
             {
                 await UpdateAsync(existingCourseFilter.Id, filter);
                 return Result<long>.Success(existingCourseFilter.Id);
             }
 
-            var filterId = await AddCourseFilter(filter, courseFilterModel.CourseId, courseFilterModel.UserId);
+            var filterId = await AddCourseFilter(filter, courseFilterModel.CourseId, courseFilterModel.Id);
             if (filterId == -1)
             {
                 return Result<long>.Failed();
@@ -86,7 +86,7 @@ public async Task<CourseDTO> ApplyFilter(CourseDTO course, string userId)
 
             var courseFilters =
                 (await _courseFilterRepository.GetAsync(findFiltersFor, course.Id))
-                .ToDictionary(x => x.UserId, x => x.CourseFilter);
+                .ToDictionary(x => x.Id, x => x.CourseFilter);
 
             if (!isMentor)
             {
@@ -126,7 +126,7 @@ public async Task<MentorToAssignedStudentsDTO[]> GetAssignedStudentsIds(long cou
                 .Where(u => u.CourseFilter.Filter.HomeworkIds.Count == 0)
                 .Select(u => new MentorToAssignedStudentsDTO
                 {
-                    MentorId = u.UserId,
+                    MentorId = u.Id,
                     SelectedStudentsIds = u.CourseFilter.Filter.StudentIds
                 })
                 .ToArray();
@@ -208,7 +208,7 @@ public async Task UpdateGroupFilters(long courseId, long homeworkId, IEnumerable
         {
             var filterIds = studentIds.Union(new[] { GlobalFilterUserId }).ToArray();
             var filters = (await _courseFilterRepository.GetAsync(filterIds, courseId))
-                .ToDictionary(x => x.UserId, x => x.CourseFilter);
+                .ToDictionary(x => x.Id, x => x.CourseFilter);
 
             foreach (var filterId in filterIds)
             {