use filter service

sametcn99 · Jul 3, 2024 · 3cfb6e0 · 3cfb6e0
1 parent 1d93812
commit 3cfb6e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 38 deletions.
diff --git a/GPVBlazor/GPVBlazor/Components/Displays/FilterDisplays/RepositoryFilterBar.razor b/GPVBlazor/GPVBlazor/Components/Displays/FilterDisplays/RepositoryFilterBar.razor
@@ -1,4 +1,6 @@
 @using GPVBlazor.Models
+@using GPVBlazor.Services.Interfaces
+@inject IRepositoryFilterService filterService
 
 <section class="field is-grouped is-grouped-multiline">
     <div class="control is-expanded">
@@ -116,43 +118,7 @@
 
     private void ApplyFilters()
     {
-
-            IEnumerable<Repository> query = Repositories ?? Enumerable.Empty<Repository>();
-            IEnumerable<Repository> AllRepos = _Repositories ?? Enumerable.Empty<Repository>();
-
-            query = AllRepos.Where(r => (r.Name != null && r.Name.Contains(searchQuery, StringComparison.OrdinalIgnoreCase)) || (r.Description != null && r.Description.Contains(searchQuery, StringComparison.OrdinalIgnoreCase)));
-
-            if (!string.IsNullOrWhiteSpace(selectedTopic)) query = query.Where(r => r.Topics != null && r.Topics.Contains(selectedTopic));
-            if (!string.IsNullOrWhiteSpace(selectedLanguage)) query = query.Where(r => r.Language == selectedLanguage);
-            if (!string.IsNullOrWhiteSpace(selectedLicense)) query = query.Where(r => r.License != null && r.License.Name == selectedLicense);
-            if (!includeArchived) query = query.Where(r => !r.Archived);
-            if (!includeForked) query = query.Where(r => !r.Fork);
-            if (!includeTemplates) query = query.Where(r => !r.IsTemplate);
-
-            switch (selectedSort)
-            {
-                case "Updated Descending":
-                    query = query.OrderByDescending(r => r.UpdatedAt);
-                    break;
-                case "Updated Ascending":
-                    query = query.OrderBy(r => r.UpdatedAt);
-                    break;
-                case "Created Descending":
-                    query = query.OrderByDescending(r => r.CreatedAt);
-                    break;
-                case "Created Ascending":
-                    query = query.OrderBy(r => r.CreatedAt);
-                    break;
-                case "Stars Descending":
-                    query = query.OrderByDescending(r => r.StargazersCount);
-                    break;
-                case "Stars Ascending":
-                    query = query.OrderBy(r => r.StargazersCount);
-                    break;
-            }
-
-            FilteredRepositories = query.ToList();
-
+        FilteredRepositories = filterService.FilterRepositories(Repositories!, _Repositories!, searchQuery,includeArchived,includeForked,includeTemplates,selectedSort,selectedTopic,selectedLanguage,selectedLicense);
         OnFilteredRepositoriesChanged.InvokeAsync(FilteredRepositories);
         StateHasChanged();
     }

diff --git a/GPVBlazor/GPVBlazor/Components/Pages/Profile.razor b/GPVBlazor/GPVBlazor/Components/Pages/Profile.razor
@@ -40,7 +40,6 @@ else
             </Virtualize>
         </div>
     </div>
-
 }
 
 @code {
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ else @@
                 </Virtualize>
             </div>
         </div>
     }
     @code {
@@ Expand Down @@