Revize 85b8834f

Added info about final annotation to GET /documents

Backend/Core/Services/DocumentService/DocumentServiceEF.cs

@@ -139 +139 @@
             {
                 var annotatingUsers = databaseContext.Annotations.Where(a => a.Document == document).Select(a => a.User).ToList();
                 List<DocumentUserInfo> annotatingUsersDto = new();
-               
+
                 // Include annotation state
                 foreach (var annotatingUser in annotatingUsers)
                 {
@@ -151 +151 @@
                     annotatingUsersDto.Add(dui);
                 }
 
-                DocumentListInfo dai = mapper.Map<DocumentListInfo>(document);
-                dai.AnnotatingUsers = annotatingUsersDto;
-                documentInfos.Add(dai);
+                DocumentListInfo dli = mapper.Map<DocumentListInfo>(document);
+                dli.AnnotatingUsers = annotatingUsersDto;
+
+                dli.FinalizedExists = databaseContext.FinalAnnotations.Any(fa => fa.Document == document);
+                if (dli.FinalizedExists)
+                {
+                    var finalizedAnnotation = databaseContext.FinalAnnotations
+                        .Include(fa => fa.Annotations)
+                        .ThenInclude(a => a.User)
+                        .Single(fa => fa.Document == document);
+
+                    dli.FinalizedState = finalizedAnnotation.State;
+                    dli.FinalAnnotations = new();
+
+                    foreach (var annotation in finalizedAnnotation.Annotations)
+                    {
+                        dli.FinalAnnotations.Add(new()
+                        {
+                            AnnotationId = annotation.Id,
+                            UserId = annotation.User.Id,
+                            Username = annotation.User.Username,
+                            UserFirstName = annotation.User.Name,
+                            UserSurname = annotation.User.Surname
+                        });
+                    }
+
+                }
+
+                documentInfos.Add(dli);
             }
 
             return new DocumentListResponse()

Backend/Models/Documents/DocumentAnnotationInfo.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Documents
+{
+    public class DocumentAnnotationInfo
+    {
+        public Guid AnnotationId { get; set; }
+        public Guid UserId { get; set; }
+        public string UserFirstName { get; set; }
+        public string UserSurname { get; set; }
+        public string Username { get; set; }
+    }
+}

Backend/Models/Documents/DocumentListInfo.cs

@@ -1 @@
-using Models.Users;
+using Models.Enums;
+using Models.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7 +8 @@
 
 namespace Models.Documents;
 
-# nullable disable
 public class DocumentListInfo
 {
     public Guid Id { get; set; }
@@ -15 +15 @@
     public int Length { get; set; }
     public int RequiredAnnotations { get; set; }
     public List<DocumentUserInfo> AnnotatingUsers { get; set; } = new();
+    public bool FinalizedExists { get; set; }
+    public EState? FinalizedState { get; set; }
+    public List<DocumentAnnotationInfo>? FinalAnnotations { get; set; }
 }