Prop & Bid Search Fix

UnivateProperties_API/Controllers/ProcessFlow/BidController.cs

@@ -33,9 +33,9 @@ namespace UnivateProperties_API.Controllers.ProcessFlow
         }
 
         [HttpGet("GetBids/{name}")]
-        public IActionResult GetOwnerBids(string OwnerName)
+        public IActionResult GetOwnerBids(string name)
         {
-            var items = _Repo.GetAllBid();
+            var items = _Repo.GetAllBidBy(name);
             return new OkObjectResult(items);
         }
 

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -45,10 +45,10 @@ namespace UnivateProperties_API.Controllers.Properties
             return new OkObjectResult(_Repo.GetLatestDisplay());
         }
 
-        [HttpGet("{type}/{by}")]
-        public IActionResult SearchBy(string type, int by)
+        [HttpGet("GetPropertyList/{by}")]
+        public IActionResult SearchBy(int by)
         {
-            return new OkObjectResult(_Repo.GetPropertyList(type, by));
+            return new OkObjectResult(_Repo.GetPropertyList(by));
         }
 
         [HttpGet("MayEditProperty/{id}")]

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -69,6 +69,67 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             return LoadDisplay(bids);
         }
 
+        public List<BidItemDisplay> GetAllBidBy(string name)
+        {
+            /*
+            * Agency - can see all its agents' listings
+            * Agent - only see own listings
+            * Private User - only see own listings
+            * Super Admin - can see all
+            */
+            var user = _dbContext.Users.Where(u => u.Username == name).FirstOrDefault();
+           
+            if (user != null)
+            {                
+                if (user.Role.ToUpper() == "AGENCY" || user.Role.ToUpper() == "AGENT")
+                {
+                    var agent = _dbContext.Agents.Where(a => a.UserId == user.Id).FirstOrDefault();
+                    if (user.Role.ToUpper() == "AGENCY")
+                    {
+                        List<BidItem> bids = _dbContext.BidItems
+                            .Include("Property")
+                            .Include("TimeshareWeek")
+                            .Include("BidMaker")
+                            .Include("Status")
+                            .Where(x => x.TimeshareWeek.AgencyId == agent.AgencyId || x.Property.AgencyId == agent.AgencyId)
+                            .ToList();
+
+                        return LoadDisplay(bids);
+                    }            
+                    else
+                    {
+                        List<BidItem> bids = _dbContext.BidItems
+                            .Include("Property")
+                            .Include("TimeshareWeek")
+                            .Include("BidMaker")
+                            .Include("Status")
+                            .Where(x => x.TimeshareWeek.AgentId == agent.Id || x.Property.AgentId == agent.Id)
+                            .ToList();
+
+                        return LoadDisplay(bids);
+                    }
+                }                
+                if (user.Role.ToUpper() == "PRIVATE USER")
+                {
+                    var individual = _dbContext.Individuals.Where(i => i.UserId == user.Id).FirstOrDefault();
+
+                    List<BidItem> bids = _dbContext.BidItems
+                            .Include("Property")
+                            .Include("TimeshareWeek")
+                            .Include("BidMaker")
+                            .Include("Status")
+                            .Where(x => x.TimeshareWeek.OwnerId == individual.Id || x.Property.OwnerId == individual.Id)
+                            .ToList();
+
+                    return LoadDisplay(bids);
+                }
+                if (user.Role.ToUpper() == "SUPER ADMIN")
+                    return GetAllBid();                                 
+            }
+
+            return null;            
+        }
+
         private List<BidItemDisplay> LoadDisplay(List<BidItem> bids)
         {
             List<BidItemDisplay> list = new List<BidItemDisplay>();
@@ -361,6 +422,6 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             bid.Date = item.Created;
 
             return bid;
-        }
+        }        
     }
 }

UnivateProperties_API/Repository/ProccessFlow/IBidRepository.cs

@@ -10,6 +10,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
     public interface IBidRepository : IRepository<BidItem>
     {
         List<BidItemDisplay> GetAllBid();
+        List<BidItemDisplay> GetAllBidBy(string name);
         List<BidItemDisplay> GetMyBid(Func<BidItem, bool> where);
         BidItemDisplay AcceptBid(int id);
         BidItemDisplay DecineBid(BitItemDecline item);

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -12,7 +12,7 @@ namespace UnivateProperties_API.Repository.Properties
         List<PropertyDisplay> GetDisplay(PropertySearch search);        
         List<PropertyDisplay> GetLatestDisplay();
         List<PropertyType> GetPropertyTypes(Func<PropertyType, bool> where);
-        List<PropertyList> GetPropertyList(string Type, int By);
+        List<PropertyList> GetPropertyList(int By);
         void Insert(PropertyContainer items);
         PropertyContainer GetDetailed(int id, bool detailed);
         void Update(PropertyContainer item);

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -593,30 +593,33 @@ namespace UnivateProperties_API.Repository.Properties
             return GetDisplayDetails(props);
         }
 
-        public List<PropertyList> GetPropertyList(string Type, int By)
+        public List<PropertyList> GetPropertyList(int By)
         {
-            var individual = dBContext.Individuals.Where(x => x.UserId == By).FirstOrDefault();
-            var agent = dBContext.Agents.Where(x => x.UserId == By).FirstOrDefault();
-
             List<Property> properties = new List<Property>();
-            if (Type.ToUpper() == "MY")
-            {                
-                if (individual != null)
-                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
-                if (agent != null)
-                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgentId == agent.Id).ToList();
-            }
-            else if (Type.ToUpper() == "ADMIN")
-            {
-                if (individual != null)
-                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
-                if (agent != null)
-                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgencyId == agent.AgencyId).ToList();
-            }
-            else if (Type.ToUpper() == "SUPERADMIN")
+            var user = dBContext.Users.Where(u => u.Id == By).FirstOrDefault();
+            if (user != null)
             {
-                properties = dBContext.Properties.Include("City").Include("Suburb").ToList();
-            }
+                if (user.Role.ToUpper() == "AGENCY" || user.Role.ToUpper() == "AGENT")
+                {
+                    var agent = dBContext.Agents.Where(a => a.UserId == user.Id).FirstOrDefault();
+                    if (user.Role.ToUpper() == "AGENCY")
+                    {
+                        properties = dBContext.Properties.Where(p => p.AgencyId == agent.AgencyId).ToList();
+                    }
+                    else
+                    {
+                        properties = dBContext.Properties.Where(p => p.AgentId == agent.Id).ToList();
+                    }
+                }
+                if (user.Role.ToUpper() == "PRIVATE USER")
+                {
+                    var individual = dBContext.Individuals.Where(i => i.UserId == user.Id).FirstOrDefault();
+
+                    properties = dBContext.Properties.Where(p => p.OwnerId == individual.Id).ToList();
+                }
+                if (user.Role.ToUpper() == "SUPER ADMIN")
+                    properties = dBContext.Properties.Include("City").Include("Suburb").ToList();
+            }           
             
             List<PropertyList> list = new List<PropertyList>();