Revize 153d77a8

Database access optimizations

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -27 +27 @@
             User addingUser = context.Users.Single(u => u.Id == clientUserId);
 
             // Check the documents exist
-            foreach (Guid docId in request.DocumentIdList)
+            var documents = context.Documents.Where(d => request.DocumentIdList.Contains(d.Id)).ToList();
+            if (documents.Count() != request.DocumentIdList.Count)
             {
-                if (!context.Documents.Any(d => d.Id == docId))
-                {
-                    logger.Information($"Received a non-existent Document ID when assigning documents to users");
-                    throw new InvalidOperationException($"Document with ID {docId} does not exist");
-                }
+                logger.Information($"Received a non-existent Document ID when assigning documents to users");
+                throw new InvalidOperationException($"{request.DocumentIdList.Count - documents.Count()} of the received documents do not exist");
             }
 
-            foreach (Guid userId in request.UserIdList)
+            var users = context.Users.Where(u => request.UserIdList.Contains(u.Id)).ToList(); 
+            foreach (var user in users)
             {
-                var user = context.Users.Single(u => u.Id == userId);
-                var userAnnotatedDocuments = context.Annotations.Where(a => a.User.Id == userId).Select(a => a.Document.Id);
-
-                foreach (Guid docId in request.DocumentIdList)
+                var userAnnotatedDocuments = context.Annotations.Where(a => a.User == user).Select(a => a.Document).ToList();
+                foreach (var doc in documents)
                 {
-                    if (userAnnotatedDocuments.Contains(docId))
+                    if (userAnnotatedDocuments.Contains(doc))
                     {
-                        logger.Information($"User {user.Username} has already been assigned the document {docId}, ignoring");
+                        logger.Information($"User {user.Username} has already been assigned the document {doc.Id}, ignoring");
+                        continue;
                     }
 
-                    var document = context.Documents.Single(d => d.Id == docId);
-
                     context.Annotations.Add(new Annotation()
                     {
                         User = user,
                         UserAssigned = addingUser,
                         DateAssigned = DateTime.Now,
                         DateLastChanged = DateTime.Now,
-                        Document = document,
+                        Document = doc,
                         State = EState.NEW,
                         Note = ""
                     });