Removed Id Increment code.

UnivateProperties_API/Context/DataContext.cs

@@ -204,23 +204,23 @@ namespace UnivateProperties_API.Context
         }
 
     
-        public int GetMaxID(string tableName)
-        {
-            NpgsqlConnection connection = new NpgsqlConnection(connectionString);
-            connection.Open();
-
-            NpgsqlCommand cmd = connection.CreateCommand();
-            cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
-            NpgsqlDataReader reader = cmd.ExecuteReader();
-            int returnValue = 0; 
-
-            while(reader.Read())
-            {
-                returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
-            }
-
-            connection.Close();
-            return returnValue;
-        }
+        //public int GetMaxID(string tableName)
+        //{
+        //    NpgsqlConnection connection = new NpgsqlConnection(connectionString);
+        //    connection.Open();
+
+        //    NpgsqlCommand cmd = connection.CreateCommand();
+        //    cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
+        //    NpgsqlDataReader reader = cmd.ExecuteReader();
+        //    int returnValue = 0; 
+
+        //    while(reader.Read())
+        //    {
+        //        returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
+        //    }
+
+        //    connection.Close();
+        //    return returnValue;
+        //}
     }
 }

UnivateProperties_API/Repository/Campaigns/CampaignRepository.cs

@@ -248,37 +248,19 @@ namespace UnivateProperties_API.Repository.Campaigns
         }
 
         public void Insert(Campaign item)
