Added Senate Nomination Votes endpoint.

babelshift · Feb 17, 2017 · ea7c7e6 · ea7c7e6
1 parent 27a3e79
commit ea7c7e6
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 2 deletions.
diff --git a/ProPublicaCongressAPI/AutoMapperConfiguration.cs b/ProPublicaCongressAPI/AutoMapperConfiguration.cs
@@ -105,6 +105,24 @@ public static void Initialize()
                             return dateTimeVoted;
                         }));
                     x.CreateMap<InternalModels.VoteByDateContainer, Contracts.VoteByDateContainer>();
+
+
+                    x.CreateMap<InternalModels.SenateNominationVote, Contracts.SenateNominationVote>()
+                        .ForMember(dest => dest.DateTimeVoted, opts => opts.ResolveUsing(source =>
+                        {
+                            string rawDateTimeVoted = source.DateVoted;
+
+                            if (!String.IsNullOrWhiteSpace(source.TimeVoted))
+                            {
+                                rawDateTimeVoted += " " + source.TimeVoted;
+                            }
+
+                            DateTime dateTimeVoted;
+                            DateTime.TryParse(rawDateTimeVoted, out dateTimeVoted);
+
+                            return dateTimeVoted;
+                        }));
+                    x.CreateMap<InternalModels.SenateNominationVoteContainer, Contracts.SenateNominationVoteContainer>();
                 });
             }
 

