Revize 9190add5

Added endpoint for adding notes to tags in AnnotationController

Backend/Backend/Controllers/AnnotationController.cs

@@ -7 +7 @@
 using Serilog;
 using Core.Services.AnnotationService;
 using RestAPI.Exceptions;
+using Models.Tags;
+using Core.Services.TagService;
+
 
 namespace RestAPI.Controllers
 {
@@ -14 +17 @@
     {
         private readonly Serilog.ILogger logger;
         private readonly IAnnotationService annotationService;
+        private readonly ITagService tagService;
 
-        public AnnotationController(Serilog.ILogger logger, IAnnotationService annotationService)
+        public AnnotationController(Serilog.ILogger logger, IAnnotationService annotationService, ITagService tagService)
         {
             this.logger = logger;
             this.annotationService = annotationService;
+            this.tagService = tagService;
         }
 
         [HttpPost("/annotations")]
@@ -131 +136 @@
             }
 
         }
+
+        [HttpPost("/annotation/{annotationId}/tag/{occurenceId}/note")]
+        [ProducesResponseType((int)HttpStatusCode.OK)]
+        [ProducesResponseType((int)HttpStatusCode.Forbidden)]
+        public ActionResult AddNoteToTagOccurence([FromServices] ClientInfo clientInfo, Guid annotationId, Guid occurenceId,
+            [FromBody] AddNoteToTagOccurenceRequest 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
+            {
+                tagService.AddAnnotationInstance(annotationId, occurenceId, clientInfo.LoggedUser, request);
+                return Ok();
+            }
+            catch (InvalidOperationException e)
+            {
+                throw new BadRequestException("Could not find specified annotation");
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return Forbid();
+            }
+
+        }
     }
 }

Backend/Core/Services/TagService/ITagService.cs

@@ -1 @@
-using Models.Tags;
+using Core.Entities;
+using Models.Enums;
+using Models.Tags;
+using Models.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19 +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);
     }
 }

Backend/Core/Services/TagService/TagServiceEF.cs

@@ -1 +1 @@
 using AutoMapper;
 using Core.Contexts;
+using Core.Entities;
+using Models.Enums;
 using Models.Tags;
+using Models.Users;
 using Serilog;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace Core.Services.TagService
 {
@@ -188 +192 @@
             }
 
             SubTagNameUnusedElseThrow(request.Name);
-            
+
             TagExistsElseThrow(request.TagId);
             var tag = databaseContext.Tags.First(t => t.Id == request.TagId);
 
@@ -219 +223 @@
             {
                 SubTagNameUnusedElseThrow(request.Name);
                 subtag.Name = request.Name;
-            }     
+            }
 
             if (request.Description != null)
             {
@@ -229 +233 @@
             databaseContext.SaveChanges();
         }
 
+        public void AddAnnotationInstance(Guid annotationId, Guid occurrenceId, User user, AddNoteToTagOccurenceRequest request)
+        {
+            Annotation annotation = null;
+            try
+            {
+                annotation = databaseContext.Annotations.Include(a => a.User).First(a => a.Id == annotationId);
+            }
+            catch (Exception)
+            {
+                throw new InvalidOperationException("Annotation not found");
+            }
 
+            if (user.Role < ERole.ADMINISTRATOR && annotation.User.Id != user.Id)
+            {
+                throw new UnauthorizedAccessException("User does not have access to this annotation");
+            }
 
+            AnnotationTag occurence = null;
+            try
+            {
+                occurence = databaseContext.AnnotationTags.Include(at => at.Annotation)
+                    .First(at => at.Annotation.Id == annotationId && at.Id == occurrenceId);
+            }
+            catch (Exception)
+            {
+                throw new InvalidOperationException("The annotation does not have a tag with specified id");
+            }
 
+            occurence.Note = request.Note;
+            databaseContext.SaveChanges();
+        }
 
         private void CategoryExistsElseThrow(Guid categoryId)
         {

Backend/Models/Tags/AddNoteToTagOccurenceRequest.cs

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