Revize fc0e5b36

Changed formatting, added comments, database check

Backend/Backend/Program.cs

@@ -18 +18 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
+// Database
 builder.Services.AddDbContext<DatabaseContext>();
 
 var app = builder.Build();
 
+// Enable DateTime in PostgreSQL
 AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 
 
@@ -45 +47 @@
 using (var scope = app.Services.CreateScope())
 {
     var context = scope.ServiceProvider.GetService<DatabaseContext>();
+    if (context == null)
+    {
+        app.Logger.LogCritical("Could not initialize database context, shutting down.");
+        Environment.Exit(101);
+    }
 
     // In development we seed dummy data
     if (app.Environment.IsDevelopment())

Backend/Backend/RestAPI.csproj

@@ -24 +24 @@
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+
 </Project>

Backend/Core/Seeding/Seeder.cs

@@ -16 +16 @@
         {
             if (!context.Documents.Any())
             {
-                DocumentContent content = new DocumentContent() { Content = "Dummy content" };
+                DocumentContent content = new DocumentContent()
+                {
+                    Content = "Dummy content"
+                };
                 context.DocumentContents.Add(content);
 
-                User user = new User() { Username = "testuser", Name = "Test", Surname = "User", Password = "password", Role = ERole.ANNOTATOR };
+                User user = new User()
+                {
+                    Username = "testuser",
+                    Name = "Test",
+                    Surname = "User",
+                    Password = "password",
+                    Role = ERole.ANNOTATOR
+                };
                 context.Users.Add(user);
 
-                Document document = new Document() { Content = content, Name = "Test document", DateAdded = DateTime.Now, Length = 10, RequiredAnnotations = 3, UserAdded = user };
+                Document document = new Document()
+                {
+                    Content = content,
+                    Name = "Test document",
+                    DateAdded = DateTime.Now,
+                    Length = 10,
+                    RequiredAnnotations = 3,
+                    UserAdded = user
+                };
                 context.Documents.Add(document);
                 context.SaveChanges();
 
@@ -38 +56 @@
                 };
                 context.Annotations.Add(annotation);
 
-                Class clss = new Class() { Color = "rgb(...)", Description = "Dummy description", Name = "Dummy class name" };
+                Class clss = new Class()
+                {
+                    Color = "rgb(...)",
+                    Description = "Dummy description",
+                    Name = "Dummy class name"
+                };
                 context.Classes.Add(clss);
 
                 annotation.Classes.Add(clss);
 
-                TagCategory category = new TagCategory() { Name = "Dummy category", Color = "rgb(...)", Description = "Dummy category description" };
+                TagCategory category = new TagCategory()
+                {
+                    Name = "Dummy category",
+                    Color = "rgb(...)",
+                    Description = "Dummy category description"
+                };
                 context.TagCategories.Add(category);
 
-                Tag tag = new Tag() { Name = "Dummy tag", Category = category, Description = "Dummy tag", Color = "rgb(...)" };
+                Tag tag = new Tag()
+                {
+                    Name = "Dummy tag",
+                    Category = category,
+                    Description = "Dummy tag",
+                    Color = "rgb(...)"
+                };
                 context.Tags.Add(tag);
-                SubTag subTag = new SubTag() { Description = "Dummy subtag", Name = "Dummy subtag", Tag = tag };
+                SubTag subTag = new SubTag()
+                {
+                    Description = "Dummy subtag",
+                    Name = "Dummy subtag",
+                    Tag = tag
+                };
                 context.SubTags.Add(subTag);
 
-                AnnotationTag annotationTag = new AnnotationTag() { Annotation = annotation, Instance = 0, Length = 1, Position = 0, Tag = tag, Note = "Dummy note" };
+                AnnotationTag annotationTag = new AnnotationTag()
+                {
+                    Annotation = annotation,
+                    Instance = 0,
+                    Length = 1,
+                    Position = 0,
+                    Tag = tag,
+                    Note = "Dummy note"
+                };
                 context.AnnotationTags.Add(annotationTag);
 
                 context.SaveChanges();
@@ -62 +109 @@
         {
             if (!context.Documents.Any())
             {
-                User admin = new User() { Name = "Admin", Surname = "Admin", Role = ERole.ADMINISTRATOR, Username = "admin", Password = "123a456b789c" };
+                User admin = new User()
+                {
+                    Name = "Admin",
+                    Surname = "Admin",
+                    Role = ERole.ADMINISTRATOR,
+                    Username = "admin",
+                    Password = "123a456b789c"
+                };
                 context.Users.Add(admin);
                 context.SaveChanges();
             }

Backend/Core/Services/UserService/UserServiceEF.cs

@@ -49 +49 @@
                 }
                 return u;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 _logger.Information($"No user with username {username} found.");
                 return null;
@@ -65 +65 @@
                 return null;
             }
 
-            User user = new User() { Username = username, Name = name, Surname = surname, Password = BCrypt.Net.BCrypt.HashPassword(password), Role = role };
+            User user = new User()
+            {
+                Username = username,
+                Name = name,
+                Surname = surname,
+                Password = BCrypt.Net.BCrypt.HashPassword(password),
+                Role = role
+            };
             _databaseContext.Users.Add(user);
             _databaseContext.SaveChanges();
             return user;
@@ -79 +86 @@
                 User user = _databaseContext.Users.First(u => u.Username == username);
                 return user;
             }
-            catch (InvalidOperationException ex)
+            catch (InvalidOperationException)
             {
                 _logger.Warning($"No user with the username {username} found.");
                 return null;
@@ -94 +101 @@
                 User user = _databaseContext.Users.First(u => u.Id == id);
                 return user;
             }
-            catch (InvalidOperationException ex)
+            catch (InvalidOperationException)
             {
                 _logger.Warning($"No user with the GUID {id} found.");
                 return null;