Cwdoe 614 add actions and roles on dashboard (#17)

* added version endpoint * added action and role editing Co-authored-by: sei-tspencer <trspencer@sei.cmu.edu>
cmu-sei · May 9, 2023 · ee77723 · ee77723
1 parent 5d9bb32
commit ee77723
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Cite.Api/Infrastructure/Mappings/ActionProfile.cs b/Cite.Api/Infrastructure/Mappings/ActionProfile.cs
@@ -10,9 +10,11 @@ public class ActionProfile : AutoMapper.Profile
     {
         public ActionProfile()
         {
-            CreateMap<ActionEntity, Action>();
+            CreateMap<ActionEntity, Action>()
+                .ForMember(a => a.Team, opt => opt.ExplicitExpansion());
 
-            CreateMap<Action, ActionEntity>();
+            CreateMap<Action, ActionEntity>()
+                .ForMember(e => e.Team, opt => opt.Ignore());
 
             CreateMap<ActionEntity, ActionEntity>()
                 .ForMember(e => e.Id, opt => opt.Ignore());

diff --git a/Cite.Api/Services/ActionService.cs b/Cite.Api/Services/ActionService.cs
@@ -156,22 +156,18 @@ public async Task<ViewModels.Action> UpdateAsync(Guid id, ViewModels.Action acti
                 throw new ForbiddenException();
 
             var actionToUpdate = await _context.Actions.SingleOrDefaultAsync(v => v.Id == id, ct);
-
             if (actionToUpdate == null)
                 throw new EntityNotFoundException<ActionEntity>();
 
             action.CreatedBy = actionToUpdate.CreatedBy;
             action.DateCreated = actionToUpdate.DateCreated;
-            action.ModifiedBy = _user.GetId();
-            action.DateModified = DateTime.UtcNow;
             _mapper.Map(action, actionToUpdate);
-
+            actionToUpdate.ModifiedBy = _user.GetId();
+            actionToUpdate.DateModified = DateTime.UtcNow;
             _context.Actions.Update(actionToUpdate);
             await _context.SaveChangesAsync(ct);
 
-            action = await GetAsync(actionToUpdate.Id, ct);
-
-            return action;
+            return _mapper.Map<ViewModels.Action>(actionToUpdate);
         }
 
         public async Task<ViewModels.Action> SetIsCheckedAsync(Guid id, bool value, CancellationToken ct)