Fix save logic for Campaigns

AllReadyApp/Web-App/AllReady/Areas/Admin/Features/Campaigns/EditCampaignCommandHandler.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using AllReady.Areas.Admin.ViewModels.Organization;
@@ -24,7 +24,13 @@ public async Task<int> Handle(EditCampaignCommand message)
                 .Include(l => l.Location)
                 .Include(tc => tc.CampaignContacts)
                 .Include(i => i.CampaignGoals)
-                .SingleOrDefaultAsync(c => c.Id == message.Campaign.Id) ?? new Campaign();
+                .SingleOrDefaultAsync(c => c.Id == message.Campaign.Id);
+
+            if (campaign == null)
+            {
+                campaign = new Campaign();
+                _context.Campaigns.Add(campaign);
+            }
 
             campaign.Name = message.Campaign.Name;
             campaign.Description = message.Campaign.Description;
@@ -45,9 +51,7 @@ public async Task<int> Handle(EditCampaignCommand message)
             campaign.Featured = message.Campaign.Featured;
             campaign.Published = message.Campaign.Published;
             campaign.Headline = message.Campaign.Headline;
-
-            _context.AddOrUpdate(campaign);
-
+
             await _context.SaveChangesAsync();
 
             return campaign.Id;
@@ -99,4 +103,4 @@ private void CreateUpdateOrDeleteCampaignPrimaryContact(Campaign campaign, IPrim
             }
         }
     }
-}
+}

AllReadyApp/Web-App/AllReady/Extensions/ContextExtensions.cs

@@ -5,6 +5,7 @@ namespace AllReady.Extensions
 {
     public static class ContextExtensions
     {
+        //TODO: This shouldn't be necessary and it kind of weird. I supsect this is from an early beta version
         /// <summary>
         /// Handles correctly attaching an object to the context for cases where it may be new or modified.
         /// </summary>

AllReadyApp/Web-App/AllReady/Models/Location.cs

@@ -111,7 +111,7 @@ public static Location UpdateModel(this Location location, LocationEditViewModel
                 }
                 else
                 {
-                    if (location == null || locationEditModel.Id.GetValueOrDefault() != 0)
+                    if (location == null || locationEditModel.Id.GetValueOrDefault() == 0)
                     {
                         location = new Location();
                     }