Sorting issues form last publish & bug created when property model was changed

UnivateProperties_API/Model/Properties/Property.cs

@@ -56,9 +56,7 @@ namespace UnivateProperties_API.Model.Properties
         [ForeignKey("Agency")]
         public int? AgencyId { get; set; }
         public DateTime DateAvailable { get; set; }
-        public DateTime StatusDate { get; set; }
-
-        [NotMapped]
+        public DateTime StatusDate { get; set; }        
         public virtual PropertyType PropertyType { get; set; }    
         [NotMapped]
         public Province Province { get; set; }

UnivateProperties_API/Program.cs

@@ -18,8 +18,8 @@ namespace UnivateProperties_API
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                //.UseUrls("http://192.168.6.188:5000")
-                .UseUrls("http://training.provision-sa.com:113")
+                //.UseUrls("http://localhost:57260")
+                .UseUrls("http://training.provision-sa.com:82")
                 .UseIISIntegration()
                 .Build();
     }

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -159,7 +159,15 @@ namespace UnivateProperties_API.Repository.Misc
                 };
                 if (item.PropertyId > 0)
                 {
-                    var property = dBContext.Properties.Include("Province").Include("City").Include("Suburb").Where(p => p.Id == item.PropertyId).FirstOrDefault();
+                    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);
                     carItem.IsProperty = true;
                 }
@@ -194,7 +202,13 @@ namespace UnivateProperties_API.Repository.Misc
 
                 if (item.PropertyId > 0)
                 {
-                    var property = dBContext.Properties.Include("Province").Include("City").Include("Suburb").Where(p => p.Id == item.PropertyId).FirstOrDefault();
+                    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);
                     item.IsProperty = true;
                 }

UnivateProperties_API/Startup.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Cors.Internal;
@@ -38,7 +39,7 @@ using UnivateProperties_API.Repository.Users;
 namespace UnivateProperties_API
 {
     public class Startup
-    {
+    {       
         public Startup(IConfiguration configuration)
         {            
             Configuration = configuration;
@@ -47,13 +48,13 @@ namespace UnivateProperties_API
         public IConfiguration Configuration { get; }
 
         public void ConfigureServices(IServiceCollection services)
-        {
+        {            
             services.AddAutoMapper();
             services.AddCors(o => o.AddPolicy("MyPolicy", builder =>
             {
                 builder.AllowAnyOrigin()
                        .AllowAnyMethod()
-                       .AllowAnyHeader();
+                       .AllowAnyHeader();                       
             }));            
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             services.AddDbContext<DataContext>(o => o.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
@@ -98,6 +99,11 @@ namespace UnivateProperties_API
                 };
             });
 
+            services.Configure<IISServerOptions>(options =>
+            {
+                options.AutomaticAuthentication = true;
+            });
+
             #region ProcessFlow
             services.AddTransient<IBidRepository, BidRepository>();
             #endregion
@@ -156,7 +162,7 @@ namespace UnivateProperties_API
             #endregion
             services.Configure<MvcOptions>(options =>
             {
-                options.Filters.Add(new CorsAuthorizationFilterFactory("MyPolicy"));
+                options.Filters.Add(new CorsAuthorizationFilterFactory("MyPolicy"));                
             });
         }
 
@@ -170,7 +176,7 @@ namespace UnivateProperties_API
             app.UseCors(x => x
                 .AllowAnyOrigin()
                 .AllowAnyMethod()
-                .AllowAnyHeader());
+                .AllowAnyHeader());                
             app.UseAuthentication();
             app.UseHttpsRedirection();
             app.UseMvc();
@@ -187,6 +193,6 @@ namespace UnivateProperties_API
                     //context.Database.Migrate();
                 }
             }
-        }
+        }                
     }
 }

UnivateProperties_API/UnivateProperties_API.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="Abp.AutoMapper" Version="4.8.1" />
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Cors" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />

UnivateProperties_API/appsettings.json

@@ -8,8 +8,8 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {    
-    "DefaultConnection": "Data Source=192.168.0.219;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+  "ConnectionStrings": {
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail_test.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
   }
 }