Revize 3cee56d3

Annotation state returned with document list info

Backend/Core/MapperProfiles/UserProfileEF.cs

@@ -13 +13 @@
     {
         public UserProfileEF()
         {
-           CreateMap<User, UserInfo>();
+            CreateMap<User, UserInfo>();
+            CreateMap<User, DocumentUserInfo>();
         }
     }
 }

Backend/Core/Services/DocumentService/DocumentServiceEF.cs

@@ -12 +12 @@
 using AutoMapper;
 using Models.Users;
 using Ganss.XSS;
+using Microsoft.EntityFrameworkCore;
 
 namespace Core.Services.DocumentService
 {
@@ -137 +138 @@
             foreach (var document in documents.GetRange(firstIndex, pageSize))
             {
                 var annotatingUsers = databaseContext.Annotations.Where(a => a.Document == document).Select(a => a.User).ToList();
-                List<UserInfo> annotatingUsersDto = annotatingUsers.Select(a => mapper.Map<UserInfo>(a)).ToList();
+                List<DocumentUserInfo> annotatingUsersDto = new();
+               
+                // Include annotation state
+                foreach (var annotatingUser in annotatingUsers)
+                {
+                    var annotation = databaseContext.Annotations
+                        .Include(a => a.Document)
+                        .Single(a => a.Document == document && a.User == annotatingUser);
+                    var dui = mapper.Map<DocumentUserInfo>(annotatingUser);
+                    dui.State = annotation.State;
+                    annotatingUsersDto.Add(dui);
+                }
 
                 DocumentListInfo dai = mapper.Map<DocumentListInfo>(document);
                 dai.AnnotatingUsers = annotatingUsersDto;

Backend/Models/Documents/DocumentListInfo.cs

@@ -14 +14 @@
     public string Name { get; set; }
     public int Length { get; set; }
     public int RequiredAnnotations { get; set; }
-    public List<UserInfo> AnnotatingUsers { get; set; } = new();
+    public List<DocumentUserInfo> AnnotatingUsers { get; set; } = new();
 }

Backend/Models/Users/DocumentUserInfo.cs

@@ +1 @@
+using Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Users
+{
+    public class DocumentUserInfo
+    {
+        public Guid Id { get; set; }
+        public string Username { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public EState State { get; set; }
+    }
+}