Campaign lock and unlock

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

@@ -13,6 +13,8 @@ public static void LoadCampaignssHandlerTestData(AllReadyContext context)
             // Campaigns
             context.Campaigns.Add(new Campaign { Name = "Campaign 1", ManagingOrganizationId = 1 });
             context.Campaigns.Add(new Campaign { Name = "Campaign 2", ManagingOrganizationId = 1 });
+            context.Campaigns.Add(new Campaign { Name = "Locked Campaign", ManagingOrganizationId = 1, Locked = true });
+            context.Campaigns.Add(new Campaign { Name = "Unlocked Campaign", ManagingOrganizationId = 1, Locked = false });
 
             context.SaveChanges();
         }

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

@@ -19,7 +19,7 @@ public void AddNewCampaign()
             var result = handler.Handle(new EditCampaignCommand { Campaign = newCampaign });
 
             // Assert
-            Assert.Equal(3, Context.Campaigns.Count());
+            Assert.Equal(5, Context.Campaigns.Count());
             Assert.True(result > 0);
         }
 
@@ -56,7 +56,7 @@ public void UpdatingExistingCampaignUpdatesAllCoreProperties()
             var savedCampaign = Context.Campaigns.SingleOrDefault(s => s.Id == 2);
 
             // Assert
-            Assert.Equal(2, Context.Campaigns.Count());
+            Assert.Equal(4, Context.Campaigns.Count());
             Assert.Equal(2, result);
 
             Assert.Equal(name, savedCampaign.Name);

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

@@ -0,0 +1,44 @@
+using AllReady.Areas.Admin.Features.Campaigns;
+using System.Linq;
+using Xunit;
+
+namespace AllReady.UnitTest.Areas.Admin.Features.Campaigns
+{
+    public class LockUnlockCampaignCommandHandlerTests : InMemoryContextTest
+    {
+        [Fact]
+        public void LockedCampaignIsUnlocked()
+        {
+            // Arrange
+            var handler = new LockUnlockCampaignCommandHandler(Context);
+
+            // Act
+            var campaign = Context.Campaigns.FirstOrDefault(c => c.Name == "Locked Campaign");
+            handler.Handle(new LockUnlockCampaignCommand { CampaignId = campaign.Id });
+            var result = Context.Campaigns.FirstOrDefault(c => c.Name == "Locked Campaign");
+
+            // Assert
+            Assert.False(result.Locked); // Campaign should now be unlocked
+        }
+
+        [Fact]
+        public void UnlockedCampaignIsLocked()
+        {
+            // Arrange
+            var handler = new LockUnlockCampaignCommandHandler(Context);
+
+            // Act
+            var campaign = Context.Campaigns.FirstOrDefault(c => c.Name == "Unlocked Campaign");
+            handler.Handle(new LockUnlockCampaignCommand { CampaignId = campaign.Id });
+            var result = Context.Campaigns.FirstOrDefault(c => c.Name == "Unlocked Campaign");
+
+            // Assert
+            Assert.True(result.Locked); // Campaign should now be locked
+        }
+
+        protected override void LoadTestData()
+        {
+            CampaignsHandlerTestHelper.LoadCampaignssHandlerTestData(Context);
+        }
+    }
+}

AllReadyApp/Web-App/AllReady/Areas/Admin/Controllers/CampaignController.cs

@@ -147,9 +147,22 @@ public IActionResult DeleteConfirmed(int id)
             {
                 return HttpUnauthorized();
             }
+
             _bus.Send(new DeleteCampaignCommand { CampaignId = id });            
             return RedirectToAction("Index", new { area = "Admin" });
         }
 
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult LockUnlock(int id)
+        {         
+            if (!User.IsUserType(UserType.SiteAdmin))
+            {
+                return HttpUnauthorized();
+            }
+
+            _bus.Send(new LockUnlockCampaignCommand { CampaignId = id });
+            return RedirectToAction("Details", new { area = "Admin", id = id });
+        }
     }
-}
+}

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

@@ -43,6 +43,7 @@ public CampaignDetailModel Handle(CampaignDetailQuery message)
                     EndDate = campaign.EndDateTime,
                     CampaignImpact = campaign.CampaignImpact,
                     Location = campaign.Location.ToModel(),
+                    Locked = campaign.Locked,
                     Activities = campaign.Activities.Select(a => new ActivitySummaryModel
                     {
                         Id = a.Id,

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

@@ -34,7 +34,8 @@ public IEnumerable<CampaignSummaryModel> Handle(CampaignListQuery message)
                     OrganizationName = c.ManagingOrganization.Name,
                     TimeZoneId = c.TimeZoneId,
                     StartDate = c.StartDateTime,
-                    EndDate = c.EndDateTime
+                    EndDate = c.EndDateTime,
+                    Locked = c.Locked
                 });
 
             return campaigns;

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

@@ -0,0 +1,9 @@
+using MediatR;
+
+namespace AllReady.Areas.Admin.Features.Campaigns
+{
+    public class LockUnlockCampaignCommand : IRequest
+    {
+        public int CampaignId {get; set;}
+    }
+}

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

