Documentation & code cleanup

README.md

@@ -1,5 +1,24 @@
 # Student House Dashboard
 
-Work in progress
-
 Project documentation is available in the docs folder
+
+## Default user details
+
+### System administrator
+admin
+admin
+
+### Manager
+manager
+manager
+
+### Tenant
+room1
+room1
+
+room2
+room2
+
+## FHICT Luna server
+
+The web application is hosted on the FHICT Luna server at: https://i509645.luna.fhict.nl/

StudentHouseDashboard/Data/AnnouncementRepository.cs

@@ -1,13 +1,8 @@
-using Models;
+using Logic;
-using Logic;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Logic.Exceptions;
-using System.Reflection;
+using Models;
+using System.Data.SqlClient;
+using System.Text;
 
 namespace Data
 {

StudentHouseDashboard/Data/CommentRepository.cs

@@ -1,8 +1,7 @@
-using System.ComponentModel.Design;
-using System.Data.SqlClient;
-using Models;
 using Logic;
 using Logic.Exceptions;
+using Models;
+using System.Data.SqlClient;
 
 namespace Data;
 

StudentHouseDashboard/Data/ComplaintRepository.cs

@@ -1,12 +1,8 @@
 using Logic;
 using Logic.Exceptions;
 using Models;
-using System;
-using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Data
 {

StudentHouseDashboard/Data/EventRepository.cs

@@ -1,12 +1,7 @@
 using Logic;
 using Logic.Exceptions;
 using Models;
-using System;
-using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Data
 {

StudentHouseDashboard/Data/SqlConnectionHelper.cs

@@ -1,10 +1,5 @@
 using Logic.Exceptions;
-using System;
-using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Data
 {

StudentHouseDashboard/Data/UserRepository.cs

@@ -1,13 +1,6 @@
-using System;
+using Logic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Data.SqlClient;
 using Models;
-using System.Data;
+using System.Data.SqlClient;
-using System.Xml.Linq;
-using Logic;
 
 namespace Data
 {
@@ -115,7 +108,7 @@ namespace Data
             }
         }
 
-        public User GetUserByName(string userName)
+        public User? GetUserByName(string userName)
         {
             using (SqlConnection conn = SqlConnectionHelper.CreateConnection())
             {
@@ -124,9 +117,15 @@ namespace Data
                 cmd.Parameters.AddWithValue("@userName", userName);
                 var reader = cmd.ExecuteReader();
 
+                if (reader.HasRows)
+                {
+                    reader.Read();
                     return new User(Convert.ToInt32(reader["ID"]), reader["Name"].ToString(),
                         reader["Password"].ToString(), (UserRole)reader["Role"]);
                 }
+                else { return null; }
+                
+            }
         }
     }
 }

StudentHouseDashboard/Logic/AnnouncementManager.cs

@@ -1,11 +1,5 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/CommentManager.cs

@@ -1,9 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/ComplaintManager.cs

@@ -1,9 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/EventManager.cs

@@ -1,9 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/Exceptions/DatabaseNetworkException.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Net;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic.Exceptions
 {

StudentHouseDashboard/Logic/Exceptions/DatabaseOperationException.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Logic.Exceptions
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Logic.Exceptions
 {
     public class DatabaseOperationException : ApplicationException
     {

StudentHouseDashboard/Logic/IAnnouncementRepository.cs

@@ -1,10 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/ICommentRepository.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel.Design;
-using System.Data.SqlClient;
 using Models;
 
 namespace Logic;

StudentHouseDashboard/Logic/IComplaintRepository.cs

@@ -1,10 +1,4 @@
-using Logic.Exceptions;
+using Models;
-using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/IEventRepository.cs

@@ -1,9 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {
@@ -17,4 +12,3 @@ namespace Logic
         public void DeleteEvent(int id);
     }
 }
-    

StudentHouseDashboard/Logic/IUserRepository.cs

@@ -1,9 +1,4 @@
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Logic
 {

StudentHouseDashboard/Logic/UserManager.cs

@@ -1,14 +1,4 @@
-using BCrypt.Net;
+using Models;
-using Models;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net.Http;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace Logic
 {

StudentHouseDashboard/Models/Announcement.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Models
 {
     public class Announcement : GenericMessage
     {

StudentHouseDashboard/Models/Comment.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Models
 {
     public class Comment : GenericMessage
     {

StudentHouseDashboard/Models/Complaint.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Models
 {
     public class Complaint : GenericMessage
     {

StudentHouseDashboard/Models/ComplaintSeverity.cs

@@ -1,8 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace Models
 {

StudentHouseDashboard/Models/ComplaintStatus.cs

@@ -1,8 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace Models
 {

StudentHouseDashboard/Models/Event.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Models
 {
     public class Event : GenericMessage
     {

StudentHouseDashboard/Models/GenericMessage.cs

@@ -1,8 +1,4 @@
-using System;
+using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
 
 namespace Models
 {

StudentHouseDashboard/Models/User.cs

@@ -1,9 +1,4 @@
-using System;
+using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
 
 namespace Models
 {
@@ -25,13 +20,17 @@ namespace Models
         {
             get; set;
         }
+
+        [Required]
         [StringLength(255)]
         public string Name
         {
             get; set;
         }
 
+        [Required]
         [DataType(DataType.Password)]
+        [StringLength(int.MaxValue, MinimumLength = 4)]
         public string Password
         {
             get; set;

StudentHouseDashboard/Models/UserRole.cs

@@ -1,9 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
 
 namespace Models
 {

StudentHouseDashboard/Tests/AnnouncementManagerTest.cs

@@ -1,10 +1,5 @@
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Tests.Mocks;
 
 namespace Tests

StudentHouseDashboard/Tests/Mocks/AnnouncementRepositoryFake.cs

@@ -1,13 +1,6 @@
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace Tests.Mocks
 {

StudentHouseDashboard/Tests/Mocks/UserRepositoryFake.cs

@@ -1,10 +1,5 @@
-using Models;
+using Logic;
-using Logic;
+using Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Tests.Mocks
 {

StudentHouseDashboard/Tests/UserManagerTest.cs

@@ -1,4 +1,3 @@
-using BCrypt.Net;
 using Logic;
 using Models;
 using Tests.Mocks;

StudentHouseDashboard/WebApp/Pages/AddComment.cshtml.cs

@@ -1,5 +1,4 @@
 using Logic;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Models;

StudentHouseDashboard/WebApp/Pages/Announcement.cshtml.cs

@@ -1,9 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
-using Models;
+using Microsoft.AspNetCore.Authorization;
-using Data;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs

@@ -1,9 +1,7 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Models;
-using System.Security.Claims;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Complaint.cshtml.cs

@@ -1,9 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
-using Models;
+using Microsoft.AspNetCore.Authorization;
-using Data;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Complaints.cshtml.cs

@@ -1,8 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
-using Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Security.Claims;
 
 namespace WebApp.Pages

StudentHouseDashboard/WebApp/Pages/Error/401.cshtml.cs

@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages.Error

StudentHouseDashboard/WebApp/Pages/Error/Unexpected.cshtml.cs

@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages.Error

StudentHouseDashboard/WebApp/Pages/Event.cshtml.cs

@@ -1,9 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
-using Models;
+using Microsoft.AspNetCore.Authorization;
-using Data;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Events.cshtml.cs

@@ -1,10 +1,6 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Logic;
-using Models;
+using Microsoft.AspNetCore.Authorization;
-using System.Security.Claims;
+using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Dynamic;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Index.cshtml.cs

@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Login.cshtml.cs

@@ -1,11 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using Data;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Logic;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Models;
-using Logic;
 using System.Security.Claims;
-using Data;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Privacy.cshtml.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace WebApp.Pages
 {

StudentHouseDashboard/WebApp/Pages/Register.cshtml.cs

@@ -1,8 +1,8 @@
+using Data;
+using Logic;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Logic;
 using Models;
-using Data;
 
 namespace WebApp.Pages
 {
@@ -16,10 +16,22 @@ namespace WebApp.Pages
         public void OnPost()
         {
             var userManager = new UserManager(new UserRepository());
-            if (userManager.CreateUser(MyUser.Name, BCrypt.Net.BCrypt.HashPassword(MyUser.Password), MyUser.Role) != null)
+            User? result = null;
+            try
+            {
+                result = userManager.CreateUser(MyUser.Name, BCrypt.Net.BCrypt.HashPassword(MyUser.Password), MyUser.Role);
+            }
+            catch (ArgumentException)
+            {
+                ViewData["confirm"] = "An error has occurred. Try a different username.";
+            }
+            finally
+            {
+                if (result != null)
                 {
                     ViewData["confirm"] = $"Successfully registered {MyUser.Name}!";
                 }
             }
         }
     }
+}

StudentHouseDashboard/WebApp/Program.cs

@@ -13,7 +13,8 @@ namespace WebApp
             // Add services to the container.
             builder.Services.AddRazorPages();
 
-            builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => {
+            builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options =>
+            {
                 options.LoginPath = new PathString("/Login");
                 options.AccessDeniedPath = new PathString("/Error/401");
             });

StudentHouseDashboard/WinForms/AnnouncementForm.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/CommentForm.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/ComplaintForm.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/Dashboard.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/EventForm.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

StudentHouseDashboard/WinForms/UserForm.cs

@@ -1,15 +1,6 @@
 using Data;
 using Logic;
 using Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace WinForms
 {

queries.sql

@@ -1,6 +1,7 @@
 USE dbi509645
 GO
 
+-- User roles
 INSERT INTO UserRole ([Role])
 VALUES
 	('TENANT'),
@@ -8,6 +9,7 @@ VALUES
 	('ADMIN')
 GO
 
+-- Default users
 INSERT INTO Users ([Name], [Password], [Role])
 VALUES
 	('admin', 'admin', 2),
@@ -15,6 +17,7 @@ VALUES
 	('room1', 'room1', 0)
 GO
 
+-- Complaint status
 INSERT INTO ComplaintStatus ([Status])
 VALUES
 	('FILED'),
@@ -23,6 +26,7 @@ VALUES
 	('ARCHIVED')
 GO
 
+-- Complaint severity
 INSERT INTO ComplaintSeverity ([Severity])
 VALUES
 	('LOW'),
@@ -30,5 +34,3 @@ VALUES
 	('HIGH'),
 	('URGENT')
 GO
-
-SELECT * FROM Users u JOIN UserRole r ON u.[Role] = r.ID

tables.sql

@@ -15,6 +15,8 @@ CREATE TABLE Users (
 )
 GO
 
+-- Used only in previous versions for a contact form
+-- no longer needed
 CREATE TABLE ContactForm (
 	ID INT PRIMARY KEY IDENTITY NOT NULL,
 	[Name] NVARCHAR(255) NOT NULL,