Error redirections

KaloyankerR · Dec 17, 2023 · 458444c · 458444c
1 parent a54de1c
commit 458444c
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/FitFusion/FitFusionWeb/Pages/Account.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Account.cshtml.cs
@@ -12,6 +12,7 @@ namespace FitFusionWeb.Pages
 {
     public class AccountModel : PageModel
     {
+        [BindProperty]
         public User CurrentUser { get; set; }
         private UserManager _userManager = new(new DataAcess.UserDAO());
 
@@ -44,11 +45,11 @@ public IActionResult OnGet()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
             catch (NullReferenceException)
             {
-                return RedirectToPage("/CustomPages/NotFound");
+                return RedirectToPage("/Error", new { code = 404 });
             }
 
             return RedirectToPage("/Authentication/Login");

diff --git a/FitFusion/FitFusionWeb/Pages/Authentication/Login.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Authentication/Login.cshtml.cs
@@ -66,7 +66,7 @@ public IActionResult OnPost()
             catch (NullReferenceException)
             {
                 // return RedirectToPage("/CustomPages/NotFound");
-                return RedirectToPage("/Error", new { code = 400 });
+                return RedirectToPage("/Error", new { code = 404 });
             }
             catch (Exception)
             {

diff --git a/FitFusion/FitFusionWeb/Pages/Authentication/Register.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Authentication/Register.cshtml.cs
@@ -43,16 +43,15 @@ public IActionResult OnPost()
             catch (DuplicateNameException)
             {
                 return RedirectToPage("/CustomPages/SomethingWentWrong");
-                // redirect to the correct page
+                // TODO: redirect to the correct page
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/SomethingWentWrong");
-                // redirect to the correct page
+                return RedirectToPage("/Error", new { code = 500 });
             }
-            catch (Exception)
+            catch
             {
-                return RedirectToPage("/CustomPages/SomethingWentWrong");
+                return RedirectToPage("/Error");
             }
 
             return Page();

diff --git a/FitFusion/FitFusionWeb/Pages/Cart.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Cart.cshtml.cs
@@ -71,15 +71,16 @@ public IActionResult OnPost()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
             catch (ArithmeticException)
             {
+                //TODO: Make exception for this
                 return RedirectToPage("/CustomPages/NotEnoughNutriPoints");
             }
 
             SessionHelper.SessionHelper.SetObjectAsJson(HttpContext.Session, "cart", new ShoppingCart());
-
+            // TODO: Make pages for information about the data provided
             return RedirectToPage("/CustomPages/SuccessfulOrder");
         }
 

diff --git a/FitFusion/FitFusionWeb/Pages/Index.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Index.cshtml.cs
@@ -20,9 +20,6 @@ public IndexModel(ILogger<IndexModel> logger)
 
         public void OnGet()
         {
-            OrderManager manager = new(new OrderDAO());
-
-
         }
 
     }

diff --git a/FitFusion/FitFusionWeb/Pages/Products/All.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Products/All.cshtml.cs
@@ -29,7 +29,7 @@ public IActionResult OnGet()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
 
             return Page();
@@ -47,7 +47,7 @@ public IActionResult OnPost()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
 
             return Page();

diff --git a/FitFusion/FitFusionWeb/Pages/Products/Create.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Products/Create.cshtml.cs
@@ -12,7 +12,7 @@ namespace FitFusionWeb.Pages.Products
     public class CreateModel : PageModel
     {
         [BindProperty]
-        public Product Product { get; set; }
+        public Product Product { get; set; } = new();
         private readonly ProductManager _productManager = new(new DataAcess.ProductDAO());
 
         public void OnGet()
@@ -42,12 +42,13 @@ public IActionResult OnPost()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
             catch (DuplicateNameException)
             {
                 TempData["Type"] = "danger";
                 TempData["Message"] = "Something went wrong!";
+                // TODO: write a better message
             }
 
 

diff --git a/FitFusion/FitFusionWeb/Pages/Products/Product.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Products/Product.cshtml.cs
@@ -11,7 +11,7 @@ public class ProductModel : PageModel
         [BindProperty(SupportsGet = true)]
         public int Id { get; set; }
         [BindProperty]
-        public Product Product { get; set; }
+        public Product Product { get; set; } = new();
         private readonly ProductManager _productManager = new ProductManager(new DataAcess.ProductDAO());
 
         public IActionResult OnGet()
@@ -22,15 +22,15 @@ public IActionResult OnGet()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
             catch (NullReferenceException)
             {
-                return RedirectToPage("/CustomPages/NotFound");
+                return RedirectToPage("/Error", new { code = 404 });
             }
             catch
             {
-                return RedirectToPage("/CustomPages/SomethingWentWrong");
+                return RedirectToPage("/Error");
             }
 
             return Page();

diff --git a/FitFusion/FitFusionWeb/Pages/Products/Update.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Products/Update.cshtml.cs
@@ -11,8 +11,8 @@ public class UpdateModel : PageModel
         [BindProperty(SupportsGet = true)]
         public int Id { get; set; }
         [BindProperty]
-        public Product Product { get; set; }
-        private readonly ProductManager _productManager = new ProductManager(new DataAcess.ProductDAO());
+        public Product Product { get; set; } = new();
+        private readonly ProductManager _productManager = new (new DataAcess.ProductDAO());
 
         public IActionResult OnGet()
         {
@@ -22,11 +22,11 @@ public IActionResult OnGet()
             }
             catch (DataAccessException)
             {
-                return RedirectToPage("/CustomPages/DatabaseConnectionError");
+                return RedirectToPage("/Error", new { code = 500 });
             }
             catch (NullReferenceException)
             {
-                return RedirectToPage("/CustomPages/NotFound");
+                return RedirectToPage("/Error", new { code = 404 });
             }
 
             return Page();

diff --git a/FitFusion/FitFusionWeb/SessionHelper/SessionHelper.cs b/FitFusion/FitFusionWeb/SessionHelper/SessionHelper.cs
@@ -14,7 +14,8 @@ public static void SetObjectAsJson(this ISession session, string key, object val
         public static T GetObjectFromJson<T>(this ISession session, string key)
         {
             var value = session.GetString(key);
-            return value == null ? default(T) : JsonConvert.DeserializeObject<T>(value);
+            // TODO: Check the null reference
+            return value == null ? default(T)! : JsonConvert.DeserializeObject<T>(value)!;
         }
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,9 +20,6 @@ public IndexModel(ILogger<IndexModel> logger) @@
             public void OnGet()
             {
-                OrderManager manager = new(new OrderDAO());
             }
         }
@@ Expand Down @@