Merge main

SCCapstone · Apr 8, 2024 · c881d49 · c881d49
2 parents c9b529e + 59491b6
commit c881d49
Show file tree

Hide file tree

Showing 46 changed files with 4,596 additions and 815 deletions.
diff --git a/FU.API/FU.API.Tests/RelationServiceTests.cs b/FU.API/FU.API.Tests/RelationServiceTests.cs
@@ -132,6 +132,6 @@ public async void HandleRelationAction_WithValidUsersAndAction_CantRemoveBlocked
 
     private static RelationService CreateRelationService(AppDbContext context)
     {
-        return new RelationService(context);
+        return new RelationService(context, new ChatService(context));
     }
 }
diff --git a/FU.API/FU.API/DTOs/Post/PostResponseDTO.cs b/FU.API/FU.API/DTOs/Post/PostResponseDTO.cs
@@ -1,5 +1,6 @@
 namespace FU.API.DTOs.Post;
 
+using FU.API.DTOs.Chat;
 using FU.API.Models;
 
 public class PostResponseDTO
@@ -25,4 +26,6 @@ public class PostResponseDTO
     public ICollection<string> Tags { get; set; } = new HashSet<string>();
 
     public bool HasJoined { get; set; } = false;
+
+    public MessageResponseDTO? LastMessage { get; set; }
 }
diff --git a/FU.API/FU.API/Helpers/Mapper.cs b/FU.API/FU.API/Helpers/Mapper.cs
@@ -12,7 +12,7 @@ namespace FU.API.Helpers;
 
 public static class Mapper
 {
-    public static UserProfile ToProfile(this ApplicationUser appUser)
+    public static UserProfile ToProfile(this ApplicationUser appUser, Message? lastChatMessage = null)
     {
         return new UserProfile()
         {
@@ -24,6 +24,7 @@ public static UserProfile ToProfile(this ApplicationUser appUser)
             IsOnline = appUser.IsOnline,
             FavoriteGames = appUser.FavoriteGames.Select(g => g.Game).ToList(),
             FavoriteTags = appUser.FavoriteTags.Select(t => t.Tag).ToList(),
+            LastMessage = lastChatMessage?.ToDto(),
         };
     }
 
@@ -107,6 +108,8 @@ public static UserQuery ToUserQuery(this UserSearchRequestDTO dto)
         query.SortType = arr[0] switch
         {
             "username" => UserSortType.Username,
+            "dob" => UserSortType.DOB,
+            "chatactivity" => UserSortType.ChatActivity,
             _ => UserSortType.Username,
         };
 
@@ -177,6 +180,7 @@ public static PostQuery ToPostQuery(this PostSearchRequestDTO dto)
             "soonest" => PostSortType.EarliestToScheduledTime,
             "newest" => PostSortType.NewestCreated,
             "title" => PostSortType.Title,
+            "chatactivity" => PostSortType.ChatActivity,
             _ => PostSortType.NewestCreated
         };
 
@@ -207,6 +211,7 @@ public static PostResponseDTO ToDto(this Post post, bool hasJoined = false)
             Creator = post.Creator == null ? new UserProfile { Username = "Deleted User" } : post.Creator.ToProfile(),
             Tags = post.Tags.Select(t => t.Tag.Name).ToList(),
             HasJoined = hasJoined,
+            LastMessage = post.Chat.LastMessage?.ToDto(),
         };
     }