New sorting implementation in the users classes

KaloyankerR · Dec 28, 2023 · 82e884d · 82e884d
1 parent c1d87f6
commit 82e884d
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 96 deletions.
diff --git a/FitFusion/Controllers/Sort/ProductSort.cs b/FitFusion/Controllers/Sort/ProductSort.cs
@@ -13,7 +13,7 @@ namespace Services.Sort
     //{
     //}
 
-    public class ProductSorter // : ISort<Product>
+    public class ProductSorter : ISort<Product>
     {
         public List<Product> Sort(List<Product> products, string param)
         {
@@ -33,36 +33,36 @@ public List<Product> Sort(List<Product> products, string param)
         }
     }
 
-    public class SortProductByTitleAscending: ISort<Product>
-    {
-        public List<Product> Sort(List<Product> products)
-        {
-            return products.OrderBy(o => o.Title).ToList();
-        }
-    }
+    //public class SortProductByTitleAscending: ISort<Product>
+    //{
+    //    public List<Product> Sort(List<Product> products)
+    //    {
+    //        return products.OrderBy(o => o.Title).ToList();
+    //    }
+    //}
 
-    public class SortProductByTitleDescending : ISort<Product> 
-    {
-        public List<Product> Sort(List<Product> products)
-        {
-            return products.OrderByDescending(o => o.Title).ToList();
-        }
-    }
+    //public class SortProductByTitleDescending : ISort<Product> 
+    //{
+    //    public List<Product> Sort(List<Product> products)
+    //    {
+    //        return products.OrderByDescending(o => o.Title).ToList();
+    //    }
+    //}
 
-    public class SortProductByPriceDescending : ISort<Product>
-    {
-        public List<Product> Sort(List<Product> products)
-        {
-            return products.OrderByDescending(o => o.Price).ToList();
-        }
-    }
+    //public class SortProductByPriceDescending : ISort<Product>
+    //{
+    //    public List<Product> Sort(List<Product> products)
+    //    {
+    //        return products.OrderByDescending(o => o.Price).ToList();
+    //    }
+    //}
 
-    public class SortProductByPriceAscending : ISort<Product>
-    {
-        public List<Product> Sort(List<Product> products)
-        {
-            return products.OrderBy(o => o.Price).ToList();
-        }
-    }
+    //public class SortProductByPriceAscending : ISort<Product>
+    //{
+    //    public List<Product> Sort(List<Product> products)
+    //    {
+    //        return products.OrderBy(o => o.Price).ToList();
+    //    }
+    //}
 
 }
diff --git a/FitFusion/Controllers/Sort/UserSort.cs b/FitFusion/Controllers/Sort/UserSort.cs
@@ -12,43 +12,65 @@ namespace Services.Sort
     //{
     //}
 
-    public class SortUserByFirstNameAscending : ISort<User> 
+    public class UserSorter : ISort<User>
     {
-        public List<User> Sort(List<User> users)
+        public List<User> Sort(List<User> users, string param)
         {
-            return users.OrderBy(x => x.FirstName).ToList();
+            switch (param)
+            {
+                case "FirstNameAscending":
+                    return users.OrderBy(x => x.FirstName).ToList();
+                case "FirstNameDescending":
+                    return users.OrderByDescending(x => x.FirstName).ToList();
+                case "LastNameAscending":
+                    return users.OrderBy(x => x.LastName).ToList();
+                case "LastNameDescending":
+                    return users.OrderByDescending(x => x.LastName).ToList();
+                case "Role":
+                    return users.OrderBy(x => x.GetUserRole()).ToList();
+                default:
+                    return users;
+            }
         }
     }
 
-    public class SortUserByFirstNameDescending : ISort<User>
-    {
-        public List<User> Sort(List<User> users)
-        {
-            return users.OrderByDescending(x => x.FirstName).ToList();
-        }
-    }
+    //public class SortUserByFirstNameAscending : ISort<User> 
+    //{
+    //    public List<User> Sort(List<User> users)
+    //    {
+    //        return users.OrderBy(x => x.FirstName).ToList();
+    //    }
+    //}
 
