@@ -18,7 +18,7 @@ public static IEnumerable<Competency> FilterCompetencies(IEnumerable<Competency>
1818                var  searchText  =  search . SearchText ? . Trim ( )  ??  string . Empty ; 
1919                var  filters  =  search . AppliedFilters ? . Select ( f =>  int . Parse ( f . FilterValue ) )  ??  Enumerable . Empty < int > ( ) ; 
2020                search . CompetencyFlags  =  competencyFlags . ToList ( ) ; 
21-                 ResponseStatusFilters ( ref  filteredCompetencies ,  filters ,  searchText ) ; 
21+                 ApplyResponseStatusFilters ( ref  filteredCompetencies ,  filters ,  searchText ) ; 
2222                UpdateRequirementsFilterDropdownOptionsVisibility ( search ,  filteredCompetencies ) ; 
2323                ApplyRequirementsFilters ( ref  filteredCompetencies ,  filters ) ; 
2424
@@ -30,7 +30,7 @@ public static IEnumerable<Competency> FilterCompetencies(IEnumerable<Competency>
3030            return  filteredCompetencies ; 
3131        } 
3232
33-         public  static void  ResponseStatusFilters ( ref  IEnumerable < Competency >  competencies ,  IEnumerable < int >  filters ,  string  searchText  =  "" ) 
33+         private  static void  ApplyResponseStatusFilters ( ref  IEnumerable < Competency >  competencies ,  IEnumerable < int >  filters ,  string  searchText  =  "" ) 
3434        { 
3535            var  appliedResponseStatusFilters  =  filters . Where ( IsResponseStatusFilter ) . ToList ( ) ; 
3636
@@ -72,33 +72,6 @@ bool MatchesFilters(Competency c) =>
7272            // Final filtering 
7373            competencies  =  competencies . Where ( c =>  MatchesSearch ( c )  &&  MatchesFilters ( c ) ) ; 
7474        } 
75-         private  static void  ApplyResponseStatusFilters ( ref  IEnumerable < Competency >  competencies ,  IEnumerable < int >  filters ,  string  searchText  =  "" ) 
76-         { 
77-             var  filteredCompetencies  =  competencies ; 
78-             var  appliedResponseStatusFilters  =  filters . Where ( f =>  IsResponseStatusFilter ( f ) ) ; 
79- 
80-             if  ( appliedResponseStatusFilters . Any ( )  ||  searchText . Length  >  0 ) 
81-             { 
82-                 var  wordsInSearchText  =  searchText . Split ( ) . Where ( w =>  w  !=  string . Empty ) ; 
83-                                     filteredCompetencies  =  from  c  in  competencies 
84-                                            let  searchTextMatchesGroup  =  wordsInSearchText . All ( w =>  c . CompetencyGroup ? . Contains ( w ,  StringComparison . CurrentCultureIgnoreCase )  ??  false ) 
85-                                            let  searchTextMatchesCompetencyDescription  =  wordsInSearchText . All ( w =>  c . Description ? . Contains ( w ,  StringComparison . CurrentCultureIgnoreCase )  ??  false ) 
86-                                            let  searchTextMatchesCompetencyName  =  wordsInSearchText . All ( w =>  c . Name ? . Contains ( w ,  StringComparison . CurrentCultureIgnoreCase )  ??  false ) 
87-                                            let  responseStatusFilterMatchesAll  = 
88-                                               ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . RequiresSelfAssessment )  &&  c . AssessmentQuestions . Any ( q =>  q . ResultId  ==  null ) ) 
89-                                            ||  ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . SelfAssessed )  &&  c . AssessmentQuestions . Any ( q =>  q . ResultId  !=  null  &&  q . Requested  ==  null  &&  q . SignedOff  ==  null ) ) 
90-                                            ||  ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . ConfirmationRequested )  &&  c . AssessmentQuestions . Any ( q =>  q . Verified  ==  null  &&  q . Requested  !=  null ) ) 
91-                                            ||  ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . ConfirmationRejected )  &&  c . AssessmentQuestions . Any ( q =>  q . Verified . HasValue  &&  q . SignedOff  !=  true ) ) 
92-                                            ||  ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . Verified )  &&  c . AssessmentQuestions . Any ( q =>  q . Verified . HasValue  &&  q . SignedOff  ==  true ) ) 
93-                                            ||  ( filters . Contains ( ( int ) SelfAssessmentCompetencyFilter . Optional )  &&  c . Optional ) 
94-                                            where  ( wordsInSearchText . Count ( )  ==  0  ||  searchTextMatchesGroup  ||  searchTextMatchesCompetencyDescription  ||  searchTextMatchesCompetencyName ) 
95-                                                &&  ( ! appliedResponseStatusFilters . Any ( )  ||  responseStatusFilterMatchesAll ) 
96-                                            select  c ; 
97-                
98-             } 
99-             competencies  =  filteredCompetencies ; 
100-         } 
101- 
10275        private  static void  ApplyRequirementsFilters ( ref  IEnumerable < Competency >  competencies ,  IEnumerable < int >  filters ) 
10376        { 
10477            var  filteredCompetencies  =  competencies ; 
0 commit comments