-        {
-            item.Id = NewId();
-
-            int last = _dbContext.GetMaxID("CampaignPlaceHolders") + 1;
+        {                        
             if (item.PlaceHolders.Count > 0)
             {
                 foreach (var ph in item.PlaceHolders)
                 {
                     ph.CampaignId = item.Id;
-                    ph.Id = last;
-                    last++;
                 }
-            }
-
-            last = _dbContext.GetMaxID("CampaignItems") + 1;
-            int lastCustom = _dbContext.GetMaxID("CampaignItemPlaceHolders") + 1;
+            }            
             if (item.Items.Count > 0)
             {
                 foreach (var i in item.Items)
                 {
                     i.CampaignId = item.Id;
-                    i.Id = last;
-                    last++;
-                    if (i.CampaignItemPlaceHolder != null)
-                    {
-                        foreach (var c in i.CampaignItemPlaceHolder)
-                        {
-                            c.Id = lastCustom;
-                            lastCustom++;
-                        }
-                    }
                 }
             }
 
@@ -298,8 +280,7 @@ namespace UnivateProperties_API.Repository.Campaigns
         public int InsertFromDTO(CampaignDTO campaign)
         {
             var cam = new Campaign
-            {
-                Id = NewId(),
+            {                
                 Name = campaign.Name,
                 StartDate = campaign.StartDate,
                 EndDate = campaign.EndDate,
@@ -308,18 +289,14 @@ namespace UnivateProperties_API.Repository.Campaigns
                 ItemBody = campaign.ItemBody,
                 ItemsPerRow = campaign.ItemsPerRow
             };
-
-            int lastID = _dbContext.GetMaxID("CampaignPlaceHolders") + 1;
-
+            
             if (campaign.PlaceHolders.Count > 0)
             {
                 cam.PlaceHolders = new List<CampaignPlaceHolder>();
                 foreach (var place in campaign.PlaceHolders)
-                {
-                    lastID++;
+                {                    
                     cam.PlaceHolders.Add(new CampaignPlaceHolder()
-                    {
-                        Id = lastID,
+                    {                        
                         CampaignId = cam.Id,
                         Name = place.Name,
                         BoundTo = place.BoundTo,
@@ -330,16 +307,13 @@ namespace UnivateProperties_API.Repository.Campaigns
             }
 
             if (campaign.Weeks.Count > 0)
-            {                
-                lastID = _dbContext.GetMaxID("CampaignItems") + 1;
+            {                                
                 cam.Items = new List<CampaignItem>();
                 foreach (var week in campaign.Weeks)
-                {
-                    lastID++;
+                {                    
                     cam.Items.Add(new CampaignItem()
                     {
                         CampaignId = cam.Id,
-                        Id = lastID,
                         WeekId = week.WeekId,
                         Image = week.Image
                     });
@@ -347,8 +321,7 @@ namespace UnivateProperties_API.Repository.Campaigns
             }
 
             if (campaign.WeekPlaceHolders.Count > 0)
-            {
-                lastID = _dbContext.GetMaxID("CampaignItemPlaceHolders") + 1;                
+            {                    
                 foreach (var wph in campaign.WeekPlaceHolders)
                 {
                     var week = cam.Items.Where(w => w.WeekId == wph.WeekId).FirstOrDefault();
@@ -373,7 +346,7 @@ namespace UnivateProperties_API.Repository.Campaigns
 
         public int NewId()
         {
-            return _dbContext.GetMaxID("Campaigns") + 1;
+            throw new NotImplementedException();
         }
 
         public void Remove(Campaign item)

UnivateProperties_API/Repository/Communication/TemplateRepository.cs

@@ -43,28 +43,16 @@ namespace UnivateProperties_API.Repository.Communication
         }
 
         public void Insert(Template item)
-        {
-            item.Id = NewId();
-
-            int maxIDPlaceHolder = _dbContext.GetMaxID("PlaceHolders") + 1;
-            foreach (var p in item.PlaceHolders)
-            {
-                p.Id = maxIDPlaceHolder;
-                maxIDPlaceHolder++;
-            }
-
+        {                            
             _dbContext.Add(item);
             Save();
         }
 
         public void Insert(IEnumerable<Template> items)
-        {
-            int id = NewId();
+        {            
             foreach (var item in items)
-            {
-                item.Id = id;
+            {                
                 _dbContext.Add(item);
-                id += 1;
             }
             Save();
         }
@@ -123,12 +111,7 @@ namespace UnivateProperties_API.Repository.Communication
         public void Save()
         {
             _dbContext.SaveChanges();
-        }
-
-        public int NewId()
-        {            
-            return _dbContext.GetMaxID("Templates") + 1;
-        }
+        }        
 
         public List<TemplateDto> GetSimpleAll()
         {
@@ -193,5 +176,10 @@ namespace UnivateProperties_API.Repository.Communication
                 }
             }
         }
+
+        public int NewId()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -58,8 +58,7 @@ namespace UnivateProperties_API.Repository.Misc
         public void Insert(Carousel item)
         {
             string image = item.Image;
-            item.Image = "";
-            item.Id = dBContext.GetMaxID("Carousel") + 1;
+            item.Image = "";            
             dBContext.Add(item);
             Save();
 

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -194,8 +194,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             {
                 if (prop != "Item" && prop != "Display")
                     bid[prop] = item[prop];
-            }
-            bid.Id = _dbContext.GetMaxID("BidItems") + 1;
+            }            
 
             var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
             if (status != null)            

UnivateProperties_API/Repository/Properties/PropertyImageRepository.cs

@@ -125,9 +125,7 @@ namespace UnivateProperties_API.Repository.Properties
         public void Update(NewPropertyImages propertyImages)
         {
             if (propertyImages.Images != null)
-            {
-                var lastID = dBContext.GetMaxID("PropertyImages");
-
+            {                
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
@@ -140,18 +138,19 @@ namespace UnivateProperties_API.Repository.Properties
                     }
                 }
 
+                var lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
+
                 foreach (var image in propertyImages.Images)
-                {
-                    lastID++;
+                {                   
                     var newImage = new PropertyImage
-                    {
-                        Id = lastID,
+                    {                        
                         PropertyId = propertyImages.PropertyId
                     };
                     if (saveFiles)
                     {
                         string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
                         newImage.Image = path;
+                        lastID++;
                     }
                     else
                     {

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -225,18 +225,14 @@ namespace UnivateProperties_API.Repository.Properties
 
             #region Insert New UDFs
 
-            var lastFieldID = dBContext.GetMaxID("PropertyUserFields");
-
             foreach (var propGroup in item.PropertyOverviewFields)
             {
                 foreach (var field in propGroup.Fields)
                 {
                     if (field.ItemId == 0)
-                    {
-                        lastFieldID++;
+                    {                        
                         var propertyField = new PropertyUserField()
-                        {
-                            Id = lastFieldID,
+                        {                            
                             PropertyId = property.Id,
                             UserDefinedFieldId = field.Id,
                             Value = field.Value
@@ -264,11 +260,9 @@ namespace UnivateProperties_API.Repository.Properties
                 foreach (var field in propGroup.Fields)
                 {
                     if (field.ItemId == 0)
-                    {
-                        lastFieldID++;
+                    {                        
                         var propertyField = new PropertyUserField()
-                        {
-                            Id = lastFieldID,
+                        {                            
                             PropertyId = property.Id,
                             UserDefinedFieldId = field.Id,
                             Value = field.Value
@@ -496,8 +490,7 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 Type = item.Type,
                 Search = JsonConvert.SerializeObject(item)
-            };
-            searchLog.Id = dBContext.GetMaxID("SearchLogs") + 1;
+            };            
             dBContext.SearchLogs.Add(searchLog);
             Save();
         }
@@ -727,9 +720,7 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 property.AgencyId = agent.AgencyId;
                 property.AgentId = agent.Id;
-            }
-
-            property.Id = dBContext.GetMaxID("Properties") + 1;
+            }            
 
             if (status != null)
                 property.StatusId = status.Id;
@@ -738,8 +729,6 @@ namespace UnivateProperties_API.Repository.Properties
 
             if (images != null)
             {
-                var lastID = dBContext.GetMaxID("PropertyImages");
-
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
@@ -753,10 +742,9 @@ namespace UnivateProperties_API.Repository.Properties
                 }
 
                 property.PropertyImages = new List<PropertyImage>();
+                var lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
                 foreach (PropertyImage image in images)
                 {
-                    lastID++;
-                    image.Id = lastID;
                     image.PropertyId = property.Id;
                     if (saveFiles)
                     {
@@ -764,17 +752,15 @@ namespace UnivateProperties_API.Repository.Properties
                         image.Image = path;
                     }
                     property.PropertyImages.Add(image);
+                    lastID++;
                 }
             }
 
             if (fields != null)
-            {
-                var lastID = dBContext.GetMaxID("PropertyUserFields");
+            {                
                 property.PropertyUserFields = new List<PropertyUserField>();
                 foreach (PropertyUserField field in fields)
                 {
-                    lastID++;
-                    field.Id = lastID;
                     field.PropertyId = property.Id;
                     property.PropertyUserFields.Add(field);
                 }
@@ -800,7 +786,7 @@ namespace UnivateProperties_API.Repository.Properties
         {
             if (Images != null)
             {
-                var lastID = dBContext.GetMaxID("PropertyImages");
+                var lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
 
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
@@ -815,9 +801,7 @@ namespace UnivateProperties_API.Repository.Properties
                 }
 
                 foreach (PropertyImage image in Images)
-                {
-                    lastID++;
-                    image.Id = lastID;
+                {                                    
                     image.PropertyId = propertyID;
                     if (saveFiles)
                     {
@@ -825,6 +809,7 @@ namespace UnivateProperties_API.Repository.Properties
                         image.Image = path;
                     }
                     dBContext.PropertyImages.Add(image);
+                    lastID++;
                     Save();
                 }
             }