Merge pull request #10 from lukearnould/develop

Fix warnings and merge SQL files
lukearnould · Jul 30, 2024 · 7f85a5d · 7f85a5d
2 parents f8fa6fe + 5307f86
commit 7f85a5d
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 46 deletions.
diff --git a/HospitalManagement.Database/HospitalManagement.Database.sqlproj b/HospitalManagement.Database/HospitalManagement.Database.sqlproj
@@ -126,8 +126,5 @@
   <ItemGroup>
     <Build Include="dbo\Tables\Hospital.sql" />
     <Build Include="Security\HospitalManagementUser.sql" />
-    <Build Include="Security\HospitalManagementUser_1.sql" />
-    <Build Include="Security\RoleMemberships.sql" />
-    <Build Include="Security\Permissions.sql" />
   </ItemGroup>
 </Project>
diff --git a/HospitalManagement.Database/Security/HospitalManagementUser.sql b/HospitalManagement.Database/Security/HospitalManagementUser.sql
@@ -1,2 +1,23 @@
-CREATE USER [HospitalManagementUser] FOR LOGIN [HospitalManagementUser];
+CREATE LOGIN [HospitalManagementUser] WITH PASSWORD = ''
+go
 
+CREATE USER [HospitalManagementUser] FOR LOGIN [HospitalManagementUser];
+go
+
+GRANT VIEW ANY COLUMN ENCRYPTION KEY DEFINITION TO PUBLIC;
+GO
+
+GRANT VIEW ANY COLUMN MASTER KEY DEFINITION TO PUBLIC;
+GO
+
+GRANT CONNECT TO [HospitalManagementUser];
+go
+
+ALTER ROLE [db_accessadmin] ADD MEMBER [HospitalManagementUser];
+GO
+
+ALTER ROLE [db_datareader] ADD MEMBER [HospitalManagementUser];
+go
+
+ALTER ROLE [db_datawriter] ADD MEMBER [HospitalManagementUser];
+go
diff --git a/HospitalManagement.Database/Security/HospitalManagementUser_1.sql b/HospitalManagement.Database/Security/HospitalManagementUser_1.sql
diff --git a/HospitalManagement.Database/Security/Permissions.sql b/HospitalManagement.Database/Security/Permissions.sql
diff --git a/HospitalManagement.Database/Security/RoleMemberships.sql b/HospitalManagement.Database/Security/RoleMemberships.sql
diff --git a/HospitalManagement.Web/Controllers/HomeController.cs b/HospitalManagement.Web/Controllers/HomeController.cs
@@ -6,12 +6,11 @@
 
 namespace HospitalManagement.Web.Controllers
 {
-    public class HomeController(ILogger<HomeController> _logger, Service service) : Controller
+    public class HomeController(Service service) : Controller
     {
         public async Task<IActionResult> Index()
         {
             List<Hospital> hospitals = await service.Get();
-
             return View(hospitals);
         }
 
@@ -54,8 +53,8 @@ public async Task<IActionResult> Save(Hospital hospital)
         public async Task<IActionResult> Delete(int hospitalId)
         {
             await service.Delete(hospitalId);
-
             Toast(ActionType.Delete, "Hospital deleted.");
+
             return RedirectToAction("Index");
         }
 

diff --git a/HospitalManagement.Web/Models/Toast.cs b/HospitalManagement.Web/Models/Toast.cs
@@ -2,7 +2,12 @@
 {
     public record Toast
     {
-        public Toast() { }
+        public Toast()
+        {
+            Message = "";
+            Icon = "";
+            Color = "";
+        }
 
         public Toast(ActionType actionType, string message)
         {

diff --git a/HospitalManagement.Web/wwwroot/js/site.js b/HospitalManagement.Web/wwwroot/js/site.js
diff --git a/HospitalManagement/Models/Hospital.cs b/HospitalManagement/Models/Hospital.cs
@@ -9,28 +9,28 @@ public record Hospital
 
         [StringLength(50)]
         [Required]
-        public string Name { get; set; }
+        public string Name { get; set; } = "";
 
         [StringLength(500)]
         [Required]
-        public string Description { get; set; }
+        public string Description { get; set; } = "";
 
         [Required]
         public string Color { get; set; } = "#000000";
 
         public string PhoneNumber
         {
             get { return _phoneNumber; }
-            set { _phoneNumber = value?.Replace("(", "").Replace(")", "").Replace(" ", "").Replace("-", ""); }
+            set { _phoneNumber = value?.Replace("(", "").Replace(")", "").Replace(" ", "").Replace("-", "") ?? ""; }
         }
 
-        private string _phoneNumber;
+        private string _phoneNumber = "";
 
         [EmailAddress]
         [StringLength(100)]
-        public string EmailAddress { get; set; }
+        public string EmailAddress { get; set; } = "";
 
         [StringLength(100)]
-        public string URL { get; set; }
+        public string URL { get; set; } = "";
     }
 }
diff --git a/HospitalManagement/Repository.cs b/HospitalManagement/Repository.cs
@@ -6,11 +6,6 @@ namespace HospitalManagement
 {
     public class Repository(ICoreConfig config)
     {
-        private HospitalContext DefaultContext()
-        {
-            return new HospitalContext(config.ConnectionString);
-        }
-
         public async Task<List<Hospital>> Get()
         {
             using var db = DefaultContext();
@@ -34,6 +29,7 @@ public async Task Save(Hospital hospital)
             {
                 db.Update(hospital);
             }
+
             await db.SaveChangesAsync();
         }
 
@@ -46,5 +42,10 @@ public async Task Delete(int id)
             db.Remove(hospital);
             await db.SaveChangesAsync();
         }
+
+        private HospitalContext DefaultContext()
+        {
+            return new HospitalContext(config.ConnectionString);
+        }
     }
 }
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 dotnet user-secrets set "Database__Password" "<your password goes here>"
 ```
 
- 4. Update the password set in `HospitalManagement.Database.Security.HospitalManagementUser_1.sql` to match the password you entered above.
+ 4. Update the password set in `HospitalManagement.Database.Security.HospitalManagementUser.sql` to match the password you entered above.
  5. Publish the `HospitalManagement.Database` project to your database.
  6. Run the below command at the root of the `HospitalManagement.Web` project: