work on displaying unread chats

NielsPilgaard · Aug 20, 2023 · 477e0bc · 477e0bc
1 parent ddad0f6
commit 477e0bc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/web/Client/Features/Chat/ChatService.cs b/src/web/Client/Features/Chat/ChatService.cs
@@ -48,11 +48,13 @@ public async ValueTask<List<ChatDto>> GetChats(string userId)
         var newChats = HandleApiResponse(await _chatClient.GetChats(userId, cachedChats?.Count ?? 0));
         if (cachedChats is null)
         {
-            return newChats;
+            return newChats.OrderByDescending(chat => chat.HasUnreadMessages).ToList();
         }
 
         cachedChats.AddRange(newChats);
 
+        cachedChats = cachedChats.OrderByDescending(chat => chat.HasUnreadMessages).ToList();
+
         return cachedChats;
     }
 

diff --git a/src/web/Client/Features/Chat/LargeChatComponent.razor b/src/web/Client/Features/Chat/LargeChatComponent.razor
@@ -24,7 +24,16 @@
                         <MudAvatar Size="Size.Large" Class="mr-3">
                             <MudImage Src="@chat.GetChatImage(_currentUser.Id)" loading="lazy" Alt="Avatar" />
                         </MudAvatar>
-                        <MudText>@chat.GetDisplayName(_currentUser.Id)</MudText>
+                        <MudText>
+                            @if (chat.HasUnreadMessages)
+                            {
+                                <b>@chat.GetDisplayName(_currentUser.Id) (@chat.UnreadMessageCount}</b>
+                            }
+                            else
+                            {
+                                @chat.GetDisplayName(_currentUser.Id)
+                            }
+                        </MudText>
 
                     </MudListItem>
                     <MudDivider DividerType="DividerType.FullWidth" />
@@ -63,9 +72,9 @@
 
                     </Virtualize>
                     <MudTextField @bind-Value="_userText"
-                                  FullWidth
-                                  Immediate
-                                  AutoFocus
+                                    FullWidth
+                                    Immediate
+                                    AutoFocus
                                   id="chat-message-input"
                                   Class="chat-message-input"
                                   Adornment="Adornment.End"
@@ -96,6 +105,8 @@
     [SupplyParameterFromQuery]
     public Guid? ChatId { get; set; }
 
+    // TODO: Implement logic for marking messages as read, make sure to update the local cache
+
     protected override async Task OnInitializedAsync()
     {
         _currentUser = await ProfileCache.GetOrCreateProfileAsync();

diff --git a/src/web/Server/Features/Chat/ChatApi.cs b/src/web/Server/Features/Chat/ChatApi.cs
@@ -48,8 +48,10 @@ async Task<Results<Ok<List<ChatDto>>, UnauthorizedHttpResult>> (
                         LastMessageSentUtc = chat.LastMessageSentUtc,
                         StartedUtc = chat.StartedUtc,
                         Recipients = chat.Recipients.Select(recipient => recipient.ToUserSlim()).ToList(),
-                        IsUnread = context.UnreadMessages.Any(unreadMessage => unreadMessage.ChatId == chat.Id &&
-                                                                               unreadMessage.RecipientId == userId)
+                        UnreadMessageCount = context.UnreadMessages
+                            .Count(unreadMessage =>
+                                unreadMessage.ChatId == chat.Id &&
+                                unreadMessage.RecipientId == userId)
                     })
                     .AsSingleQuery()
                     .ToListAsync(cancellationToken);

diff --git a/src/web/Shared/Chat/ChatDto.cs b/src/web/Shared/Chat/ChatDto.cs
@@ -12,11 +12,13 @@ public class ChatDto
     /// </summary>
     public string? DisplayName { get; init; }
 
-    public bool IsUnread { get; init; } = false;
+    public int UnreadMessageCount { get; init; }
 
     public List<ChatMessageDto> Messages { get; set; } = new();
     public List<UserSlim> Recipients { get; init; } = new();
 
     public DateTime LastMessageSentUtc { get; init; }
     public DateTime StartedUtc { get; init; } = DateTime.UtcNow;
+
+    public bool HasUnreadMessages => UnreadMessageCount > 0;
 }