Changes made to Property Addresses

UnivateProperties_API/Controllers/Region/CityController.cs

@@ -1,77 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Transactions;
-using UnivateProperties_API.Model.Region;
-using UnivateProperties_API.Repository.Region;
-
-namespace UnivateProperties_API.Controllers.Region
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class CityController : ControllerBase
-    {
-        private readonly ICityRepository _Repo;
-
-        public CityController(ICityRepository repo)
-        {
-            _Repo = repo;
-        }
-
-
-        [HttpGet]
-        public IActionResult Get()
-        {
-            return new OkObjectResult(_Repo.GetAll());
-        }
-
-        [HttpGet("GetByProperty/{id}")]
-        public IActionResult GetByProperty(int id)
-        {
-            return new OkObjectResult(_Repo.GetByProperty(id));
-        }
-
-        [HttpGet("{id}")]
-        public IActionResult Get(int id)
-        {
-            return new OkObjectResult(_Repo.Get(x => x.Id == id));
-        }
-
-        [HttpGet("getby/{value}")]
-        public IActionResult Get(string value)
-        {
-            return new OkObjectResult(_Repo.GetBy(value));
-        }
-
-        [HttpPost]
-        public IActionResult Post([FromBody] City city)
-        {
-            using (var scope = new TransactionScope())
-            {
-                _Repo.Insert(city);
-                scope.Complete();
-                return CreatedAtAction(nameof(Get), new { id = city.Id }, city);
-            }
-        }
-
-        [HttpPut]
-        public IActionResult Put([FromBody] City city)
-        {
-            if (city != null)
-            {
-                using (var scope = new TransactionScope())
-                {
-                    _Repo.Update(city);
-                    scope.Complete();
-                    return new OkResult();
-                }
-            }
-            return new NoContentResult();
-        }
-
-        [HttpDelete("{id}")]
-        public IActionResult Delete(int id)
-        {
-            _Repo.RemoveAtId(id);
-            return new OkResult();
-        }
-    }
-}

UnivateProperties_API/Controllers/Region/SuburbController.cs

@@ -1,82 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Transactions;
-using UnivateProperties_API.Model.Region;
-using UnivateProperties_API.Repository.Region;
-
-namespace UnivateProperties_API.Controllers.Region
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class SuburbController : ControllerBase
-    {
-        private readonly ISuburbRepository _Repo;
-
-        public SuburbController(ISuburbRepository repo)
-        {
-            _Repo = repo;
-        }
-
-        [HttpGet]
-        public IActionResult Get()
-        {
-            return new OkObjectResult(_Repo.GetAll());
-        }
-
-        [HttpGet("GetSearchList")]
-        public IActionResult GetSearchList()
-        {
-            return new OkObjectResult(_Repo.GetSearchList());
-        }
-
-        [HttpGet("GetByProperty/{id}")]
-        public IActionResult GetByProperty(int id)
-        {
-            return new OkObjectResult(_Repo.GetByProperty(id));
-        }
-
-        [HttpGet("{id}")]
-        public IActionResult Get(int id)
-        {
-            return new OkObjectResult(_Repo.Get(x => x.Id == id));
-        }
-
-        [HttpGet("{province}/{city}")]
-        public IActionResult Get(string Province, string City)
-        {
-            return new OkObjectResult(_Repo.GetBy(Province, City));
-        }
-
-        [HttpPost]
-        public IActionResult Post([FromBody] Suburb suburb)
-        {
-            using (var scope = new TransactionScope())
-            {
-                _Repo.Insert(suburb);
-                scope.Complete();
-                return CreatedAtAction(nameof(Get), new { id = suburb.Id }, suburb);
-            }
-        }
-
-        [HttpPut]
-        public IActionResult Put([FromBody] Suburb suburb)
-        {
-            if (suburb != null)
-            {
-                using (var scope = new TransactionScope())
-                {
-                    _Repo.Update(suburb);
-                    scope.Complete();
-                    return new OkResult();
-                }
-            }
-            return new NoContentResult();
-        }
-
-        [HttpDelete("{id}")]
-        public IActionResult Delete(int id)
-        {
-            _Repo.RemoveAtId(id);
-            return new OkResult();
-        }
-    }
-}

UnivateProperties_API/Migrations/20200902101725_Property-Addresses updated.cs