@@ -0,0 +1,30 @@
+using AllReady.Models;
+using MediatR;
+using System.Linq;
+
+namespace AllReady.Areas.Admin.Features.Campaigns
+{
+    public class LockUnlockCampaignCommandHandler : RequestHandler<LockUnlockCampaignCommand>
+    {
+        private AllReadyContext _context;
+
+        public LockUnlockCampaignCommandHandler(AllReadyContext context)
+        {
+            _context = context;
+
+        }
+        protected override void HandleCore(LockUnlockCampaignCommand message)
+        {
+            var campaign = 
+                _context.Campaigns.SingleOrDefault(c => c.Id == message.CampaignId);
+
+            if (campaign != null)
+            {
+                campaign.Locked = !campaign.Locked;
+
+                _context.Update(campaign);
+                _context.SaveChanges();
+            }
+        }
+    }
+}

AllReadyApp/Web-App/AllReady/Areas/Admin/Models/CampaignDetailModel.cs

@@ -53,5 +53,7 @@ public class CampaignDetailModel: IPrimaryContactModel
         [EmailAddress]
         public string PrimaryContactEmail { get; set; }
 
+        public bool Locked { get; set; }
+
     }
 }

AllReadyApp/Web-App/AllReady/Areas/Admin/Models/CampaignSummaryModel.cs

@@ -62,5 +62,6 @@ public CampaignSummaryModel()
         [EmailAddress]
         public string PrimaryContactEmail { get; set; }
 
+        public bool Locked { get; set; }
     }
 }

AllReadyApp/Web-App/AllReady/Areas/Admin/Views/Campaign/Details.cshtml

@@ -1,4 +1,6 @@
 @model AllReady.Areas.Admin.Models.CampaignDetailModel
+@using AllReady.Security;
+
 @{ ViewBag.Title = Model.Name; }
 <div class="row">
     <div class="col-12">
@@ -11,7 +13,31 @@
 
 <div class="row">
     <div id="col-main">
-        <div class="col-md-9"><h2>@Model.Name <a asp-controller="Campaign" asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-default" title="Edit"><i class="fa fa-edit"></i></a> <a asp-controller="Campaign" asp-action="Delete" asp-route-area="Admin" asp-route-id="@Model.Id" class="btn btn-default"><i class="glyphicon glyphicon-trash"></i></a></h2></div>
+        <div class="col-md-9">
+            <h2 class="inline-form">
+                @Model.Name
+            </h2>
+            <a asp-controller="Campaign" asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-default inline-form" title="Edit"><i class="fa fa-edit"></i></a>
+            <a asp-controller="Campaign" asp-action="Delete" asp-route-area="Admin" asp-route-id="@Model.Id" class="btn btn-default inline-form"><i class="glyphicon glyphicon-trash"></i></a>
+            @if (User.IsUserType(UserType.SiteAdmin))
+            {
+                <form asp-controller="Campaign" asp-route-area="Admin" asp-action="LockUnlock" class="inline-form">
+                    <input asp-for="Id" type="hidden" />
+                    @if (Model.Locked)
+                    {
+                        <button type="submit" class="btn btn-default inline-form" title="This campaign is currently locked">Unlock</button>
+                    }
+                    else
+                    {
+                        <button type="submit" class="btn btn-default inline-form" title="This campaign is currently unlocked">Lock</button>
+                    }
+                </form>
+            }
+            else if (Model.Locked)
+            {
+                 <span title="This campaign is locked" class="fa fa-exclamation-triangle text-warning"></span><span> This campaign has been locked by a site administrator. Locked campaigns are not visible to the public or to volunteers.</span>
+            }
+        </div>
     </div>
 </div>
 
@@ -24,8 +50,9 @@
 
     </div>
 </div>
+
 <div class="row">
-    
+
     <div class="col-md-12">
         <dl class="dl-horizontal">
             <dt>

AllReadyApp/Web-App/AllReady/Areas/Admin/Views/Campaign/Index.cshtml

@@ -40,6 +40,10 @@
                     </td>
                     <td>
                         <a asp-controller="Campaign" asp-action="Details" asp-route-area="Admin" asp-route-id="@item.Id">@item.Name</a>
