Revize f2275185

Endpoint for adding Notes to annotations in AnnotationController

Backend/Backend/Controllers/AnnotationController.cs

@@ -153 +153 @@
             // non-existent annotation
             try
             {
-                tagService.AddAnnotationInstance(annotationId, occurenceId, clientInfo.LoggedUser, request);
+                tagService.AddNoteToTagInstance(annotationId, occurenceId, clientInfo.LoggedUser, request);
                 return Ok();
             }
             catch (InvalidOperationException e)
             {
-                throw new BadRequestException("Could not find specified annotation");
+                throw new BadRequestException(e.Message);
             }
             catch (UnauthorizedAccessException)
             {
@@ -166 +166 @@
             }
 
         }
+
+        [HttpPost("/annotation/{annotationId}/note")]
+        [ProducesResponseType((int)HttpStatusCode.OK)]
+        [ProducesResponseType((int)HttpStatusCode.Forbidden)]
+        public ActionResult AddNoteToTagOccurence([FromServices] ClientInfo clientInfo, Guid annotationId, [FromBody] AddNoteToAnnotationRequest request)
+        {
+            if (clientInfo.LoggedUser == null)
+            {
+                logger.Warning("ClientInfo has null LoggerUser in [Authorized] controller /annotations");
+                return Problem();
+            }
+
+            // Take care of - non-admin user requesting not-assigned annotation
+            // non-existent annotation
+            try
+            {
+                annotationService.AddNoteToAnnotation(annotationId, clientInfo.LoggedUser.Id, clientInfo.LoggedUser.Role, request);
+                return Ok();
+            }
+            catch (InvalidOperationException e)
+            {
+                throw new BadRequestException(e.Message);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return Forbid();
+            }
+
+        }
+
     }
 }

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -97 +97 @@
             };
         }
 
+        public void AddNoteToAnnotation(Guid annotationId, Guid userId, ERole userRole, AddNoteToAnnotationRequest request)
+        {
+            Annotation annotation = null;
+            try
+            {
+                annotation = context.Annotations.Include(a => a.User).First(a => a.Id == annotationId);
+            }
+            catch (Exception)
+            {
+                throw new InvalidOperationException("Annotation not found");
+            }
+
+            if (userRole < ERole.ADMINISTRATOR && annotation.User.Id != userId)
+            {
+                throw new UnauthorizedAccessException("User does not have access to this annotation");
+            }
+
+            annotation.Note = request.Note;
+            context.SaveChanges();
+        }
+
+
         public AnnotationInfo GetAnnotation(Guid annotationId, Guid userId, ERole userRole)
         {
             var annotation = context.Annotations
@@ -227 +249 @@
             if (sanitizer.AllowedTags.Contains("script"))
             {
                 sanitizer.AllowedTags.Remove("script");
-            }   
+            }
             if (!sanitizer.AllowedTags.Contains("style"))
             {
                 sanitizer.AllowedTags.Add("style");

Backend/Core/Services/AnnotationService/IAnnotationService.cs

@@ -15 +15 @@
         public AnnotationInfo GetAnnotation(Guid annotationId, Guid userId, ERole userRole);
         public void AddAnnotationInstance(Guid annotationId, Guid userId, ERole userRole, AnnotationInstanceAddRequest request);
         public void DeleteAnnotationInstance(Guid annotationId, Guid tagInstanceId, Guid loggedUserId, ERole userRole);
-
+        public void AddNoteToAnnotation(Guid annotationId, Guid userId, ERole userRole, AddNoteToAnnotationRequest request);
     }
 }

Backend/Core/Services/TagService/ITagService.cs

@@ -22 +22 @@
         public void CreateSubTag(CreateSubTagRequest request);
         public void DeleteSubTag(Guid subtagId);
         public void UpdateSubTag(ModifySubTagRequest request, Guid subtagId);
-        public void AddAnnotationInstance(Guid annotationId, Guid occurrenceId, User user, AddNoteToTagOccurenceRequest request);
+        public void AddNoteToTagInstance(Guid annotationId, Guid occurrenceId, User user, AddNoteToTagOccurenceRequest request);
     }
 }

Backend/Core/Services/TagService/TagServiceEF.cs

@@ -233 +233 @@
             databaseContext.SaveChanges();
         }
 
-        public void AddAnnotationInstance(Guid annotationId, Guid occurrenceId, User user, AddNoteToTagOccurenceRequest request)
+        public void AddNoteToTagInstance(Guid annotationId, Guid occurrenceId, User user, AddNoteToTagOccurenceRequest request)
         {
             Annotation annotation = null;
             try

Backend/Models/Annotations/AddNoteToAnnotationRequest.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Annotations
+{
+    public class AddNoteToAnnotationRequest
+    {
+        public string Note { get; set; }
+    }
+}