Remove ID Numbers from Membership & Request Endpoints

.gitattributes

@@ -0,0 +1,14 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=lf
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cs text
+*.json text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

Gordon360/Controllers/AdminsController.cs

@@ -1,6 +1,7 @@
 using Gordon360.Authorization;
 using Gordon360.Models.CCT.Context;
 using Gordon360.Models.CCT;
+using Gordon360.Models.ViewModels;
 using Gordon360.Services;
 using Gordon360.Static.Names;
 using Microsoft.AspNetCore.Mvc;
@@ -13,9 +14,9 @@ public class AdminsController : GordonControllerBase
     {
         private readonly IAdministratorService _adminService;
 
-        public AdminsController(CCTContext context)
+        public AdminsController(IAdministratorService adminService)
         {
-            _adminService = new AdministratorService(context);
+            _adminService = adminService;
         }
 
         /// <summary>
@@ -31,31 +32,12 @@ public AdminsController(CCTContext context)
         [HttpGet]
         [Route("")]
         [StateYourBusiness(operation = Operation.READ_ALL, resource = Resource.ADMIN)]
-        public ActionResult<IEnumerable<ADMIN>> GetAll()
+        public ActionResult<IEnumerable<AdminViewModel?>> GetAll()
         {
             var result = _adminService.GetAll();
             return Ok(result);
         }
 
-        /// <summary>
-        /// Get a specific admin
-        /// </summary>
-        /// <returns>
-        /// The specific admin
-        /// </returns>
-        /// <remarks>
-        /// Server makes call to the database and returns the specific admin
-        /// </remarks>
-        // GET api/<controller>/5
-        [HttpGet]
-        [Route("{id}")]
-        [StateYourBusiness(operation = Operation.READ_ONE, resource = Resource.ADMIN)]
-        public ActionResult<ADMIN> GetByGordonId(string id)
-        {
-            var result = _adminService.Get(id);
-            return Ok(result);
-        }
-
         /// <summary>Create a new admin to be added to database</summary>
         /// <param name="admin">The admin item containing all required and relevant information</param>
         /// <returns></returns>
@@ -64,7 +46,7 @@ public ActionResult<ADMIN> GetByGordonId(string id)
         [HttpPost]
         [Route("", Name = "Admins")]
         [StateYourBusiness(operation = Operation.ADD, resource = Resource.ADMIN)]
-        public ActionResult<ADMIN> Post([FromBody] ADMIN admin)
+        public ActionResult<AdminViewModel> Post([FromBody] AdminViewModel admin)
         {
             var result = _adminService.Add(admin);
 
@@ -77,15 +59,15 @@ public ActionResult<ADMIN> Post([FromBody] ADMIN admin)
         }
 
         /// <summary>Delete an existing admin</summary>
-        /// <param name="id">The identifier for the admin to be deleted</param>
+        /// <param name="username">The username of the user to demote</param>
         /// <remarks>Calls the server to make a call and remove the given admin from the database</remarks>
         // DELETE api/<controller>/5
         [HttpDelete]
-        [Route("{id}")]
+        [Route("{username}")]
         [StateYourBusiness(operation = Operation.DELETE, resource = Resource.ADMIN)]
-        public ActionResult<ADMIN> Delete(int id)
+        public ActionResult<AdminViewModel> Delete(string username)
         {
-            var result = _adminService.Delete(id);
+            var result = _adminService.Delete(username);
 
             if (result == null)
             {

Gordon360/Controllers/EmailsController.cs

@@ -13,11 +13,11 @@ namespace Gordon360.Controllers
     [Route("api/[controller]")]
     public class EmailsController : GordonControllerBase
     {
-        private readonly EmailService _emailService;
+        private readonly IEmailService _emailService;
 
-        public EmailsController(CCTContext context)
+        public EmailsController(CCTContext context, IEmailService emailService)
         {
-            _emailService = new EmailService(context);
+            _emailService = emailService;
         }
 
         [HttpGet]
@@ -54,19 +54,6 @@ public ActionResult SendEmails([FromBody] EmailContentViewModel email)
             return Ok();
         }
 
-        /*
-        [HttpPut]
-        [Route("activity/{id}/leaders/session/{session}")]
-        [StateYourBusiness(operation = Operation.READ_PARTIAL, resource = Resource.EMAILS_BY_LEADERS)]
-        public IHttpActionResult SendEmailsToleaders(string id, string session, [FromBody] EmailContentViewModel email)
-        {
-            var emails = _emailService.GetEmailsForActivityLeaders(id, session);
-            var toAddress = emails.Select(x => x.Email).ToArray();
-            _emailService.SendEmails(toAddress, email.FromAddress, email.Subject, email.Content, email.Password);
-            return Ok();
-        }
-        */
-
         [HttpPut]
         [Route("activity/{id}/session/{session}")]
         [StateYourBusiness(operation = Operation.READ_PARTIAL, resource = Resource.EMAILS_BY_ACTIVITY)]

Gordon360/Controllers/HousingController.cs

@@ -25,7 +25,7 @@ public HousingController(CCTContext context, IProfileService profileService)
             _context = context;
             _housingService = new HousingService(context);
             _accountService = new AccountService(context);
-            _administratorService = new AdministratorService(context);
+            _administratorService = new AdministratorService(context, _accountService);
             _profileService = profileService;
         }
 
@@ -207,19 +207,9 @@ public ActionResult<ApartmentApplicationViewModel> GetApartmentApplication(int a
             //get token data from context, username is the username of current logged in person
             var authenticatedUserUsername = AuthUtils.GetUsername(User);
 
-            string userID = _accountService.GetAccountByUsername(authenticatedUserUsername).GordonID;
-
-            bool isAdmin = false;
-
-            try
-            {
-                ADMIN adminModel = _administratorService.Get(userID);
-                isAdmin = adminModel != null;
-            }
-            catch
-            {
-                isAdmin = _housingService.CheckIfHousingAdmin(userID);
-            }
+            var siteAdmin = _administratorService.GetByUsername(authenticatedUserUsername);
+            var isHousingAdmin = _housingService.CheckIfHousingAdmin(authenticatedUserUsername);
+            bool isAdmin = siteAdmin != null || isHousingAdmin;
 
             ApartmentApplicationViewModel result = _housingService.GetApartmentApplication(applicationID, isAdmin);
             if (result != null)