-    public class SortUserByLastNameAscending : ISort<User>
-    {
-        public List<User> Sort(List<User> users)
-        {
-            return users.OrderBy(x => x.LastName).ToList();
-        }
-    }
+    //public class SortUserByFirstNameDescending : ISort<User>
+    //{
+    //    public List<User> Sort(List<User> users)
+    //    {
+    //        return users.OrderByDescending(x => x.FirstName).ToList();
+    //    }
+    //}
 
-    public class SortUserByLastNameDescending : ISort<User>
-    {
-        public List<User> Sort(List<User> users)
-        {
-            return users.OrderByDescending(x => x.LastName).ToList();
-        }
-    }
+    //public class SortUserByLastNameAscending : ISort<User>
+    //{
+    //    public List<User> Sort(List<User> users)
+    //    {
+    //        return users.OrderBy(x => x.LastName).ToList();
+    //    }
+    //}
 
-    public class SortUserByRole : ISort<User>
-    {
-        public List<User> Sort(List<User> users)
-        {
-            return users.OrderBy(x => x.GetUserRole()).ToList();
-        }
-    }
+    //public class SortUserByLastNameDescending : ISort<User>
+    //{
+    //    public List<User> Sort(List<User> users)
+    //    {
+    //        return users.OrderByDescending(x => x.LastName).ToList();
+    //    }
+    //}
+
+    //public class SortUserByRole : ISort<User>
+    //{
+    //    public List<User> Sort(List<User> users)
+    //    {
+    //        return users.OrderBy(x => x.GetUserRole()).ToList();
+    //    }
+    //}
 }
