Revize 8c9ce202

Fixed issues with database OR mapping

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