Merge pull request #471 from DigitalExcellence/feature/470-sort-proje…

…cts-onlikes Added like sorting
DigitalExcellence · Jun 28, 2021 · 8be1144 · 8be1144
2 parents 0de84dd + 9d1ae35
commit 8be1144
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/API/Controllers/ProjectController.cs b/API/Controllers/ProjectController.cs
@@ -174,9 +174,10 @@ public async Task<IActionResult> GetAllProjects(
             if(projectFilterParamsResource.SortBy != null &&
                projectFilterParamsResource.SortBy != "name" &&
                projectFilterParamsResource.SortBy != "created" &&
-               projectFilterParamsResource.SortBy != "updated")
+               projectFilterParamsResource.SortBy != "updated" &&
+               projectFilterParamsResource.SortBy != "likes")
             {
-                problem.Detail = "Invalid sort value: Use \"name\", \"created\" or \"updated\".";
+                problem.Detail = "Invalid sort value: Use \"name\", \"created\", \"updated\" or \"likes\".";
                 problem.Instance = "5CE2F569-C0D5-4179-9299-62916270A058";
                 return BadRequest(problem);
             }

diff --git a/API/Resources/ProjectFilterParamsResource.cs b/API/Resources/ProjectFilterParamsResource.cs
@@ -41,7 +41,7 @@ public class ProjectFilterParamsResource
 
         /// <summary>
         ///     Get or Set the sort by query parameter
-        ///     Possible sorts are: name, created, updated
+        ///     Possible sorts are: name, created, updated, likes
         /// </summary>
         [FromQuery(Name = "sortBy")]
         public string SortBy { get; set; }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added fontys gitlab to the wizard, and the functionality to get private projects - [#377](https://github.com/DigitalExcellence/dex-backend/issues/377)
 - Performance testing using K6 - [#379](https://github.com/DigitalExcellence/dex-backend/issues/379)
+- Project sorting by likes - [#470](https://github.com/DigitalExcellence/dex-backend/issues/470)
 
 ### Changed
 

diff --git a/Models/ProjectFilterParams.cs b/Models/ProjectFilterParams.cs
@@ -38,7 +38,7 @@ public class ProjectFilterParams
 
         /// <summary>
         ///     By which property the results should be sorted
-        ///     Possible values are: name, created, updated
+        ///     Possible values are: name, created, updated, likes
         /// </summary>
         public string SortBy { get; set; }
 

diff --git a/Services/Services/ProjectService.cs b/Services/Services/ProjectService.cs
@@ -160,6 +160,9 @@ public Task<List<Project>> GetAllWithUsersCollaboratorsAndInstitutionsAsync(Proj
                 case "created":
                     orderBy = project => project.Created;
                     break;
+                case "likes":
+                    orderBy = project => project.Likes.Count;
+                    break;
                 default:
                     orderBy = project => project.Updated;
                     break;