Revize c2a89232

Resolved issues from code review

Backend/Backend/Controllers/AnnotationController.cs

@@ -63 +63 @@
                 var res = annotationService.GetAnnotation(request.AnnotationId, clientInfo.LoggedUser.Id, clientInfo.LoggedUser.Role);
                 return Ok(res);
             }
-            catch (ArgumentException e)
+            catch (InvalidOperationException e)
             {
-                throw new BadRequestException(e.Message);
+                throw new BadRequestException("Could not find specified annotation");
             }
             catch (UnauthorizedAccessException)
             {

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -93 +93 @@
 
         public AnnotationInfo GetAnnotation(Guid annotationId, Guid userId, ERole userRole)
         {
-            var a = context.Annotations.Where(a => a.Id == annotationId).Include(a => a.User).Include(a => a.Document).Include(a => a.Document.Content).ToList();
-            if (a.Count == 0)
-            {
-                throw new ArgumentException($"Annotation {annotationId} does not exist");
-            }
-            Annotation annotation = a.ElementAt(0);
-
+            var annotation = context.Annotations
+                .Where(a => a.Id == annotationId)
+                .Include(a => a.User)
+                .Include(a => a.Document).ThenInclude(d => d.Content)
+                .First();
+            
             if (userRole < ERole.ADMINISTRATOR)
             {
                 if (annotation.User.Id != userId)
@@ -108 +107 @@
                 }
             }
 
-            var documentContent = context.Documents.Where(d => d.Id == annotation.Document.Id).Select(d => d.Content).ToList()[0];
+            var documentContent = context.Documents.Where(d => d.Id == annotation.Document.Id).Select(d => d.Content).First();
 
             // We probably cannot use AutoMapper since we are dealing with too many different entities
             AnnotationInfo annotationInfo = new()
@@ -119 +118 @@
                 Type = IsHtml(documentContent.Content) ? EDocumentType.HTML : EDocumentType.TEXT
             };
 
-            var tags = context.AnnotationTags.Where(at => at.Annotation.Id == annotationId).Include(at => at.Tag).Include(at => at.SubTag).Include(at => at.Tag.Category).ToList();
+            var tags = context.AnnotationTags.Where(at => at.Annotation.Id == annotationId)
+                .Include(at => at.Tag).ThenInclude(t => t.Category)
+                .Include(at => at.SubTag)
+                .ToList();
+
             foreach (var tag in tags)
             {
                 var tagInstance = mapper.Map<TagInstanceInfo>(tag);