As Published - fixes WIP

UnivateProperties_API/Context/DataContext.cs

@@ -201,7 +201,7 @@ namespace UnivateProperties_API.Context
 
             while(reader.Read())
             {
-                returnValue = int.Parse(reader[0].ToString());
+                returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
             }
 
             connection.Close();

UnivateProperties_API/Controllers/ProcessFlow/BidController.cs

@@ -53,7 +53,9 @@ namespace UnivateProperties_API.Controllers.ProcessFlow
             {
                 _Repo.InsertNew(item);
                 scope.Complete();
-                return CreatedAtAction(nameof(Get), new { id = item.Id }, item);
+                //return CreatedAtAction(nameof(Get), new { id = item.Id }, item);
+                var bid = _Repo.Get(x => x.Id == item.Id);
+                return new OkObjectResult(bid);
             }
         }
 

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -64,7 +64,7 @@ namespace UnivateProperties_API.Repository.Misc
             Save();
 
             bool saveFiles = false;
-            var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+            var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
             var lastID = item.Id;
             item.Id = lastID;
             if (!string.IsNullOrEmpty(loc))
@@ -81,6 +81,10 @@ namespace UnivateProperties_API.Repository.Misc
                 string path = ImageFormatter.Base64ToImage(image, loc, lastID.ToString());
                 item.Image = path;
             }
+            else
+            {
+                item.Image = image;
+            }
 
             Update(item);
             

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -189,6 +189,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             var week = _dbContext.Weeks.Include("Owner").Where(x => x.Id == item.TimeshareWeekId).FirstOrDefault();
             var property = _dbContext.Properties.Include("Owner").Where(x => x.Id == item.PropertyId).FirstOrDefault();
             BidItem bid = new BidItem();
+            bid.Id = _dbContext.GetMaxID("BidItems") + 1;
 
             foreach (string prop in bid.GetAllProperties())
             {
@@ -235,8 +236,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                             }
                         }
                     }
-                }
-                                    
+                }                
                 _dbContext.Add(bid);
                 Save();
             }
@@ -262,11 +262,11 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                             }
                         }
                     }
-                }
-                
+                }                
                 _dbContext.Add(bid);
                 Save();
             }
+            item.Id = bid.Id;
         }
 
         public void Insert(IEnumerable<BidItem> items)

UnivateProperties_API/Repository/Properties/PropertyImageRepository.cs

@@ -129,7 +129,7 @@ namespace UnivateProperties_API.Repository.Properties
                 var lastID = dBContext.GetMaxID("PropertyImages");
 
                 bool saveFiles = false;
-                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -736,7 +736,7 @@ namespace UnivateProperties_API.Repository.Properties
                 var lastID = dBContext.GetMaxID("PropertyImages");
 
                 bool saveFiles = false;
-                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;
@@ -798,7 +798,7 @@ namespace UnivateProperties_API.Repository.Properties
                 var lastID = dBContext.GetMaxID("PropertyImages");
 
                 bool saveFiles = false;
-                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;

UnivateProperties_API/Startup.cs

@@ -52,7 +52,7 @@ namespace UnivateProperties_API
                 builder.AllowAnyOrigin()
                        .AllowAnyMethod()
                        .AllowAnyHeader();
-            }));
+            }));            
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             services.AddDbContext<DataContext>(o => o.UseNpgsql(Configuration.GetConnectionString("DefaultConnection")));
             MyCommon.TenderUrl = Configuration.GetConnectionString("TenderConnection");