diff --git a/FitFusion/Controllers/UserManager.cs b/FitFusion/Controllers/UserManager.cs
@@ -15,13 +15,13 @@ namespace Services
     public class UserManager : IUser
     {
         private readonly IUser dao;
-        private ISort<User> _sort;
+        // private ISort<User> _sort;
+        private UserSorter _sorter;
 
-        public UserManager(IUser userDao, ISort<User> sort)
+        public UserManager(IUser userDao, UserSorter sorter)
         {
             dao = userDao;
-            _sort = sort;
-            // _sort = new SortUserByFirstNameAscending();
+            _sorter = sorter;
         }
 
         public bool CreateUser(UserModel user)
@@ -132,28 +132,33 @@ public List<UserModel> Search(List<UserModel> users, string param)
 
         public List<UserModel> Sort(List<UserModel> users, SortParameter param)
         {
-            switch (param)
-            {
-                case SortParameter.FirstNameAscending:
-                    _sort = new SortUserByFirstNameAscending();
-                    break;
-                case SortParameter.LastNameAscending:
-                    _sort = new SortUserByLastNameAscending();
-                    break;
-                case SortParameter.FirstNameDescending:
-                    _sort = new SortUserByFirstNameDescending();
-                    break;
-                case SortParameter.LastNameDescending:
-                    _sort = new SortUserByLastNameDescending();
-                    break;
-                default:
-                    _sort = new SortUserByFirstNameAscending();
-                    break;
-            }
-
-            return _sort.Sort(users);
+            return _sorter.Sort(users, param.ToString());
         }
 
+        //public List<UserModel> Sort(List<UserModel> users, SortParameter param)
+        //{
+        //    switch (param)
+        //    {
+        //        case SortParameter.FirstNameAscending:
+        //            _sort = new SortUserByFirstNameAscending();
+        //            break;
+        //        case SortParameter.LastNameAscending:
+        //            _sort = new SortUserByLastNameAscending();
+        //            break;
+        //        case SortParameter.FirstNameDescending:
+        //            _sort = new SortUserByFirstNameDescending();
+        //            break;
+        //        case SortParameter.LastNameDescending:
+        //            _sort = new SortUserByLastNameDescending();
+        //            break;
+        //        default:
+        //            _sort = new SortUserByFirstNameAscending();
+        //            break;
+        //    }
+
+        //    return _sort.Sort(users);
+        //}
+
 
         public List<string> EncryptPassword(string password)
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Account.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Account.cshtml.cs
@@ -15,7 +15,7 @@ public class AccountModel : PageModel
     {
         [BindProperty]
         public User? CurrentUser { get; set; }
-        private UserManager _userManager = new(new DataAcess.UserDAO(), new SortUserByFirstNameAscending());
+        private UserManager _userManager = new(new DataAcess.UserDAO(), new UserSorter());
 
         public IActionResult OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Authentication/Login.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Authentication/Login.cshtml.cs
@@ -27,7 +27,7 @@ public class LoginModel : PageModel
         [BindProperty]
         public bool RememberMe { get; set; }
 
-        private readonly UserManager _userManager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _userManager = new(new UserDAO(), new UserSorter());
 
         private readonly ILogger<ErrorModel> _logger;
 

diff --git a/FitFusion/FitFusionWeb/Pages/Authentication/Register.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Authentication/Register.cshtml.cs
@@ -12,7 +12,7 @@ public class RegisterModel : PageModel
     {
         [BindProperty]
         public Customer Customer { get; set; } = new();
-        private readonly UserManager _userManager = new UserManager(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _userManager = new UserManager(new UserDAO(), new UserSorter());
         private readonly ILogger<ErrorModel> _logger;
 
         public RegisterModel(ILogger<ErrorModel> logger)

diff --git a/FitFusion/FitFusionWeb/Pages/Cart.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Cart.cshtml.cs
@@ -21,7 +21,7 @@ namespace FitFusionWeb.Pages
     public class CartModel : PageModel
     {
         public readonly ProductManager _productManager = new(new ProductDAO(), new FilterByCategory(), new ProductSorter());
-        private readonly UserManager _userManager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _userManager = new(new UserDAO(), new UserSorter());
         private readonly OrderManager _orderManager = new(new OrderDAO());
 
         [BindProperty]

diff --git a/FitFusion/FitFusionWeb/Pages/Users/All.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/All.cshtml.cs
@@ -18,7 +18,7 @@ public class AllModel : PageModel
         public SortParameter Sort { get; set; }
 
         public List<User> Users { get; set; } = new List<User>();
-        private readonly UserManager _userManager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _userManager = new(new UserDAO(), new UserSorter());
 
         public IActionResult OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Create/Customer.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Create/Customer.cshtml.cs
@@ -14,7 +14,7 @@ public class CustomerModel : PageModel
     {
         [BindProperty]
         public Customer Customer { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Create/Owner.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Create/Owner.cshtml.cs
@@ -14,7 +14,7 @@ public class OwnerModel : PageModel
     {
         [BindProperty]
         public Owner Owner { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Create/Staff.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Create/Staff.cshtml.cs
@@ -14,7 +14,7 @@ public class StaffModel : PageModel
     {
         [BindProperty]
         public Staff Staff { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Update/Customer.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Update/Customer.cshtml.cs
@@ -16,7 +16,7 @@ public class CustomerModel : PageModel
         public int Id { get; set; }
         [BindProperty]
         public Customer Customer { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Update/Owner.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Update/Owner.cshtml.cs
@@ -16,7 +16,7 @@ public class OwnerModel : PageModel
         public int Id { get; set; }
         [BindProperty]
         public Owner Owner { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/FitFusionWeb/Pages/Users/Update/Staff.cshtml.cs b/FitFusion/FitFusionWeb/Pages/Users/Update/Staff.cshtml.cs
@@ -16,7 +16,7 @@ public class StaffModel : PageModel
         public int Id { get; set; }
         [BindProperty]
         public Staff Staff { get; set; } = new();
-        private readonly UserManager _usermanager = new(new UserDAO(), new SortUserByFirstNameAscending());
+        private readonly UserManager _usermanager = new(new UserDAO(), new UserSorter());
 
         public void OnGet()
         {

diff --git a/FitFusion/Interfaces/Strategy/ISort.cs b/FitFusion/Interfaces/Strategy/ISort.cs
@@ -8,6 +8,6 @@ namespace Interfaces.Strategy
 {
     public interface ISort<T>
     {
-        List<T> Sort(List<T> elements);
+        List<T> Sort(List<T> elements, string param);
     }
 }