1010
1111namespace HwProj . CoursesService . API . Services
1212{
13- public enum ApplyFilterType
13+ public enum ApplyFilterOperation
1414 {
1515 Intersect ,
1616 Union ,
@@ -93,15 +93,15 @@ public async Task<CourseDTO> ApplyFilter(CourseDTO courseDto, string userId)
9393 var groupFilter = await _courseFilterRepository . GetAsync ( GlobalFilterUserId , courseDto . Id ) ; // Глобальный фильтр для вычитания групповых домашних заданий
9494 if ( groupFilter != null )
9595 {
96- studentCourse = ApplyFilterInternal ( courseDto , studentCourse , groupFilter , ApplyFilterType . Subtract ) ;
96+ studentCourse = ApplyFilterInternal ( courseDto , studentCourse , groupFilter , ApplyFilterOperation . Subtract ) ;
9797 }
9898 return courseFilters . TryGetValue ( userId , out var studentFilter )
99- ? ApplyFilterInternal ( courseDto , studentCourse , studentFilter , ApplyFilterType . Union )
99+ ? ApplyFilterInternal ( courseDto , studentCourse , studentFilter , ApplyFilterOperation . Union )
100100 : studentCourse ;
101101 }
102102
103103 var course = courseFilters . TryGetValue ( userId , out var userFilter )
104- ? ApplyFilterInternal ( courseDto , courseDto , userFilter , ApplyFilterType . Intersect )
104+ ? ApplyFilterInternal ( courseDto , courseDto , userFilter , ApplyFilterOperation . Intersect )
105105 : courseDto ;
106106 if ( isMentor || ! isCourseStudent ) return course ;
107107
@@ -140,7 +140,7 @@ private async Task<long> AddCourseFilter(Filter filter, long courseId, string us
140140 return courseFilterId ;
141141 }
142142
143- private CourseDTO ApplyFilterInternal ( CourseDTO initialCourseDto , CourseDTO editingCourseDto , CourseFilter ? courseFilter , ApplyFilterType filterType )
143+ private CourseDTO ApplyFilterInternal ( CourseDTO initialCourseDto , CourseDTO editingCourseDto , CourseFilter ? courseFilter , ApplyFilterOperation filterType )
144144 {
145145 var filter = courseFilter ? . Filter ;
146146
@@ -152,15 +152,15 @@ private CourseDTO ApplyFilterInternal(CourseDTO initialCourseDto, CourseDTO edit
152152 var homeworks = filter . HomeworkIds . Any ( )
153153 ? filterType switch
154154 {
155- ApplyFilterType . Intersect => editingCourseDto . Homeworks
155+ ApplyFilterOperation . Intersect => editingCourseDto . Homeworks
156156 . Where ( hw => filter . HomeworkIds . Contains ( hw . Id ) )
157157 . ToArray ( ) ,
158158
159- ApplyFilterType . Subtract => editingCourseDto . Homeworks
159+ ApplyFilterOperation . Subtract => editingCourseDto . Homeworks
160160 . Where ( hw => ! filter . HomeworkIds . Contains ( hw . Id ) )
161161 . ToArray ( ) ,
162162
163- ApplyFilterType . Union => editingCourseDto . Homeworks
163+ ApplyFilterOperation . Union => editingCourseDto . Homeworks
164164 . Concat ( initialCourseDto . Homeworks
165165 . Where ( hw => filter . HomeworkIds . Contains ( hw . Id ) ) )
166166 . ToArray ( ) ,
0 commit comments