Fix save logic for Resources and Volunteer tasks

HTBox · Mar 7, 2018 · b9f2daa · b9f2daa
1 parent 6e31213
commit b9f2daa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/...yApp/Web-App/AllReady/Areas/Admin/Features/Resource/CreateOrEditResourceCommandHandler.cs b/...yApp/Web-App/AllReady/Areas/Admin/Features/Resource/CreateOrEditResourceCommandHandler.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AllReady.Extensions;
 using AllReady.Models;
 using MediatR;
@@ -16,14 +16,13 @@ public CreateOrEditResourceCommandHandler(AllReadyContext context)
         }
         public async Task<int> Handle(CreateOrEditResourceCommand message)
         {
-            var resource = await GetResource(message) ?? new AllReady.Models.Resource();
+            var resource = await GetResource(message) ?? _context.Add(new AllReady.Models.Resource()).Entity;
 
             resource.Name = message.Resource.Name;
             resource.Description = message.Resource.Description;
             resource.CampaignId = message.Resource.CampaignId;
             resource.ResourceUrl = message.Resource.ResourceUrl;
 
-            _context.AddOrUpdate(resource);
             await _context.SaveChangesAsync();
 
             return resource.Id;

diff --git a/AllReadyApp/Web-App/AllReady/Areas/Admin/Features/Tasks/EditVolunteerTaskCommandHandler.cs b/AllReadyApp/Web-App/AllReady/Areas/Admin/Features/Tasks/EditVolunteerTaskCommandHandler.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using AllReady.Models;
 using MediatR;
@@ -22,7 +22,7 @@ public EditVolunteerTaskCommandHandler(AllReadyContext context, IAttachmentServi
 
         public async Task<int> Handle(EditVolunteerTaskCommand message)
         {
-            var volunteerTask = await _context.VolunteerTasks.Include(t => t.RequiredSkills).SingleOrDefaultAsync(t => t.Id == message.VolunteerTask.Id) ?? new VolunteerTask();
+            var volunteerTask = await _context.VolunteerTasks.Include(t => t.RequiredSkills).SingleOrDefaultAsync(t => t.Id == message.VolunteerTask.Id) ?? _context.Add(new VolunteerTask()).Entity;
 
             volunteerTask.Name = message.VolunteerTask.Name;
             volunteerTask.Description = message.VolunteerTask.Description;
@@ -47,8 +47,6 @@ public async Task<int> Handle(EditVolunteerTaskCommand message)
                 volunteerTask.RequiredSkills.AddRange(message.VolunteerTask.RequiredSkills.Where(mt => volunteerTask.RequiredSkills.All(ts => ts.SkillId != mt.SkillId)));
             }
 
-            _context.AddOrUpdate(volunteerTask);
-
             // Delete existing attachments
             if (message.VolunteerTask.DeleteAttachments.Count > 0)
             {
@@ -77,4 +75,4 @@ public async Task<int> Handle(EditVolunteerTaskCommand message)
             return volunteerTask.Id;
         }
     }
-}
+}