mass refactoring and code cleanup

Author: phytal

HAC.API/Controllers/AttendanceController.cs

@@ -2,24 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/attendance")]
     [ApiController]
-    public class AttendanceController : ControllerBase
-    {
+    public class AttendanceController : ControllerBase {
         private readonly ILogger<AttendanceController> _logger;
 
-        public AttendanceController(ILogger<AttendanceController> logger)
-        {
+        public AttendanceController(ILogger<AttendanceController> logger) {
             _logger = logger;
         }
 
 
         // GET: api/<AttendanceController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);

HAC.API/Controllers/ControllerUtils.cs

@@ -1,73 +1,55 @@
-using System.Net;
+using HAC.API.Data;
 using HAC.API.Data.Objects;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
-    public static class Utils
-    {
-        public static Response GetResponse<T>(HttpContext context, ILogger<T> logger)
-        {
+namespace HAC.API.Controllers {
+    public static class Utils {
+        public static Response GetResponse<T>(HttpContext context, ILogger<T> logger) {
             string hacLink = context.Request.Query["hacLink"];
             string username = context.Request.Query["username"];
             string password = context.Request.Query["password"];
-            
-            if (string.IsNullOrEmpty(hacLink)) 
-                return new Response { Message = "Error 404: Empty hacLink parameter." }; 
-            if (string.IsNullOrEmpty(username)) 
-                return new Response { Message = "Error 404: Empty username parameter." }; 
+
+            if (string.IsNullOrEmpty(hacLink))
+                return new Response {Message = "Error 404: Empty hacLink parameter."};
+            if (string.IsNullOrEmpty(username))
+                return new Response {Message = "Error 404: Empty username parameter."};
             if (string.IsNullOrEmpty(password))
-                return new Response { Message = "Error 404: Empty password parameter." };
-            
+                return new Response {Message = "Error 404: Empty password parameter."};
+
             logger.LogInformation("Received a request.\n" +
-                                   $"Link: {hacLink}\n" +
-                                   $"Username: {username}\n" +
-                                   $"Password: {password}");
-            
-            var hac = new Data.Hac();
-            HttpWebResponse response = hac.Login(hacLink, username, password, out var container);
+                                  $"Link: {hacLink}\n" +
+                                  $"Username: {username}\n" +
+                                  $"Password: {password}");
+
+            var response = Hac.Login(hacLink, username, password);
+            var container = response.Result.CookieContainer;
+            var uri = response.Result.RequestUri;
 
-            if (!hac.IsValidLogin(response)) //checks if login creds are true
+            if (!Hac.IsValidLogin(response.Result.ResponseBody)) //checks if login credentials are true
             {
                 const string errorText = "Either the HAC username or password is incorrect.";
-                return new Response
-                {
+                return new Response {
                     Message = errorText
                 };
             }
 
             var result = new Response();
             var type = logger.GetType().GenericTypeArguments[0];
-            
+
             if (type == typeof(HacController))
-            {
-                result = hac.GetAll(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetAll(container, uri, hacLink);
             else if (type == typeof(StudentController))
-            {
-                result = hac.GetStudentInfo(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetStudentInfo(container, uri, hacLink);
             else if (type == typeof(CourseController))
-            {
-                result = hac.GetCourses(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetCourses(container, uri, hacLink);
             else if (type == typeof(IprController))
-            {
-                result = hac.GetIpr(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetIpr(container, uri, hacLink);
             else if (type == typeof(ReportCardController))
-            {
-                result = hac.GetReportCard(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetReportCard(container, uri, hacLink);
             else if (type == typeof(TranscriptController))
-            {
-                result = hac.GetTranscript(container, response.ResponseUri, hacLink);
-            }
-            else if (type == typeof(AttendanceController))
-            {
-                result = hac.GetAttendance(container, response.ResponseUri, hacLink);
-            }
+                result = Hac.GetTranscript(container, uri, hacLink);
+            else if (type == typeof(AttendanceController)) result = Hac.GetAttendance(container, uri, hacLink);
 
             return result;
         }

HAC.API/Controllers/CourseController.cs

@@ -2,24 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/courses")]
     [ApiController]
-    public class CourseController : ControllerBase
-    {
+    public class CourseController : ControllerBase {
         private readonly ILogger<CourseController> _logger;
 
-        public CourseController(ILogger<CourseController> logger)
-        {
+        public CourseController(ILogger<CourseController> logger) {
             _logger = logger;
         }
 
 
-        // GET: api/<HacController>
+        // GET: api/<CourseController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);

HAC.API/Controllers/HacController.cs

@@ -2,29 +2,25 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/hac")]
     [ApiController]
-    public class HacController : ControllerBase
-    {
+    public class HacController : ControllerBase {
         private readonly ILogger<HacController> _logger;
 
-        public HacController(ILogger<HacController> logger)
-        {
+        public HacController(ILogger<HacController> logger) {
             _logger = logger;
         }
 
 
         // GET: api/<HacController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);
 
             return result;
         }
     }
-}
+}

HAC.API/Controllers/IprController.cs

@@ -2,24 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/ipr")]
     [ApiController]
-    public class IprController : ControllerBase
-    {
+    public class IprController : ControllerBase {
         private readonly ILogger<IprController> _logger;
 
-        public IprController(ILogger<IprController> logger)
-        {
+        public IprController(ILogger<IprController> logger) {
             _logger = logger;
         }
 
 
-        // GET: api/<HacController>
+        // GET: api/<IprController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);

HAC.API/Controllers/ReportCardController.cs

@@ -2,25 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
-
+namespace HAC.API.Controllers {
     [Route("api/reportCard")]
     [ApiController]
-    public class ReportCardController : ControllerBase
-    {
+    public class ReportCardController : ControllerBase {
         private readonly ILogger<ReportCardController> _logger;
 
-        public ReportCardController(ILogger<ReportCardController> logger)
-        {
+        public ReportCardController(ILogger<ReportCardController> logger) {
             _logger = logger;
         }
 
 
-        // GET: api/<HacController>
+        // GET: api/<ReportCardController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);

HAC.API/Controllers/StudentController.cs

@@ -2,24 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/student")]
     [ApiController]
-    public class StudentController : ControllerBase
-    {
+    public class StudentController : ControllerBase {
         private readonly ILogger<StudentController> _logger;
 
-        public StudentController(ILogger<StudentController> logger)
-        {
+        public StudentController(ILogger<StudentController> logger) {
             _logger = logger;
         }
 
 
-        // GET: api/<HacController>
+        // GET: api/<StudentController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);

HAC.API/Controllers/TranscriptController.cs

@@ -2,24 +2,20 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace HAC.API.Controllers
-{
+namespace HAC.API.Controllers {
     [Route("api/transcript")]
     [ApiController]
-    public class TranscriptController : ControllerBase
-    {
+    public class TranscriptController : ControllerBase {
         private readonly ILogger<TranscriptController> _logger;
 
-        public TranscriptController(ILogger<TranscriptController> logger)
-        {
+        public TranscriptController(ILogger<TranscriptController> logger) {
             _logger = logger;
         }
 
 
-        // GET: api/<HacController>
+        // GET: api/<TranscriptController>
         [HttpGet]
-        public Response Get()
-        {
+        public Response Get() {
             // Retrieves the username, password, and hacLink values from the URL Request.
             // Then logs in and fetches the result
             var result = Utils.GetResponse(HttpContext, _logger);