@@ -0,0 +1,118 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class PropertyAddressesupdated : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CityId",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "ProvinceId",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "SuburbId",
+                table: "Properties");
+
+            migrationBuilder.RenameColumn(
+                name: "AddressLine3",
+                table: "Properties",
+                newName: "Suburb");
+
+            migrationBuilder.RenameColumn(
+                name: "AddressLine2",
+                table: "Properties",
+                newName: "StreetNumber");
+
+            migrationBuilder.RenameColumn(
+                name: "AddressLine1",
+                table: "Properties",
+                newName: "StreetName");
+
+            migrationBuilder.AddColumn<string>(
+                name: "AddressOther",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "City",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Country",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PostalCode",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Province",
+                table: "Properties",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AddressOther",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "City",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "Country",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "PostalCode",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "Province",
+                table: "Properties");
+
+            migrationBuilder.RenameColumn(
+                name: "Suburb",
+                table: "Properties",
+                newName: "AddressLine3");
+
+            migrationBuilder.RenameColumn(
+                name: "StreetNumber",
+                table: "Properties",
+                newName: "AddressLine2");
+
+            migrationBuilder.RenameColumn(
+                name: "StreetName",
+                table: "Properties",
+                newName: "AddressLine1");
+
+            migrationBuilder.AddColumn<int>(
+                name: "CityId",
+                table: "Properties",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ProvinceId",
+                table: "Properties",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "SuburbId",
+                table: "Properties",
+                nullable: false,
+                defaultValue: 0);
+        }
+    }
+}

UnivateProperties_API/Migrations/20200903063044_property address url.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class propertyaddressurl : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "AddressURL",
+                table: "Properties",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AddressURL",
+                table: "Properties");
+        }
+    }
+}

UnivateProperties_API/Migrations/20200903075657_property show address.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class propertyshowaddress : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ShowAddress",
+                table: "Properties",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ShowAddress",
+                table: "Properties");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -610,17 +610,17 @@ namespace UnivateProperties_API.Migrations
                         .ValueGeneratedOnAdd()
                         .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
-                    b.Property<string>("AddressLine1");
+                    b.Property<string>("AddressOther");
 
-                    b.Property<string>("AddressLine2");
-
-                    b.Property<string>("AddressLine3");
+                    b.Property<string>("AddressURL");
 
                     b.Property<int?>("AgencyId");
 
                     b.Property<int?>("AgentId");
 
-                    b.Property<int>("CityId");
+                    b.Property<string>("City");
+
+                    b.Property<string>("Country");
 
                     b.Property<DateTime>("Created");
 
@@ -642,6 +642,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int?>("OwnerId");
 
+                    b.Property<string>("PostalCode");
+
                     b.Property<decimal>("Price");
 
                     b.Property<string>("PricePer");
@@ -652,17 +654,23 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int>("PropertyTypeId");
 
-                    b.Property<int>("ProvinceId");
+                    b.Property<string>("Province");
 
                     b.Property<bool>("Published");
 
                     b.Property<string>("ShortDescription");
 
+                    b.Property<bool>("ShowAddress");
+
                     b.Property<DateTime>("StatusDate");
 
                     b.Property<int?>("StatusId");
 
-                    b.Property<int>("SuburbId");
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    b.Property<string>("Suburb");
 
                     b.Property<string>("Unit");
 

UnivateProperties_API/Model/Properties/Property.cs

@@ -23,13 +23,17 @@ namespace UnivateProperties_API.Model.Properties
         public bool IsSale { get; set; }
         public string Description { get; set; }
         public string ShortDescription { get; set; }
-        public string AddressLine1 { get; set; }
-        public string AddressLine2 { get; set; }
-        public string AddressLine3 { get; set; }
-        public string PropertCoords { get; set; }
-        public int SuburbId { get; set; }
-        public int CityId { get; set; }
-        public int ProvinceId { get; set; }
+        public bool ShowAddress { get; set; }
+        public string AddressOther { get; set; } 
+        public string StreetNumber { get; set; }
+        public string StreetName { get; set; }
+        public string Suburb { get; set; }
+        public string City { get; set; }
+        public string Province { get; set; }
+        public string Country { get; set; }
+        public string PostalCode { get; set; }
+        public string PropertCoords { get; set; }  
+        public string AddressURL { get; set; }
         public bool Published { get; set; }
         public DateTime DatePublished { get; set; }
         public string VirtualTour { get; set; }
@@ -58,13 +62,7 @@ namespace UnivateProperties_API.Model.Properties
         public int? AgencyId { get; set; }
         public DateTime DateAvailable { get; set; }
         public DateTime StatusDate { get; set; }        
