From 5da8b71fe01f1dfbbccb5cf052f2e8f95ac2cf6d Mon Sep 17 00:00:00 2001
From: thermalthrottle <biz.mitko@gmail.com>
Date: Sat, 20 Mar 2021 14:33:21 +0200
Subject: [PATCH] Bug Fixes

---
 .../Business/Business/Sales/ProductController.cs       |  2 ++
 .../UserManagment/Controllers/UserController.cs        |  8 ++++++++
 LuminousSales/Display/Views/BaseView.cs                |  8 ++++----
 LuminousSales/LuminousTests/UnitTest1.cs               | 10 +++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/LuminousSales/Business/Business/Sales/ProductController.cs b/LuminousSales/Business/Business/Sales/ProductController.cs
index 9cd3541..c2e7ed3 100644
--- a/LuminousSales/Business/Business/Sales/ProductController.cs
+++ b/LuminousSales/Business/Business/Sales/ProductController.cs
@@ -308,6 +308,8 @@ namespace Business.Business.Sales
                 throw new ArgumentException("Insufficient Role!");
             }
         }
+
+
         public void AddAmount(int productId ,double Amount)
         {
             if (currentUser.RoleId > 1)
diff --git a/LuminousSales/Business/Business/UserManagment/Controllers/UserController.cs b/LuminousSales/Business/Business/UserManagment/Controllers/UserController.cs
index 9f35f86..39ac8b5 100644
--- a/LuminousSales/Business/Business/UserManagment/Controllers/UserController.cs
+++ b/LuminousSales/Business/Business/UserManagment/Controllers/UserController.cs
@@ -51,6 +51,14 @@ namespace Business.Business.UserManagment
         {
             this.currentUser = currentUser;
             this.context = context;
+            this.rolectrl = new RoleController(currentUser);
+        }
+
+        public UserController(User currentUser, LuminousContext context, RoleController rolectrl)
+        {
+            this.currentUser = currentUser;
+            this.context = context;
+            this.rolectrl = rolectrl;
         }
 
         /// <summary>
diff --git a/LuminousSales/Display/Views/BaseView.cs b/LuminousSales/Display/Views/BaseView.cs
index 9382ce0..201fe2f 100644
--- a/LuminousSales/Display/Views/BaseView.cs
+++ b/LuminousSales/Display/Views/BaseView.cs
@@ -10,10 +10,10 @@ namespace Display.Views
     public class BaseView
     {
         internal ProductController productctrl;
-        DealController dealctrl;
+        private DealController dealctrl;
+        private User currentUser;
         public BaseView(User currentUser)
         {
-            this.productctrl = new ProductController(currentUser);
             this.dealctrl = new DealController(currentUser);
         }
         public virtual void ShowAvaliableCommands()
@@ -89,10 +89,10 @@ namespace Display.Views
         {
             try
             {
+                productctrl = new ProductController(currentUser);
                 Console.Write("Search item: ");
                 string search = Console.ReadLine();
-                ICollection<Product> productsFound = productctrl.GetByApproximateName(search).ToArray();
-                foreach (var item in productsFound)
+                foreach (var item in productctrl.GetByApproximateName(search).ToList())
                 {
                     Console.WriteLine($"{item.Id} {item.Name} {item.Price} {item.AmountInStock}");
                 }
diff --git a/LuminousSales/LuminousTests/UnitTest1.cs b/LuminousSales/LuminousTests/UnitTest1.cs
index 25472e1..e9df259 100644
--- a/LuminousSales/LuminousTests/UnitTest1.cs
+++ b/LuminousSales/LuminousTests/UnitTest1.cs
@@ -44,17 +44,17 @@ namespace LuminousUnitTests
             UserMock.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(testUsers.ElementType);
             UserMock.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(testUsers.GetEnumerator());
 
-            RoleMock.As<IQueryable<User>>().Setup(m => m.Provider).Returns(testUsers.Provider);
-            RoleMock.As<IQueryable<User>>().Setup(m => m.Expression).Returns(testUsers.Expression);
-            RoleMock.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(testUsers.ElementType);
-            RoleMock.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(testUsers.GetEnumerator());
+            RoleMock.As<IQueryable<Role>>().Setup(m => m.Provider).Returns(testRoles.Provider);
+            RoleMock.As<IQueryable<Role>>().Setup(m => m.Expression).Returns(testRoles.Expression);
+            RoleMock.As<IQueryable<Role>>().Setup(m => m.ElementType).Returns(testRoles.ElementType);
+            RoleMock.As<IQueryable<Role>>().Setup(m => m.GetEnumerator()).Returns(testRoles.GetEnumerator());
 
             testContext = new Mock<LuminousContext>();
             testContext.Setup(s => s.User).Returns(UserMock.Object);
             testContext.Setup(s => s.Role).Returns(RoleMock.Object);
 
-            userctrl = new UserController(testUsers.ToList()[0], testContext.Object);
             rolectrl = new RoleController(testContext.Object);
+            userctrl = new UserController(testUsers.ToList()[2], testContext.Object, rolectrl);
         }
 
         [Test]