Change getCurrentPosters logic to return priority first, then posters the user is involved in, and then all other posters

Author: Jshmill

Gordon360/Controllers/PostersController.cs

@@ -31,15 +31,15 @@ public ActionResult<IEnumerable<PosterViewModel>> GetPosters()
     }
 
     /// <summary>
-    /// Gets all non-expired posters
+    /// Gets all non-expired posters in the order based on the username
     /// </summary>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
     [HttpGet]
-    [Route("")]
-    public ActionResult<IEnumerable<PosterViewModel>> GetCurrentPosters()
+    [Route("current/{username}")]
+    public ActionResult<IEnumerable<PosterViewModel>> GetCurrentPosters(string username)
     {
-        var res = posterService.GetCurrentPosters();
+        var res = posterService.GetCurrentPosters(username);
         return Ok(res);
     }
 

Gordon360/Documentation/Gordon360.xml

@@ -36,11 +36,16 @@ public IEnumerable<PosterViewModel> GetPosters() {
         return context.Poster.Include(p => p.Status).Select(p => (PosterViewModel)p);
     }
 
-    public IEnumerable<PosterViewModel> GetCurrentPosters()
+    public IEnumerable<PosterViewModel> GetCurrentPosters(string username)
     {
+        var currentSessionCode = sessionService.GetCurrentSession().SessionCode;
+        var currentMembershipCodes = membershipService.GetMemberships(username: username, sessionCode: currentSessionCode)
+            .Select(m => m.ActivityCode);
+
         return GetPosters()
             .Where(p => p.ExpirationDate > DateTime.Now && p.Status == "Visible" && p.VisibleDate < DateTime.Now)
             .OrderByDescending(p => p.Priority)
+            .ThenByDescending(p => currentMembershipCodes.Contains(p.ClubCode))
             .ThenBy(p => p.ExpirationDate);
     }
 
@@ -64,7 +69,7 @@ public IEnumerable<PosterViewModel> GetPersonalizedPostersByUsername(string user
         var currentMembershipCodes = membershipService.GetMemberships(username: username, sessionCode: currentSessionCode)
             .Select(m => m.ActivityCode);
 
-        var res = GetCurrentPosters().Where(p => currentMembershipCodes.Contains(p.ClubCode));
+        var res = GetCurrentPosters(username).Where(p => currentMembershipCodes.Contains(p.ClubCode));
 
         return res;
     }

Gordon360/Services/PosterService.cs

@@ -340,7 +340,7 @@ public interface IAcademicCheckInService
     public interface IPosterService
     {
         IEnumerable<PosterViewModel> GetPosters();
-        IEnumerable<PosterViewModel> GetCurrentPosters();
+        IEnumerable<PosterViewModel> GetCurrentPosters(string username);
         IEnumerable<PosterViewModel> GetCurrentPostersByActivityCode(string activityCode);
         IEnumerable<PosterViewModel> GetPersonalizedPostersByUsername(string username);
         IEnumerable<string> GetPosterStatuses();