Revize 5a08541d

DocumentService now uses AutoMapper

Backend/Core/Services/DocumentService/DocumentServiceEF.cs

@@ -9 +9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
+using AutoMapper;
+using Models.Users;
 
 namespace Core.Services.DocumentService
 {
@@ -16 +18 @@
     {
         private readonly DatabaseContext databaseContext;
         private readonly ILogger logger;
+        private readonly IMapper mapper;
 
-        public DocumentServiceEF(DatabaseContext databaseContext, ILogger logger)
+        public DocumentServiceEF(DatabaseContext databaseContext, ILogger logger, IMapper mapper)
         {
             this.databaseContext = databaseContext;
             this.logger = logger;
+            this.mapper = mapper;
         }
 
         /// <summary>
@@ -118 +122 @@
             List<DocumentListInfo> documentInfos = new List<DocumentListInfo>();
             foreach (var document in documents.GetRange(firstIndex, request.PageSize))
             {
-                documentInfos.Add(new DocumentListInfo()
-                {
-                    Id = document.Id,
-                    Length = document.Length,
-                    Name = document.Name,
-                    RequiredAnnotations = document.RequiredAnnotations
-                });
+                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();
+
+                DocumentListInfo dai = mapper.Map<DocumentListInfo>(document);
+                dai.AnnotatingUsers = annotatingUsersDto;
+                documentInfos.Add(dai);             
             }
 
             return new DocumentListResponse()