diff --git a/LuminousSales/Business/Business/MainBusiness.cs b/LuminousSales/Business/Business/MainBusiness.cs deleted file mode 100644 index b245f4a..0000000 --- a/LuminousSales/Business/Business/MainBusiness.cs +++ /dev/null @@ -1,7 +0,0 @@ - -namespace LuminousSales.Business -{ - public class MainBusiness - { - } -} diff --git a/LuminousSales/Business/Business/UserManagment/Controllers/RoleController.cs b/LuminousSales/Business/Business/UserManagment/Controllers/RoleController.cs index 05786e2..1e16cc0 100644 --- a/LuminousSales/Business/Business/UserManagment/Controllers/RoleController.cs +++ b/LuminousSales/Business/Business/UserManagment/Controllers/RoleController.cs @@ -17,9 +17,17 @@ namespace Business.Business.UserManagment.Controllers this.context = new LuminousContext(); this.currentUser = currentUser; } + public void CreateInitialRoles() + { + var Admin = new Role("Admin"); + var Manager = new Role("Manager"); + var Cashier = new Role("Cashier"); + context.Role.AddRange(Admin, Manager, Cashier); + context.SaveChanges(); + } public ICollection GetAll() { - if (currentUser != null || currentUser.RoleId == 3) + if (currentUser.RoleId == 3) { return context.Role.ToList(); } @@ -30,7 +38,7 @@ namespace Business.Business.UserManagment.Controllers } public Role Get(int id) { - if (currentUser != null || currentUser.RoleId == 3) + if (currentUser.RoleId == 3) { return context.Role.Find(id); } @@ -41,7 +49,7 @@ namespace Business.Business.UserManagment.Controllers } public Role Get(string name) { - if (currentUser != null || currentUser.RoleId == 3) + if (currentUser.RoleId == 3) { return context.Role.FirstOrDefault(u => u.Name == name); } @@ -52,7 +60,7 @@ namespace Business.Business.UserManagment.Controllers } public ICollection GetByApproximateName(string name) { - if (currentUser != null || currentUser.RoleId == 3) + if (currentUser.RoleId == 3) { return context.Role.Where(u => u.Name.Contains(name)).ToList(); } diff --git a/LuminousSales/Business/Business/UserManagment/CreateInitialUser.cs b/LuminousSales/Business/Business/UserManagment/CreateInitialUser.cs deleted file mode 100644 index 711856a..0000000 --- a/LuminousSales/Business/Business/UserManagment/CreateInitialUser.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using Models; -using System.Linq; -using Models.Models; -using System.Collections.Generic; - -namespace Business.Business.UserManagment -{ - public class CreateInitialUser - { - private LuminousContext context; - private string Username; - private string Password; - private UserController userctl; - public CreateInitialUser(string Username, string Password) - { - userctl = new UserController(); - this.Username = Username; - this.Password = Password; - } - public void CreateRoles() - { - using (context = new LuminousContext()) - { - var Admin = new Role("Admin"); - var Manager = new Role("Manager"); - var Cashier = new Role("Cashier"); - context.Role.AddRange(Admin, Manager, Cashier); - context.SaveChanges(); - } - } - public void CreateFirstUser() - { - using (context = new LuminousContext()) - { - int roleToAttach = context.Role.FirstOrDefault(r => r.Name == "Admin").Id; - userctl.RegisterItem(this.Username, this.Password, roleToAttach); - } - } - - } -} diff --git a/LuminousSales/Business/Business/UserManagment/UserValidator.cs b/LuminousSales/Business/Business/UserManagment/UserValidator.cs deleted file mode 100644 index c48f5f7..0000000 --- a/LuminousSales/Business/Business/UserManagment/UserValidator.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Models; -using Models.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Business.Business.UserManagment -{ - public class UserValidator - { - private LuminousContext context; - public void CheckIfUserEverCreated() - { - using (context = new LuminousContext()) - { - if (context.User.ToList().Any()) - { - throw new ArgumentException("First user is already created!"); - } - } - } - public void CheckPassword(string Password) - { - using (context = new LuminousContext()) - { - if (context.User.ToList().Exists(user => user.Password == Password)) - { - throw new ArgumentException("Invalid User!"); - } - } - } - } -}