Fix/update nuget (#36)

* update nuget package.  add logging around data file load

* update contest type contract serializer

* fix election.json

* Fix sample data

* fix spelling error

Author: AddressXception

ElectionGuard.WebAPI/Controllers/ElectionGuardController.cs

@@ -49,7 +49,7 @@ public ElectionGuardController(ILogger<ElectionGuardController> logger, IElectio
             _electionMapper = electionMapper;
 
             _exportPath = Path.Combine(_config.GetDataDirectory(), "election_results");
-            logger.LogInformation($"DATA: resolved at: {_exportPath}");
+            logger.LogInformation($"DATA: resolved at: {_config.GetDataDirectory()}");
 
             // try to load the election config files from the file system
             var election = _config.GetElection();
@@ -60,13 +60,21 @@ public ElectionGuardController(ILogger<ElectionGuardController> logger, IElectio
                 _electionMap = _electionMapper.GetElectionMap(_election);
 
             }
+            else
+            {
+                logger.LogInformation("ElectionController: Could not find election.json");
+            }
 
             var electionguardConfig = _config.getElectionGuardConfig();
             if (electionguardConfig != null)
             {
                 logger.LogInformation("ElectionController: Found ElectionGuard Config");
                 _electionGuardConfig = electionguardConfig;
             }
+            else
+            {
+                logger.LogInformation("ElectionController: Could not find election.config.json");
+            }
 
             var now = DateTime.Now;
 
@@ -325,7 +333,7 @@ public ActionResult<LoadBallotsResponse[]> LoadBallots(LoadBallotsRequest reques
                     electionGuardConfig.NumberOfSelections,
                     Path.Combine(
                         importPath,
-                    request.ImportFileName
+                        request.ImportFileName
                     )
                 );
 

ElectionGuard.WebAPI/ElectionGuard.WebAPI.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ElectionGuard.SDK" Version="1.0.3-v56e110d" />
+    <PackageReference Include="ElectionGuard.SDK" Version="1.0.4-v4c73ce2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />

VotingWorks.Ballot/ContestType.cs

@@ -1,5 +1,9 @@
-namespace VotingWorks.Ballot
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace VotingWorks.Ballot
 {
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum ContestType
     {
         Unknown,

data/election.json

@@ -23,7 +23,7 @@
   ],
   "county": {
     "id": "1",
-    "name": "Boulder County"
+    "name": "Franklin County"
   },
   "parties": [
     {
@@ -59,7 +59,7 @@
     },
     {
       "id": "3",
-      "name": "Milton School District"
+      "name": "Franklin School District"
     }
   ],
   "contests": [
@@ -87,15 +87,15 @@
       "districtId": "1",
       "section": "Judicial",
       "title": "Justice of the Supreme Court",
-      "type": 1
+      "type": "Candidate"
     },
     {
       "description": "Should the State of Hamilton purchase, from the State of Michigan, the Upper Peninsula, for the purchase price of $1 Billion?",
       "id": "referendum-michigan-up",
       "districtId": "2",
       "section": "Referenda",
       "title": "Proposition M: The Michigan Question",
-      "type": 2
+      "type": "YesNo"
     },
     {
       "seats": 2,
@@ -129,9 +129,9 @@
       "allowWriteIns": true,
       "id": "milton-school-board",
       "districtId": "3",
-      "section": "Milton School District",
+      "section": "Franklin School District",
       "title": "School Board Member",
-      "type": 1
+      "type": "Candidate"
     }
   ],
   "date": "February 6th, 2020",