-        public virtual PropertyType PropertyType { get; set; }    
-        [NotMapped]
-        public Province Province { get; set; }
-        [NotMapped]
-        public City City { get; set; }
-        [NotMapped]
-        public Suburb Suburb { get; set; }
+        public virtual PropertyType PropertyType { get; set; }            
         [NotMapped]
         public Status Status { get; set; }        
         public virtual Individual Owner { get; set; }        

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -160,14 +160,15 @@ namespace UnivateProperties_API.Repository.Misc
                 {
                     var property = dBContext.Properties.Where(p => p.Id == item.PropertyId).FirstOrDefault();
 
-                    if (property != null)
-                    {                        
-                        property.Province = dBContext.Provinces.Where(p => p.Id == property.ProvinceId).FirstOrDefault();
-                        property.City = dBContext.Cities.Where(c => c.Id == property.CityId).FirstOrDefault();
-                        property.Suburb = dBContext.Suburbs.Where(s => s.Id == property.SuburbId).FirstOrDefault();
-                    }
-
-                    carItem.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressLine3);
+                    //Carousel is no longer used. This code was changed on the model
+                    //if (property != null)
+                    //{                        
+                    //    property.Province = dBContext.Provinces.Where(p => p.Id == property.ProvinceId).FirstOrDefault();
+                    //    property.City = dBContext.Cities.Where(c => c.Id == property.CityId).FirstOrDefault();
+                    //    property.Suburb = dBContext.Suburbs.Where(s => s.Id == property.SuburbId).FirstOrDefault();
+                    //}
+
+                    //carItem.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressOther);
                     carItem.IsProperty = true;
                 }
                 if (item.TimeshareId > 0)
@@ -202,13 +203,14 @@ namespace UnivateProperties_API.Repository.Misc
                 if (item.PropertyId > 0)
                 {
                     var property = dBContext.Properties.Where(p => p.Id == item.PropertyId).FirstOrDefault();
-                    if (property != null)
-                    {
-                        property.Province = dBContext.Provinces.Where(p => p.Id == property.ProvinceId).FirstOrDefault();
-                        property.City = dBContext.Cities.Where(c => c.Id == property.CityId).FirstOrDefault();
-                        property.Suburb = dBContext.Suburbs.Where(s => s.Id == property.SuburbId).FirstOrDefault();
-                    }
-                    item.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressLine3);
+                    //
+                    //if (property != null)
+                    //{
+                    //    property.Province = dBContext.Provinces.Where(p => p.Id == property.ProvinceId).FirstOrDefault();
+                    //    property.City = dBContext.Cities.Where(c => c.Id == property.CityId).FirstOrDefault();
+                    //    property.Suburb = dBContext.Suburbs.Where(s => s.Id == property.SuburbId).FirstOrDefault();
+                    //}
+                    //item.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressOther);
                     item.IsProperty = true;
                 }
                 if (item.TimeshareId > 0)

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -53,7 +53,19 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 return GetDetail(property, detailed);
             }
-            return null;
+            else
+            {
+                var prop = new PropertyContainer
+                {
+                    PropertyImages = new List<PropertyImage>(),
+                    PropertyUserFields = new List<PropertyUserField>(),
+                    NewImages = new List<NewImage>(),
+                    PropertyOverviewFields = new List<PropertyFieldGroup>(),
+                    PropertyFields = new List<PropertyFieldGroup>()
+                };
+
+                return prop;
+            }
         }
 
         public List<Property> GetDetailedAll()