diff --git a/ProPublicaCongressAPI/Contracts/SenateNominationVote.cs b/ProPublicaCongressAPI/Contracts/SenateNominationVote.cs
@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+using System;
+
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class SenateNominationVote
+    {
+        public int Congress { get; set; }
+
+        public int Session { get; set; }
+
+        public int RollCallNumber { get; set; }
+
+        public string Question { get; set; }
+
+        public string Description { get; set; }
+
+        public string VoteType { get; set; }
+
+        public DateTime DateTimeVoted { get; set; }
+
+        public string Result { get; set; }
+
+        public string NomineeDetailUrl { get; set; }
+
+        public RollCallVoteSummaryDemocratic DemocraticVoteSummary { get; set; }
+
+        public RollCallVoteSummaryRepublican RepublicanVoteSummary { get; set; }
+
+        public RollCallVoteSummaryIndependent IndependentVoteSummary { get; set; }
+
+        public RollCallVoteSummaryTotal TotalVoteSummary { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/SenateNominationVoteContainer.cs b/ProPublicaCongressAPI/Contracts/SenateNominationVoteContainer.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class SenateNominationVoteContainer
+    {
+        public int TotalVotes { get; set; }
+
+        public int Offset { get; set; }
+
+        public IReadOnlyCollection<SenateNominationVote> Votes { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/VoteByDate.cs b/ProPublicaCongressAPI/Contracts/VoteByDate.cs
@@ -9,7 +9,7 @@ public class VoteByDate
 
         public int Session { get; set; }
 
-        public int RollCall { get; set; }
+        public int RollCallNumber { get; set; }
 
         public string VoteDetailUrl { get; set; }
 

diff --git a/ProPublicaCongressAPI/InternalModels/SenateNominationVote.cs b/ProPublicaCongressAPI/InternalModels/SenateNominationVote.cs
@@ -0,0 +1,49 @@
+using Newtonsoft.Json;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class SenateNominationVote
+    {
+        [JsonProperty("congress")]
+        public int Congress { get; set; }
+
+        [JsonProperty("session")]
+        public int Session { get; set; }
+
+        [JsonProperty("roll_call")]
+        public int RollCallNumber { get; set; }
+
+        [JsonProperty("question")]
+        public string Question { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonProperty("vote_type")]
+        public string VoteType { get; set; }
+
+        [JsonProperty("date")]
+        public string DateVoted { get; set; }
+
+        [JsonProperty("time")]
+        public string TimeVoted { get; set; }
+
+        [JsonProperty("result")]
+        public string Result { get; set; }
+
+        [JsonProperty("nominee_uri")]
+        public string NomineeDetailUrl { get; set; }
+
+        [JsonProperty("democratic")]
+        public RollCallVoteSummaryDemocratic DemocraticVoteSummary { get; set; }
+
+        [JsonProperty("republican")]
+        public RollCallVoteSummaryRepublican RepublicanVoteSummary { get; set; }
+
+        [JsonProperty("independent")]
+        public RollCallVoteSummaryIndependent IndependentVoteSummary { get; set; }
+
+        [JsonProperty("total")]
+        public RollCallVoteSummaryTotal TotalVoteSummary { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/SenateNominationVoteContainer.cs b/ProPublicaCongressAPI/InternalModels/SenateNominationVoteContainer.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class SenateNominationVoteContainer
+    {
+        [JsonProperty("total_votes")]
+        public int TotalVotes { get; set; }
+
+        [JsonProperty("offset")]
+        public int Offset { get; set; }
+
+        [JsonProperty("votes")]
+        public IReadOnlyCollection<SenateNominationVote> Votes { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/VoteByDate.cs b/ProPublicaCongressAPI/InternalModels/VoteByDate.cs
@@ -12,7 +12,7 @@ internal class VoteByDate
         public int Session { get; set; }
 
         [JsonProperty("roll_call")]
-        public int RollCall { get; set; }
+        public int RollCallNumber { get; set; }
 
         [JsonProperty("vote_uri")]
         public string VoteDetailUrl { get; set; }

diff --git a/ProPublicaCongressAPI/ProPublicaCongressAPI.csproj b/ProPublicaCongressAPI/ProPublicaCongressAPI.csproj
@@ -66,6 +66,8 @@
     <Compile Include="Contracts\RollCallVoteSummaryIndependent.cs" />
     <Compile Include="Contracts\RollCallVoteSummaryRepublican.cs" />
     <Compile Include="Contracts\RollCallVoteSummaryTotal.cs" />
+    <Compile Include="Contracts\SenateNominationVote.cs" />
+    <Compile Include="Contracts\SenateNominationVoteContainer.cs" />
     <Compile Include="Contracts\Session.cs" />
     <Compile Include="Contracts\VoteAggregateCategory.cs" />
     <Compile Include="Contracts\VoteByDate.cs" />
@@ -91,6 +93,8 @@
     <Compile Include="InternalModels\RollCallVotesContainer.cs" />
     <Compile Include="InternalModels\RollCallVotePosition.cs" />
     <Compile Include="InternalModels\RollCallVoteSummaryTotal.cs" />
+    <Compile Include="InternalModels\SenateNominationVote.cs" />
+    <Compile Include="InternalModels\SenateNominationVoteContainer.cs" />
     <Compile Include="InternalModels\VoteByDate.cs" />
     <Compile Include="InternalModels\VoteByDateContainer.cs" />
     <Compile Include="InternalModels\VoteByTypeContainer.cs" />

diff --git a/ProPublicaCongressAPI/ProPublicaCongressApiClient.cs b/ProPublicaCongressAPI/ProPublicaCongressApiClient.cs
@@ -44,6 +44,18 @@ public ProPublicaCongressApiClient(string apiKey)
             AutoMapperConfiguration.Initialize();
         }
 
+        public async Task<Contracts.SenateNominationVoteContainer> GetSenateNominationVotes(int congress)
+        {
+            string url = apiBaseUrl + String.Format(senateNominationsUrl, congress);
+
+            var internalModel = await GetMultipleResultDataAsync<InternalModels.SenateNominationVoteContainer>(url);
+            var contract = AutoMapperConfiguration.Mapper.Map<
+                InternalModels.SenateNominationVoteContainer,
+                Contracts.SenateNominationVoteContainer>(internalModel.Results.ElementAt(0));
+
+            return contract;
+        }
+
         public async Task<Contracts.VoteByDateContainer> GetVotesByDate(Chamber chamber, int year, int month)
         {
             string url = apiBaseUrl + String.Format(votesByDateUrl, chamber.ToString().ToLower(), year, month);