From cf3a13b77ba5c7c33ec60304e65866924013d8f5 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Fri, 6 May 2016 11:16:43 -0400
Subject: [PATCH] Rename ResultStatus to Results

---
 .../ResultStatusViewModelTests.cs             |  2 +-
 Web/Controllers/LeafInputController.cs        |  9 -----
 Web/Controllers/ResultStatusController.cs     | 19 -----------
 Web/Controllers/ResultsController.cs          | 33 +++++++++++++++++++
 .../ResultStatusViewModel.cs                  |  2 +-
 .../{ResultStatus => Results}/Index.cshtml    |  4 +--
 Web/Views/Shared/_Layout.cshtml               |  2 +-
 Web/Web.csproj                                |  6 ++--
 8 files changed, 41 insertions(+), 36 deletions(-)
 delete mode 100644 Web/Controllers/ResultStatusController.cs
 create mode 100644 Web/Controllers/ResultsController.cs
 rename Web/ViewModels/{ResultStatus => Results}/ResultStatusViewModel.cs (97%)
 rename Web/Views/{ResultStatus => Results}/Index.cshtml (85%)

diff --git a/Web.Tests/ViewModels/ResultStatus/ResultStatusViewModelTests.cs b/Web.Tests/ViewModels/ResultStatus/ResultStatusViewModelTests.cs
index 4667e16..c350d63 100644
--- a/Web.Tests/ViewModels/ResultStatus/ResultStatusViewModelTests.cs
+++ b/Web.Tests/ViewModels/ResultStatus/ResultStatusViewModelTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using LeafWeb.Core.Entities;
-using LeafWeb.Web.ViewModels.ResultStatus;
+using LeafWeb.Web.ViewModels.Results;
 using NUnit.Framework;
 
 namespace LeafWeb.Web.Tests.ViewModels.ResultStatus
diff --git a/Web/Controllers/LeafInputController.cs b/Web/Controllers/LeafInputController.cs
index ecf538d..5dd13da 100644
--- a/Web/Controllers/LeafInputController.cs
+++ b/Web/Controllers/LeafInputController.cs
@@ -100,15 +100,6 @@ namespace LeafWeb.Web.Controllers
 			return View("Index", viewModel);
 		}
 
