Revize 8c9ce202

Fixed issues with database OR mapping

Backend/Core/Contexts/DatabaseContext.cs

@@ -3 +3 @@
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -36 +37 @@
             optionsBuilder.UseNpgsql(_configuration["ConnectionString"], b => b.MigrationsAssembly("RestAPI"));
             //optionsBuilder.UseNpgsql("Host=localhost:5432;Database=dbo;Username=myuser;Password=password");
         }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+        }
     }
 }

Backend/Core/Entities/Annotation.cs

@@ -39 +39 @@
         public EModified ModifiedType { get; set; } = EModified.NONE;
 
         public ICollection<Class> Classes { get; set; } = new List<Class>();
+
+        public ICollection<FinalAnnotation> FinalAnnotations { get; set; } = new List<FinalAnnotation>();
     }
 }

Backend/Core/Entities/FinalAnnotation.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;

Backend/Core/Entities/FinalAnnotationTag.cs

@@ -8 +8 @@
 {
     public class FinalAnnotationTag : AnnotationTagGeneric
     {
-        // May cause problems?
         public FinalAnnotation Annotation { get; set; }
         public bool IsFinal { get; set; } = false;
-        public List<User> Users { get; set; } = new();
+        public ICollection<User> Users { get; set; } = new List<User>();
     }
 }

Backend/Core/Entities/User.cs

@@ -20 +20 @@
         public string Surname { get; set; }
 
         public ERole Role { get; set; }
+
+        public ICollection<FinalAnnotationTag> FinalAnnotationTags { get; set; } = new List<FinalAnnotationTag>();
     }
 }

Backend/Core/MapperProfiles/TagProfileEF.cs

@@ -23 +23 @@
             CreateMap<AnnotationTag, FinalAnnotationTag>()
                 .ForMember(fat => fat.Id, opt => opt.Ignore())
                 .ForMember(fat => fat.Annotation, opt => opt.Ignore());
