Revize 58363b44

Backend checks for duplicate tags and returns bad request

Backend/Backend/Controllers/AnnotationController.cs

@@ -92 +92 @@
                 annotationService.AddAnnotationInstance(annotationId, clientInfo.LoggedUser.Id, clientInfo.LoggedUser.Role, request);
                 return Ok();
             }
-            catch (InvalidOperationException e)
-            {
-                throw new BadRequestException("Could not find specified annotation");
-            }
             catch (UnauthorizedAccessException)
             {
                 return Forbid();
             }
-
+            catch (Exception e)
+            {
+                throw new BadRequestException(e.Message);
+            }
         }
 
         [HttpDelete("/annotation/{annotationId}/{occurenceId}")]
@@ -121 +120 @@
                 annotationService.DeleteAnnotationInstance(annotationId, occurenceId, clientInfo.LoggedUser.Id, clientInfo.LoggedUser.Role);
                 return Ok();
             }
-            catch (InvalidOperationException e)
-            {
-                throw new BadRequestException("Could not find specified annotation");
-            }
             catch (UnauthorizedAccessException)
             {
                 return Forbid();
             }
+            catch (Exception e)
+            {
+                throw new BadRequestException(e.Message);
+            }
 
         }
     }

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -683 +683 @@
 
                         parent.ChildNodes.Clear();
                         foreach (var child in newChildren) { parent.ChildNodes.Add(child); }*/
-                        
+
                         descendantsToEdit = docToEdit.DocumentNode.DescendantsAndSelf().ToList();
                         descendantsCount = descendantsToEdit.Count();
                         break;
@@ -743 +743 @@
             {
                 annotationTag.Tag = context.Tags.Where(t => t.Id == request.Id).Single();
                 annotationTag.SubTag = null;
+
+                // If for the same annotation exists a tag with same position and length and of the same type, ignore
+                if (context.AnnotationTags.Any(at => 
+                at.Position == annotationTag.Position &&
+                at.Length == annotationTag.Length &&
+                at.Annotation == annotation &&
+                at.Tag == annotationTag.Tag))
+                {
+                    throw new InvalidOperationException("Duplicate tag");
+                }
+
             }
             else if (request.Type == ETagType.SUBTAG)
             {
                 var subTag = context.SubTags.Where(st => st.Id == request.Id).Include(st => st.Tag).Single();
                 annotationTag.SubTag = subTag;
                 annotationTag.Tag = subTag.Tag;
+
+                if (context.AnnotationTags.Any(at => 
+                at.Position == annotationTag.Position &&
+                at.Length == annotationTag.Length &&
+                at.Annotation == annotation &&
+                at.Tag == annotationTag.Tag &&
+                at.SubTag == annotationTag.SubTag))
+                {
+                    throw new InvalidOperationException("Duplicate tag");
+                }
             }
             else
             {