Revize ceb95b98

Added endpoint to get global required annotations, moved configuration to database

Backend/Backend/Controllers/DocumentController.cs

@@ -127 +127 @@
 
         return Ok();
     }
+
+    [HttpGet("/documents/requiredAnnotations/global")]
+    [Authorize(Models.Enums.ERole.ADMINISTRATOR)]
+    [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(GetRequiredAnnotationsGlobalResponse))]
+    [ProducesResponseType((int)HttpStatusCode.Forbidden)]
+    public ActionResult<GetRequiredAnnotationsGlobalResponse> GetRequiredAnnotationsGlobal([FromServices] ClientInfo clientInfo)
+    {
+        if (clientInfo.LoggedUser == null)
+        {
+            logger.Warning("ClientInfo has null LoggerUser in [Authorized] controller /documents");
+            return Problem();
+        }
+
+        try
+        {
+            return Ok(new GetRequiredAnnotationsGlobalResponse()
+            {
+                RequiredAnnotationsGlobal = documentService.GetRequiredAnnotationsGlobal()
+            });
+
+        }
+        catch (InvalidOperationException e)
+        {
+            throw new BadRequestException(e.Message);
+        }
+        catch (Exception e)
+        {
+            throw new InternalErrorException(e.Message);
+        }
+    }
 }
 

Backend/Core/Constants/Constants.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Core.Constants
+{
+    public class Constants
+    {
+        public static string RequiredAnnotationsKey { get; } = "RequiredAnnotations"; 
+    }
+}

Backend/Core/Contexts/DatabaseContext.cs

@@ -23 +23 @@
         public DbSet<User> Users { get; set; }
         public DbSet<Annotation> Annotations { get; set; }
         public DbSet<Class> Classes { get; set; }
-        //public DbSet<AnnotationClass> AnnotationsClasses { get; set; }
         public DbSet<AnnotationTag> AnnotationTags { get; set; }
         public DbSet<Tag> Tags { get; set; }
         public DbSet<SubTag> SubTags { get; set; }
         public DbSet<TagCategory> TagCategories { get; set; }
+        public DbSet<ConfigurationItem> ConfigurationItems { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {

Backend/Core/Entities/ConfigurationItem.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Core.Entities
+{
+    public class ConfigurationItem : BaseEntity
+    {
+        public string Value { get; set; }
+        public string Key { get; set; }
+    }
+}

Backend/Core/Seeding/Seeder.cs

@@ -21 +21 @@
                 DummyTags.AddDummyTags(context);
                 context.SaveChanges();
 
+                ConfigurationItem configurationItem = new ConfigurationItem()
+                {
+                    Key = Constants.Constants.RequiredAnnotationsKey,
+                    Value = "3"
+                };
+                context.ConfigurationItems.Add(configurationItem);
+
                 AddTagInstance(context);
                 context.SaveChanges();
             }
@@ -126 +133 @@
                     Password = BCrypt.Net.BCrypt.HashPassword("123a456b789c")
                 };
                 context.Users.Add(admin);
+
+                ConfigurationItem configurationItem = new ConfigurationItem()
+                {
+                    Key = Constants.Constants.RequiredAnnotationsKey,
+                    Value = "3"
+                };
+                context.ConfigurationItems.Add(configurationItem);
+
                 context.SaveChanges();
             }
         }

Backend/Core/Services/DocumentService/DocumentServiceEF.cs

@@ -12 +12 @@
 using AutoMapper;
 using Models.Users;
 using Ganss.XSS;
-using Core.StaticConfig;
 
 namespace Core.Services.DocumentService
 {
@@ -41 +40 @@
         public void AddDocuments(DocumentAddRequest request, Guid userId)
         {
             User user = databaseContext.Users.Single(u => u.Id == userId);
-
-            var users = databaseContext.Users.Select(u => u).ToList();
+            int requiredAnnotations = int.Parse(databaseContext.ConfigurationItems.Single(ci => ci.Key == Constants.Constants.RequiredAnnotationsKey).Value);
 
             foreach (var documentInfo in request.Documents)
             {
@@ -50 +48 @@
                 {
                     // TODO hardcoded UTF-8 - maybe do something smarter
                     var documentContent = Encoding.UTF8.GetString(Convert.FromBase64String(documentInfo.Content));
-                    SaveDocument(documentContent, user, documentInfo.Name, users);
+                    SaveDocument(documentContent, user, documentInfo.Name, requiredAnnotations);
                 }
                 else if (documentInfo.Format == Models.Enums.EAddDocumentFormat.ZIP)
                 {
                     var (names, contents) = UnzipDocuments(documentInfo.Content);
                     for (int i = 0; i < names.Count; i++)
                     {
-                        SaveDocument(contents[i], user, names[i], users);
+                        SaveDocument(contents[i], user, names[i], requiredAnnotations);
                     }
                 }
             }
@@ -92 +90 @@
             return (names, contents);
         }
 
-        private void SaveDocument(string content, User userAdded, string documentName, List<User> users)
+        private void SaveDocument(string content, User userAdded, string documentName, int requiredAnnotations)
         {
             DocumentContent documentContent = new DocumentContent()
             {
@@ -106 +104 @@
                 UserAdded = userAdded,
                 Name = documentName,
                 Length = documentContent.Content.Length,
-                RequiredAnnotations = GlobalConfiguration.RequiredAnnotations
+                RequiredAnnotations = requiredAnnotations
             };
 
             databaseContext.DocumentContents.Add(documentContent);
@@ -167 +165 @@
 
         public void SetRequiredAnnotationsGlobal(int requiredAnnotations)
         {
-            GlobalConfiguration.RequiredAnnotations = requiredAnnotations;
+            var requiredAnnotationsItem = databaseContext.ConfigurationItems.Single(ci => ci.Key == Constants.Constants.RequiredAnnotationsKey);
+            requiredAnnotationsItem.Value = requiredAnnotations.ToString();
+            databaseContext.SaveChanges();
         }
 
+        public int GetRequiredAnnotationsGlobal()
+        {
+            var requiredAnnotationsItem = databaseContext.ConfigurationItems.Single(ci => ci.Key == Constants.Constants.RequiredAnnotationsKey);
+            return int.Parse(requiredAnnotationsItem.Value);
+        }
     }
 }

Backend/Core/Services/DocumentService/IDocumentService.cs

@@ -18 +18 @@
         public void SetRequiredAnnotationsForDocuments(SetRequiredAnnotationsRequest request);
 
         public void SetRequiredAnnotationsGlobal(int requiredAnnotations);
+
+        public int GetRequiredAnnotationsGlobal();
     }
 }

Backend/Core/StaticConfig/GlobalConfiguration.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Core.StaticConfig
-{
-    public class GlobalConfiguration
-    {
-        // Default count of required annotations
-        private static Mutex RequiredAnnotationsMutex = new Mutex();
-        private static int requiredAnnotations = 3;
-        public static int RequiredAnnotations
-        {
-            get { return requiredAnnotations; }
-            set
-            {
-                RequiredAnnotationsMutex.WaitOne();
-                requiredAnnotations = value;
-                RequiredAnnotationsMutex.ReleaseMutex();
-            }
-        }     
-    }
-}

Backend/Models/Documents/GetRequiredAnnotationsGlobalResponse.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Documents
+{
+    public class GetRequiredAnnotationsGlobalResponse
+    {
+        public int RequiredAnnotationsGlobal { get; set; }
+    }
+}