@@ -65,10 +77,7 @@ namespace UnivateProperties_API.Repository.Properties
         private PropertyContainer GetDetail(Property property, bool detailed)
         {            
             int propID = property.Id;
-            var propertyType = dBContext.PropertyTypes.Find(property.PropertyTypeId);
-            property.Province = dBContext.Provinces.Find(property.ProvinceId);
-            property.City = dBContext.Cities.Find(property.CityId);
-            property.Suburb = dBContext.Suburbs.Find(property.SuburbId);
+            var propertyType = dBContext.PropertyTypes.Find(property.PropertyTypeId);           
             property.DisplayData = new List<PropertyDetailGroup>();            
 
             if (detailed)
@@ -343,15 +352,12 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 string keyword = search.Keyword.ToLower();
 
-                List<Property> props = (from p in dBContext.Properties
-                                        join pr in dBContext.Provinces on p.ProvinceId equals pr.Id
-                                        join c in dBContext.Cities on p.CityId equals c.Id
-                                        join s in dBContext.Suburbs on p.SuburbId equals s.Id
+                List<Property> props = (from p in dBContext.Properties                                       
                                         join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
                                         where EF.Functions.Like(p.PropertyName.ToLower(), $"%{keyword}%")
-                                        || EF.Functions.Like(pr.Description.ToLower(), $"%{keyword}%")
-                                        || EF.Functions.Like(c.Description.ToLower(), $"%{keyword}%")
-                                        || EF.Functions.Like(s.Description.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(p.Province.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(p.City.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(p.Suburb.ToLower(), $"%{keyword}%")
                                         || EF.Functions.Like(pt.Description.ToLower(), $"%{keyword}%")
                                         select p).ToList();
                 obj.Property = "Keyword";
@@ -410,9 +416,8 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.Province) && search.Province != "undefined" && search.Province.ToUpper() != "ALL")
                 {
-                    props = (from p in props
-                             join pp in dBContext.Provinces on p.ProvinceId equals pp.Id
-                             where pp.Description.ToUpper() == search.Province.ToUpper()
+                    props = (from p in props                            
+                             where p.Province.ToUpper() == search.Province.ToUpper()
                              select p).ToList();
 
                     obj.Property = "Province";
@@ -422,9 +427,8 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.City) && search.City != "undefined" && search.City.ToUpper() != "ALL")
                 {
-                    props = (from p in props
-                             join c in dBContext.Cities on p.CityId equals c.Id
-                             where c.Description.ToUpper() == search.City.ToUpper()
+                    props = (from p in props                             
+                             where p.City.ToUpper() == search.City.ToUpper()
                              select p).ToList();
 
                     obj.Property = "City";
@@ -434,9 +438,8 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.Suburb) && search.Suburb != "undefined" && search.Suburb.ToUpper() != "ALL")
                 {
-                    props = (from p in props
-                             join s in dBContext.Suburbs on p.SuburbId equals s.Id
-                             where s.Description.ToUpper() == search.Suburb.ToUpper()
+                    props = (from p in props                             
+                             where p.Suburb.ToUpper() == search.Suburb.ToUpper()
                              select p).ToList();
 
                     obj.Property = "Suburb";
@@ -501,9 +504,9 @@ namespace UnivateProperties_API.Repository.Properties
             var properties = new List<PropertyDisplay>();
             props = props.Where(p => p.Published).ToList();
             foreach (var item in props)
-            {                
+            {
                 PropertyDisplay display = new PropertyDisplay
-                {          
+                {
                     DateAvailable = item.DateAvailable,
                     Available = item.DateAvailable.Date > DateTime.Now.Date ? string.Format("Available form: {0: dd MMM yyyy}", item.DateAvailable) : "Available Now",
                     Id = item.Id,
@@ -534,15 +537,9 @@ namespace UnivateProperties_API.Repository.Properties
                                where u.PropertyId == item.Id
                                && f.FieldName == "Garages"
                                select u.Value).FirstOrDefault(),
-                    Province = (from p in dBContext.Provinces
-                                where p.Id == item.ProvinceId
-                                select p.Description).FirstOrDefault(),
-                    City = (from c in dBContext.Cities
-                            where c.Id == item.CityId
-                            select c.Description).FirstOrDefault(),
-                    Suburb = (from s in dBContext.Suburbs
-                              where s.Id == item.SuburbId
-                              select s.Description).FirstOrDefault(),
+                    Province = item.Province,
+                    City = item.City,
+                    Suburb = item.Suburb,
                     Price = item.Price,
                     DateCreated = item.Created,
                     PropertyUsageType = (from p in dBContext.PropertyTypes
@@ -614,7 +611,7 @@ namespace UnivateProperties_API.Repository.Properties
                     properties = dBContext.Properties.Where(p => p.OwnerId == individual.Id).ToList();
                 }
                 if (user.Role.ToUpper() == "SUPER ADMIN")
-                    properties = dBContext.Properties.Include("City").Include("Suburb").ToList();
+                    properties = dBContext.Properties.ToList();
             }
 
             return SetPropertyList(properties);
@@ -638,7 +635,7 @@ namespace UnivateProperties_API.Repository.Properties
                     Price = p.Price,
                     Publish = p.Published ? "Yes" : "No",
                     Type = dBContext.PropertyTypes.Find(p.PropertyTypeId)?.Description,
-                    CarouselDescription = string.Format("{0}, {1} <br/>{2}", p.Suburb?.Description, p.City?.Description, p.AddressLine3),
+                    CarouselDescription = string.Format("{0}, {1} <br/>{2}", p.Suburb, p.City, p.AddressOther),
                     DateAvailable = p.IsSale ? DateTime.MinValue : p.DateAvailable,
                     IsPublished = p.Published
                 };
@@ -726,7 +723,8 @@ namespace UnivateProperties_API.Repository.Properties
             if (status != null)
                 property.StatusId = status.Id;
 
-            property.Video = property.Video.Replace("https://www.youtube.com/watch?v=", "");
+            if (!string.IsNullOrEmpty(property.Video))
+                property.Video = property.Video.Replace("https://www.youtube.com/watch?v=", "");
 
             if (images != null)
             {

UnivateProperties_API/Repository/Region/CityRepository.cs

@@ -1,128 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnivateProperties_API.Context;
-using UnivateProperties_API.Model.Region;
-
-namespace UnivateProperties_API.Repository.Region
-{
-    public class CityRepository : ICityRepository
-    {
-        private readonly DataContext dBContext;
-
-        public CityRepository(DataContext _dBContext)
-        {
-            dBContext = _dBContext;
-        }
-
-        public List<City> Get(Func<City, bool> where)
-        {
-            return dBContext.Cities.Where(where).ToList();
-        }        
-
-        public List<City> GetAll()
-        {
-            return dBContext.Cities.ToList();
-        }
-
-        public List<City> GetBy(string province)
-        {
-            var provObj = dBContext.Provinces.Where(p => p.Description == province).First();
-            if (provObj != null)
-                return dBContext.Cities.Where(c => c.ProvinceId == provObj.Id).OrderBy(c => c.Description).ToList();
-            else
-                return null;
-        }
-
-        public City GetDetailed(Func<City, bool> first)
-        {
-            throw new NotImplementedException();
-        }
-
-        public List<City> GetDetailedAll()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Insert(City item)
-        {
-            item.Id = NewId();
-            dBContext.Add(item);
-            Save();
-        }
-
-        public void Insert(IEnumerable<City> items)
-        {
-            int id = NewId();
-            foreach (var item in items)
-            {
-                item.Id = id;
-                dBContext.Add(item);
-                id += 1;
-            }
-            Save();
-        }
-
-        public void Remove(City item)
-        {
-            dBContext.Cities.Remove(item);
-            Save();
-        }
-
-        public void Remove(IEnumerable<City> items)
-        {
-            foreach (var item in items)
-            {
-                dBContext.Cities.Remove(item);
-            }
-            Save();
-        }
-
-        public void RemoveAtId(int item)
-        {
-            var city = Get(x => x.Id == item).FirstOrDefault();
-            if (city != null)
-            {
-                dBContext.Cities.Remove(city);
-                Save();
-            }
-        }
-
-        public void Save()
-        {
-            dBContext.SaveChanges();
-        }
-
-        public void Update(City item)
-        {
-            dBContext.Entry(item).State = EntityState.Modified;
-            Save();
-        }
-
-        public int NewId()
-        {
-            int id = 0;
-            if (dBContext.Cities.Count() > 0)
-            {
-                id = dBContext.Cities.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
-
-        public List<City> GetByProperty(int propertyId)
-        {
-            var prop = dBContext.Properties.Where(p => p.Id == propertyId).FirstOrDefault();
-            if (prop != null)
-            {
-                var Cities = dBContext.Cities.Where(s => s.ProvinceId == prop.ProvinceId).ToList();
-                return Cities;
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}

UnivateProperties_API/Repository/Region/ICityRepository.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using UnivateProperties_API.Model.Region;
-
-namespace UnivateProperties_API.Repository.Region
-{
-    public interface ICityRepository : IRepository<City>
-    {
-        List<City> GetBy(string province);
-        List<City> GetByProperty(int propertyId);
-    }
-}

UnivateProperties_API/Repository/Region/ISuburbRepository.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using UnivateProperties_API.Containers.Regions;
-using UnivateProperties_API.Model.Region;
-
-namespace UnivateProperties_API.Repository.Region
-{
-    public interface ISuburbRepository : IRepository<Suburb>
-    {
-        List<Suburb> GetBy(string province, string city);
-        List<SuburbSearch> GetSearchList();
-        List<Suburb> GetByProperty(int propertyId);
-    }
-}

UnivateProperties_API/Repository/Region/SuburbRepository.cs

@@ -1,161 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnivateProperties_API.Containers.Regions;
-using UnivateProperties_API.Context;
-using UnivateProperties_API.Model.Region;
-
-namespace UnivateProperties_API.Repository.Region
-{
-    public class SuburbRepository : ISuburbRepository
-    {
-        private readonly DataContext dBContext;
-
-        public SuburbRepository(DataContext _dBContext)
-        {
-            dBContext = _dBContext;
-        }
-
-        public List<Suburb> Get(Func<Suburb, bool> where)
-        {
-            return dBContext.Suburbs.Where(where).ToList();
-        }
-
-        public List<Suburb> GetAll()
-        {
-            return dBContext.Suburbs.ToList();
-        }
-
-        public List<Suburb> GetBy(string province, string city)
-        {
-            var provObj = dBContext.Provinces.Where(p => p.Description == province).FirstOrDefault();
-            var cityObj = dBContext.Cities.Where(c => c.ProvinceId == provObj.Id && c.Description == city).FirstOrDefault();
-            if (cityObj != null)
-                return dBContext.Suburbs.Where(s => s.CityId == cityObj.Id).OrderBy(s => s.Description).ToList();
-            else
-                return null;
-        }
-
-        public Suburb GetDetailed(Func<Suburb, bool> first)
-        {
-            throw new NotImplementedException();
-        }
-
-        public List<Suburb> GetDetailedAll()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Insert(Suburb item)
-        {
-            item.Id = NewId();
-            dBContext.Add(item);
-            Save();
-        }
-
-        public void Insert(IEnumerable<Suburb> items)
-        {
-            int id = NewId();
-            foreach (var item in items)
-            {
-                item.Id = id;
-                dBContext.Add(item);
-                id += 1;
-            }
-            Save();
-        }
-
-        public void Remove(Suburb item)
-        {
-            dBContext.Suburbs.Remove(item);
-            Save();
-        }
-
-        public void Remove(IEnumerable<Suburb> items)
-        {
-            foreach (var item in items)
-            {
-                dBContext.Suburbs.Remove(item);
-            }
-            Save();
-        }
-
-        public void RemoveAtId(int item)
-        {
-            var suburb = Get(x => x.Id == item).FirstOrDefault();
-            if (suburb != null)
-            {
-                dBContext.Suburbs.Remove(suburb);
-                Save();
-            }
-        }
-
-        public void Save()
-        {
-            dBContext.SaveChanges();
-        }
-
-        public void Update(Suburb item)
-        {
-            dBContext.Entry(item).State = EntityState.Modified;
-            Save();
-        }
-
-        public int NewId()
-        {
-            int id = 0;
-            if (dBContext.Suburbs.Count() > 0)
-            {
-                id = dBContext.Suburbs.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
-
-        public List<SuburbSearch> GetSearchList()
-        {
-            var suburbs = dBContext.Suburbs.Include("City").Include("City.Province").ToList();
-            List<SuburbSearch> searchList = new List<SuburbSearch>();
-            
-            foreach (var sub in suburbs)
-            {
-                searchList.Add(new SuburbSearch()
-                {                       
-                    Province = sub.City.Province.Description,
-                    City = sub.City.Description,
-                    Suburb = sub.Description,
-                    Display = string.Format("{0} - {1}", sub.Description, sub.City.Description)
-                });
-            }
-
-            var cities = dBContext.Cities.Include("Province").ToList();
-            foreach(var city in cities)
-            {
-                searchList.Add(new SuburbSearch()
-                {                    
-                    Province = city.Province.Description,
-                    City = city.Description,
-                    Suburb = "",
-                    Display = string.Format("{0}", city.Description)
-                });
-            }
-
-            return searchList.OrderBy(s => s.City).ThenBy(s => s.Suburb).ToList();
-        }
-
-        public List<Suburb> GetByProperty(int propertyId)
-        {
-            var prop = dBContext.Properties.Where(p => p.Id == propertyId).FirstOrDefault();
-            if (prop != null)
-            {
-                var Suburbs = dBContext.Suburbs.Where(s => s.CityId == prop.CityId).ToList();
-                return Suburbs;
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}

UnivateProperties_API/Startup.cs

@@ -126,9 +126,7 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<Payment>, PaymentRepository>();            
             #endregion Property
             #region Region
-            services.AddTransient<IRepository<Province>, ProvinceRepository>();
-            services.AddTransient<ICityRepository, CityRepository>();
-            services.AddTransient<ISuburbRepository, SuburbRepository>();
+            services.AddTransient<IRepository<Province>, ProvinceRepository>();            
             #endregion Region
             #region Timeshare
             services.AddTransient<IRepository<Status>, StatusRepository>();