Order notes by date

PaddiM8 · Nov 12, 2023 · 7871a05 · 7871a05
1 parent a46203a
commit 7871a05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/api/Services/NoteService.cs b/api/Services/NoteService.cs
@@ -31,10 +31,11 @@ public async Task<ErrorOr<List<NoteDto>>> GetAllAsync(string userId, string proj
         if (project == null)
             return ProjectService.ProjectNotFoundError<List<NoteDto>>();
 
-        return await _dataContext.Notes
+        return _dataContext.Notes
             .Where(x => x.ProjectId == projectId && x.TicketId == ticketId)
+            .OrderBy(x => x.Timestamp)
             .ProjectTo<NoteDto>(_mapper.ConfigurationProvider)
-            .ToListAsync();
+            .ToList();
     }
 
     public async Task<ErrorOr<NoteDto>> AddAsync(string userId, string projectId, int ticketId, string content)
@@ -110,4 +111,4 @@ public async Task<ErrorOr<Updated>> EditAsync(
 
         return new ErrorOr<Updated>();
     }
-}
+}
diff --git a/api/Services/TicketService.cs b/api/Services/TicketService.cs
@@ -82,7 +82,7 @@ public async Task<ErrorOr<TicketDto>> GetAsync(
             .Where(x => x.Id == ticketId && x.ProjectId == project.Id)
             .Include(x => x.Project)
             .Include(x => x.Assignees)
-            .Include(x => x.Notes)
+            .Include(x => x.Notes.OrderBy(note => note.Timestamp))
             .SingleOrDefaultAsync();
 
         return ticket == null
@@ -433,4 +433,4 @@ private async Task<string> SaveImagesAndReplaceUrls(string projectId, string tic
             }
         );
     }
-}
+}