+                        @if (item.Locked)
+                        {
+                            <span title="This campaign is locked" class="fa fa-exclamation-triangle text-warning"></span>
+                        }
                         @if (!string.IsNullOrEmpty(item.Description))
                         {
                             <br/><span class="text-muted">@item.Description</span>

AllReadyApp/Web-App/AllReady/Controllers/ActivityApiController.cs

@@ -35,7 +35,9 @@ public ActivityApiController(IAllReadyDataAccess allReadyDataAccess, IMediator b
         [HttpGet]
         public IEnumerable<ActivityViewModel> Get()
         {
-            return _allReadyDataAccess.Activities.Select(a => new ActivityViewModel(a));
+            return _allReadyDataAccess.Activities
+                .Where(c => !c.Campaign.Locked)
+                .Select(a => new ActivityViewModel(a));
         }
 
         // GET api/values/5

AllReadyApp/Web-App/AllReady/Controllers/ActivityController.cs

@@ -30,7 +30,7 @@ public ActivityController(IAllReadyDataAccess allReadyDataAccess, IMediator bus)
         [Authorize]
         public IActionResult GetMyActivities()
         {
-            var myActivities = _allReadyDataAccess.GetActivitySignups(User.GetUserId());
+            var myActivities = _allReadyDataAccess.GetActivitySignups(User.GetUserId()).Where(a => !a.Activity.Campaign.Locked);
             var signedUp = myActivities.Select(a => new ActivityViewModel(a.Activity));
             var viewModel = new MyActivitiesResultsScreenViewModel("My Activities", signedUp);
             return View("MyActivities", viewModel);
@@ -85,7 +85,7 @@ public IActionResult ShowActivity(int id)
         {
             var activity = _allReadyDataAccess.GetActivity(id);
 
-            if (activity == null)
+            if (activity == null || activity.Campaign.Locked)
             {
                 return HttpNotFound();
             }

AllReadyApp/Web-App/AllReady/Controllers/CampaignController.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNet.Mvc;
 using AllReady.Models;
 using AllReady.ViewModels;
-using Microsoft.Data.Entity;
 
 namespace AllReady.Controllers
 {
@@ -21,7 +20,7 @@ public CampaignController(IAllReadyDataAccess dataAccess)
         [Route("~/[controller]")]
         public IActionResult Index()
         {
-            return View(_dataAccess.Campaigns.ToViewModel().ToList());
+            return View(_dataAccess.Campaigns.Where(c => !c.Locked).ToViewModel().ToList());
         }
 
         [HttpGet]
@@ -30,8 +29,8 @@ public IActionResult Details(int id)
         {
             var campaign = _dataAccess.GetCampaign(id);
 
-            if (campaign == null)
-                HttpNotFound();
+            if (campaign == null || campaign.Locked)
+                return HttpNotFound();
 
             return View("Details", new CampaignViewModel(campaign));
         }
@@ -43,7 +42,7 @@ public IActionResult LocationMap(int id)
             var campaign = _dataAccess.GetCampaign(id);
 
             if (campaign == null)
-                HttpNotFound();
+                return HttpNotFound();
 
             return View("Map", new CampaignViewModel(campaign));
         }
@@ -53,19 +52,22 @@ public IActionResult LocationMap(int id)
         public IEnumerable<CampaignViewModel> Get()
         {
             return _dataAccess.Campaigns
+                .Where(c => !c.Locked)
                 .Select(x => new CampaignViewModel(x));
         }
 
         // GET api/values/5
         [HttpGet("{id}")]
-        public CampaignViewModel Get(int id)
+        public ActionResult Get(int id)
         {
             var campaign = _dataAccess.GetCampaign(id);
 
-            if (campaign == null)
-                HttpNotFound();
+            if (campaign == null || campaign.Locked)
+            {
+                return HttpNotFound();
+            }
 
-            return campaign.ToViewModel();
+            return Json(campaign.ToViewModel());
         }
     }
 }

AllReadyApp/Web-App/AllReady/Controllers/HomeController.cs

@@ -17,7 +17,7 @@ public HomeController(IAllReadyDataAccess dataAccess)
 
         public IActionResult Index()
         {
-            return View(_dataAccess.Campaigns.Where(c => c.EndDateTime.UtcDateTime.Date > DateTime.UtcNow.Date).ToViewModel().OrderBy(vm => vm.EndDate).ToList());
+            return View(_dataAccess.Campaigns.Where(c => c.EndDateTime.UtcDateTime.Date > DateTime.UtcNow.Date && !c.Locked).ToViewModel().OrderBy(vm => vm.EndDate).ToList());
         }
 
         public IActionResult About()

AllReadyApp/Web-App/AllReady/DataAccess/AllReadyDataAccessEF7.Activity.cs

@@ -16,6 +16,7 @@ IEnumerable<Activity> IAllReadyDataAccess.Activities
                 return _dbContext.Activities
                                 .Include(a => a.Location)
                                 .Include(a => a.Location.PostalCode)
+                                .Include(a => a.Campaign)
                                 .Include(a => a.Campaign.ManagingOrganization)
                                 .Include(a => a.Tasks)
                                 .Include(a => a.RequiredSkills)
@@ -90,10 +91,11 @@ IEnumerable<TaskSignup> IAllReadyDataAccess.GetTasksAssignedToUser(int activityI
             var unfilteredTasks = _dbContext.TaskSignups
                 .Include(ts => ts.Task)
                 .ThenInclude(t => t.Activity)
-                .Include(ts => ts.User)
+                .ThenInclude(t => t.Campaign)
+                .Include(ts => ts.User)                
                 .ToList();
 
-            var finalTasks = unfilteredTasks.Where(ts => ts.Task.Activity.Id == activityId && ts.User.Id == userId).ToList();
+            var finalTasks = unfilteredTasks.Where(ts => ts.Task.Activity.Id == activityId && ts.User.Id == userId && !ts.Task.Activity.Campaign.Locked).ToList();
 
             return finalTasks;
         }