Revize 8c9ce202

Fixed issues with database OR mapping

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();