Revize 0f8d6304

Endpoint for annotation instance deletion - untested

Backend/Backend/Controllers/AnnotationController.cs

@@ -102 +102 @@
             }
 
         }
+
+        [HttpDelete("/annotation/{annotationId}/{tagInstanceId}")]
+        [ProducesResponseType((int)HttpStatusCode.OK)]
+        [ProducesResponseType((int)HttpStatusCode.Forbidden)]
+        public ActionResult DeleteAnnotationInstance([FromServices] ClientInfo clientInfo, Guid annotationId, Guid tagInstanceId)
+        {
+            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.DeleteAnnotationInstance(annotationId, tagInstanceId, clientInfo.LoggedUser.Id, clientInfo.LoggedUser.Role);
+                return Ok();
+            }
+            catch (InvalidOperationException e)
+            {
+                throw new BadRequestException("Could not find specified annotation");
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return Forbid();
+            }
+
+        }
     }
 }

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -244 +244 @@
             context.AnnotationTags.Add(annotationTag);
             context.SaveChanges();
         }
+
+        public void DeleteAnnotationInstance(Guid annotationId, Guid tagInstanceId, Guid loggedUserId, ERole userRole)
+        {
+            Annotation annotation = null;
+            try
+            {
+                annotation = context.Annotations
+                   .Where(a => a.Id == annotationId)
+                   .Include(a => a.User)
+                   .Include(a => a.Document).ThenInclude(d => d.Content)
+                   .First();
+
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Could not find annotation");
+            }
+
+
+            if (userRole < ERole.ADMINISTRATOR)
+            {
+                if (annotation.User.Id != loggedUserId)
+                {
+                    throw new UnauthorizedAccessException($"User {loggedUserId} does not have assigned annotation {annotationId}");
+                }
+            }
+
+            if (!context.AnnotationTags.Any(at => at.Id == tagInstanceId))
+            {
+                throw new InvalidOperationException("Could not find tag instance");
+            }
+
+            context.AnnotationTags
+                .Where(at => at.Id == tagInstanceId).ToList()
+                .ForEach(a => context.AnnotationTags.Remove(a));
+            
+            context.SaveChanges();
+        }
     }
 }

Backend/Core/Services/AnnotationService/IAnnotationService.cs

@@ -14 +14 @@
         public AnnotationListResponse GetUserAnnotations(Guid userId);
         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);
 
     }
 }

Backend/Models/Tags/TagInstanceInfo.cs

@@ -8 +8 @@
 {
     public class TagInstanceInfo
     {
+        /** For database */
+        public Guid Id { get; set; }
         public string TagName { get; set; }
         public Guid TagId { get; set; }
         public string TagCategoryName { get; set; }