+
+            CreateMap<FinalAnnotationTag, TagInstanceInfo>();
         }
     }
 }

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -50 +50 @@
             var users = context.Users.Where(u => request.UserIdList.Contains(u.Id)).ToList();
             foreach (var user in users)
             {
-                var userAnnotatedDocuments = context.Annotations.Where(a => a.User == user).Select(a => a.Document).ToList();
+                var userAnnotatedDocuments = context.Annotations
+                    .Where(a => !(a is FinalAnnotation))
+                    .Where(a => a.User == user)
+                    .Select(a => a.Document)
+                    .ToList();
                 foreach (var doc in documents)
                 {
                     if (userAnnotatedDocuments.Contains(doc))
@@ -78 +82 @@
         public AnnotationListResponse GetUserAnnotations(Guid userId)
         {
             var annotations = context.Annotations
+                .Where(a => !(a is FinalAnnotation))
                 .Where(a => a.User.Id == userId)
                 .Include(a => a.Document)
                 .ToList();
+
             var infos = new List<AnnotationListInfo>();
             foreach (var annotation in annotations)
             {
@@ -133 +139 @@
             if (!isFinal)
             {
                 annotation = context.Annotations
+                .Where(a => !(a is FinalAnnotation))
                 .Where(a => a.Id == annotationId)
                 .Include(a => a.User)
                 .Include(a => a.Document).ThenInclude(d => d.Content)
@@ -158 +165 @@
 
             var documentContent = context.Documents.Where(d => d.Id == annotation.Document.Id).Select(d => d.Content).First();
 
-            var tags = context.AnnotationTags.Where(at => at.Annotation.Id == annotationId)
-                .Include(at => at.Tag)
+            IQueryable<AnnotationTagGeneric> tagsQuery;
+            List<AnnotationTagGeneric> tags;
+            if (!isFinal)
+            {
+                tagsQuery = context.AnnotationTags.Where(at => at.Annotation.Id == annotationId);
+            }
+            else
+            {
+                tagsQuery = context.FinalAnnotationTags.Where(at => at.Annotation.Id == annotationId);
+            }
+
+            tags = tagsQuery.Include(at => at.Tag)
                 .ThenInclude(t => t.Category)
                 .Include(at => at.SubTag)
                 .OrderBy(at => at.Position)
-                .Select(at => at as AnnotationTagGeneric)
+                .Select(at => at)
                 .ToList();
 
             List<TagInstanceInfo> tagInstanceInfos = new();
@@ -259 +276 @@
             if (!isFinal)
             {
                 annotation = context.Annotations
+                    .Where(a => !(a is FinalAnnotation))
                     .Where(a => a.Id == annotationId)
                     .Include(a => a.User)
                     .Include(a => a.Document).ThenInclude(d => d.Content)
@@ -389 +407 @@
                 if (!isFinal)
                 {
                     annotation = context.Annotations
+                    .Where(a => !(a is FinalAnnotation))
                     .Where(a => a.Id == annotationId)
                     .Include(a => a.User)
                     .Include(a => a.Document).ThenInclude(d => d.Content)
@@ -462 +481 @@
                 if (!isFinal)
                 {
                     annotation = context.Annotations
+                    .Where(a => !(a is FinalAnnotation))
                     .Where(a => a.Id == annotationId)
                     .Include(a => a.User)
                     .Include(a => a.Document).ThenInclude(d => d.Content)
@@ -524 +544 @@
                 if (!isFinal)
                 {
                     annotation = context.Annotations
+                    .Where(a => !(a is FinalAnnotation))
                    .Where(a => a.Id == annotationId)
                    .Include(a => a.User)
                    .Include(a => a.Document).ThenInclude(d => d.Content)
@@ -568 +589 @@
             }
 
             var annotations = context.Annotations
+                .Where(a => !(a is FinalAnnotation))
                 .Include(a => a.Document)
                 .Where(a => a.Document == document && a.State == EState.DONE)
                 .ToList();

Backend/Core/Services/DocumentService/DocumentServiceEF.cs

@@ -137 +137 @@
             List<DocumentListInfo> documentInfos = new List<DocumentListInfo>();
             foreach (var document in documents.GetRange(firstIndex, pageSize))
             {
-                var annotatingUsers = databaseContext.Annotations.Where(a => a.Document == document).Select(a => a.User).ToList();
+                var annotatingUsers = databaseContext.Annotations
+                    .Where(a => !(a is FinalAnnotation))
+                    .Where(a => a.Document == document)
+                    .Select(a => a.User).ToList();
+
                 List<DocumentUserInfo> annotatingUsersDto = new();
 
                 // Include annotation state
                 foreach (var annotatingUser in annotatingUsers)
                 {
                     var annotation = databaseContext.Annotations
+                        .Where(a => !(a is FinalAnnotation))
                         .Include(a => a.Document)
-                        .Single(a => a.Document == document && a.User == annotatingUser);
+                        .Single(a => a.Document == document && a.User == annotatingUser && !(a is FinalAnnotation));
                     var dui = mapper.Map<DocumentUserInfo>(annotatingUser);
                     dui.State = annotation.State;
                     annotatingUsersDto.Add(dui);

Backend/Core/Services/TagService/TagServiceEF.cs

@@ -279 +279 @@
             {
                 if (!isFinal)
                 {
-                    annotation = databaseContext.Annotations.Include(a => a.User).First(a => a.Id == annotationId);
+                    annotation = databaseContext.Annotations
+                        .Where(a => !(a is FinalAnnotation))
+                        .Include(a => a.User).First(a => a.Id == annotationId);
                 }
                 else
                 {

Backend/Core/Services/UserService/UserServiceEF.cs

@@ -186 +186 @@
             foreach (var user in users)
             {
                 var userInfo = _mapper.Map<UserInfo>(user);
-                userInfo.AssignedDocumentsCount = _databaseContext.Annotations.Include(a => a.User).Where(a => a.User == user).Count();
+                userInfo.AssignedDocumentsCount = _databaseContext.Annotations
+                    .Include(a => a.User)
+                    .Where(a => !(a is FinalAnnotation))
+                    .Where(a => a.User == user)
+                    .Count();
                 userList.Users.Add(userInfo);
             }
 

Backend/Models/Tags/TagInstanceInfo.cs

@@ -1 +1 @@
 using Models.Enums;
+using Models.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26 +27 @@
 
         public ETagSentiment? Sentiment { get; set; }
         public string SelectedText { get; set; }
+
+        public List<UserInfo>? Users { get; set; }
+        public bool? IsFinal { get; set; }
     }
 }