-		public FileContentResult DownloadResults(int id)
-		{
-			var leafInput = DataService.GetLeafInput(id);
-
-			var zip = leafInput.GetOutputFileZip();
-			
-			return new FileContentResult(zip, "application/zip") {FileDownloadName = leafInput.Identifier + ".zip"};
-		}
-
 		public void NotifyComplete()
 		{
 			HangfireStartup.TriggerPiscalProcessQueue();
diff --git a/Web/Controllers/ResultStatusController.cs b/Web/Controllers/ResultStatusController.cs
deleted file mode 100644
index b55f1f0..0000000
--- a/Web/Controllers/ResultStatusController.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Linq;
-using System.Web.Mvc;
-using LeafWeb.Web.ViewModels.ResultStatus;
-
-namespace LeafWeb.Web.Controllers
-{
-	public class ResultStatusController : ControllerBase
-	{
-		public ActionResult Index()
-		{
-			var viewModel = 
-				DataService.GetLeafInputs()
-				.OrderByDescending(f => f.Id)
-				.ToList()
-				.Select(leafInput => new ResultStatusViewModel(leafInput));
-			return View(viewModel);
-		}
-	}
-}
\ No newline at end of file
diff --git a/Web/Controllers/ResultsController.cs b/Web/Controllers/ResultsController.cs
new file mode 100644
index 0000000..1e05f77
--- /dev/null
+++ b/Web/Controllers/ResultsController.cs
@@ -0,0 +1,33 @@
+using System.Linq;
+using System.Web.Mvc;
+using LeafWeb.Core.Utility;
+using LeafWeb.Web.Attributes;
+using LeafWeb.Web.ViewModels.Results;
+
+namespace LeafWeb.Web.Controllers
+{
+	public class ResultsController : ControllerBase
+	{
+		public ActionResult Index()
+		{
+			var viewModel = 
+				DataService.GetLeafInputs()
+				.OrderByDescending(f => f.Id)
+				.ToList()
+				.Select(leafInput => new ResultStatusViewModel(leafInput));
+			return View(viewModel);
+		}
+
+		[ActionLog]
+		public FileContentResult DownloadResults(int id)
+		{
+			var leafInput = DataService.GetLeafInput(id);
+
+			var zip = leafInput.GetOutputFileZip();
+
+			var filename = leafInput.Identifier.FilterValidFilename() + ".zip";
+
+			return new FileContentResult(zip, "application/zip") { FileDownloadName = filename };
+		}
+	}
+}
\ No newline at end of file
diff --git a/Web/ViewModels/ResultStatus/ResultStatusViewModel.cs b/Web/ViewModels/Results/ResultStatusViewModel.cs
similarity index 97%
rename from Web/ViewModels/ResultStatus/ResultStatusViewModel.cs
rename to Web/ViewModels/Results/ResultStatusViewModel.cs
index f84e30b..2c1c529 100644
--- a/Web/ViewModels/ResultStatus/ResultStatusViewModel.cs
+++ b/Web/ViewModels/Results/ResultStatusViewModel.cs
@@ -2,7 +2,7 @@
 using AutoMapper;
 using LeafWeb.Core.Entities;
 
-namespace LeafWeb.Web.ViewModels.ResultStatus
+namespace LeafWeb.Web.ViewModels.Results
 {
 	public class ResultStatusViewModel
 	{
diff --git a/Web/Views/ResultStatus/Index.cshtml b/Web/Views/Results/Index.cshtml
similarity index 85%
rename from Web/Views/ResultStatus/Index.cshtml
rename to Web/Views/Results/Index.cshtml
index 4c70745..5617237 100644
--- a/Web/Views/ResultStatus/Index.cshtml
+++ b/Web/Views/Results/Index.cshtml
@@ -1,7 +1,7 @@
-@model IEnumerable<LeafWeb.Web.ViewModels.ResultStatus.ResultStatusViewModel>
+@model IEnumerable<LeafWeb.Web.ViewModels.Results.ResultStatusViewModel>
 
 @{
-    ViewBag.Title = "Results";
+    ViewBag.Title = "Result Status";
     var grid = new WebGrid(Model, rowsPerPage: 45);
 }
 
diff --git a/Web/Views/Shared/_Layout.cshtml b/Web/Views/Shared/_Layout.cshtml
index 3555688..893e32f 100644
--- a/Web/Views/Shared/_Layout.cshtml
+++ b/Web/Views/Shared/_Layout.cshtml
@@ -49,7 +49,7 @@
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Leaf Data <span class="caret"></span></a>
 							<ul class="dropdown-menu">
 								<li><a href="/LeafInput">Submit Data</a></li>
-								<li><a href="/ResultStatus">Result Status</a></li>
+								<li><a href="/Results">Result Status</a></li>
 							</ul>
 						</li>
 						<li>
diff --git a/Web/Web.csproj b/Web/Web.csproj
index 4567c06..cdc793b 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -965,7 +965,7 @@
     <Compile Include="Controllers\FluxnetSiteController.cs" />
     <Compile Include="Controllers\LeafCharterController.cs" />
     <Compile Include="Controllers\LeafInputController.cs" />
-    <Compile Include="Controllers\ResultStatusController.cs" />
+    <Compile Include="Controllers\ResultsController.cs" />
     <Compile Include="Controllers\PagesController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -985,7 +985,7 @@
     <Compile Include="ViewModels\LeafCharter\LeafCharterViewModel.cs" />
     <Compile Include="ViewModels\LeafInput\ConfirmViewModel.cs" />
     <Compile Include="ViewModels\LeafInput\CreateViewModel.cs" />
-    <Compile Include="ViewModels\ResultStatus\ResultStatusViewModel.cs" />
+    <Compile Include="ViewModels\Results\ResultStatusViewModel.cs" />
     <Compile Include="ViewModels\SelectListViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -1018,7 +1018,7 @@
     <Content Include="Views\Shared\_StatusMessage.cshtml" />
     <Content Include="Views\Shared\_ValidationField.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\SelectListViewModel.cshtml" />
-    <Content Include="Views\ResultStatus\Index.cshtml" />
+    <Content Include="Views\Results\Index.cshtml" />
     <Content Include="Views\Pages\Information.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>