Added recent bill endpoints.

babelshift · Feb 17, 2017 · 5f32ef2 · 5f32ef2
1 parent ea7c7e6
commit 5f32ef2
Show file tree

Hide file tree

Showing 13 changed files with 287 additions and 0 deletions.
diff --git a/ProPublicaCongressAPI/AutoMapperConfiguration.cs b/ProPublicaCongressAPI/AutoMapperConfiguration.cs
@@ -123,6 +123,12 @@ public static void Initialize()
                             return dateTimeVoted;
                         }));
                     x.CreateMap<InternalModels.SenateNominationVoteContainer, Contracts.SenateNominationVoteContainer>();
+
+                    x.CreateMap<InternalModels.RecentBill, Contracts.RecentBill>();
+                    x.CreateMap<InternalModels.RecentBillsContainer, Contracts.RecentBillsContainer>();
+
+                    x.CreateMap<InternalModels.RecentBillByMember, Contracts.RecentBillByMember>();
+                    x.CreateMap<InternalModels.RecentBillsByMemberContainer, Contracts.RecentBillsByMemberContainer>();
                 });
             }
 

diff --git a/ProPublicaCongressAPI/Contracts/RecentBill.cs b/ProPublicaCongressAPI/Contracts/RecentBill.cs
@@ -0,0 +1,25 @@
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class RecentBill
+    {
+        public string BillNumber { get; set; }
+
+        public string BillDetailUrl { get; set; }
+
+        public string BillTitle { get; set; }
+
+        public string SponsorMemberDetailUrl { get; set; }
+
+        public string DateIntroduced { get; set; }
+
+        public int CosponsorCount { get; set; }
+
+        public string Committees { get; set; }
+
+        public string PrimarySubject { get; set; }
+
+        public string DateLatestMajorAction { get; set; }
+
+        public string LatestMajorAction { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/RecentBillByMember.cs b/ProPublicaCongressAPI/Contracts/RecentBillByMember.cs
@@ -0,0 +1,27 @@
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class RecentBillByMember
+    {
+        public int Congress { get; set; }
+
+        public string BillNumber { get; set; }
+
+        public string BillDetailUrl { get; set; }
+
+        public string BillTitle { get; set; }
+
+        public string SponsorMemberId { get; set; }
+
+        public string DateIntroduced { get; set; }
+
+        public int CosponsorCount { get; set; }
+
+        public string Committees { get; set; }
+
+        public string PrimarySubject { get; set; }
+
+        public string DateLatestMajorAction { get; set; }
+
+        public string LatestMajorAction { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/RecentBillByMemberType.cs b/ProPublicaCongressAPI/Contracts/RecentBillByMemberType.cs
@@ -0,0 +1,9 @@
+namespace ProPublicaCongressAPI.Contracts
+{
+    public enum RecentBillByMemberType
+    {
+        Unknown,
+        Introduced,
+        Updated
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/RecentBillType.cs b/ProPublicaCongressAPI/Contracts/RecentBillType.cs
@@ -0,0 +1,11 @@
+namespace ProPublicaCongressAPI.Contracts
+{
+    public enum RecentBillType
+    {
+        Unknown,
+        Introduced,
+        Updated,
+        Passed,
+        Major
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/RecentBillsByMemberContainer.cs b/ProPublicaCongressAPI/Contracts/RecentBillsByMemberContainer.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class RecentBillsByMemberContainer
+    {
+        public string MemberId { get; set; }
+
+        public string MemberDetailUrl { get; set; }
+
+        public string MemberName { get; set; }
+
+        public int NumberOfResults { get; set; }
+
+        public int Offset { get; set; }
+
+        public IReadOnlyCollection<RecentBillByMember> Bills { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/Contracts/RecentBillsContainer.cs b/ProPublicaCongressAPI/Contracts/RecentBillsContainer.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.Contracts
+{
+    public class RecentBillsContainer
+    {
+        public int Congress { get; set; }
+
+        public string Chamber { get; set; }
+
+        public int NumberOfResults { get; set; }
+
+        public int Offset { get; set; }
+
+        public IReadOnlyCollection<RecentBill> Bills { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/RecentBill.cs b/ProPublicaCongressAPI/InternalModels/RecentBill.cs
@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class RecentBill
+    {
+        [JsonProperty("number")]
+        public string BillNumber { get; set; }
+
+        [JsonProperty("bill_uri")]
+        public string BillDetailUrl { get; set; }
+
+        [JsonProperty("title")]
+        public string BillTitle { get; set; }
+
+        [JsonProperty("sponsor_uri")]
+        public string SponsorMemberDetailUrl { get; set; }
+
+        [JsonProperty("introduced_date")]
+        public string DateIntroduced { get; set; }
+
+        [JsonProperty("cosponsors")]
+        public int CosponsorCount { get; set; }
+
+        [JsonProperty("committees")]
+        public string Committees { get; set; }
+
+        [JsonProperty("primary_subject")]
+        public string PrimarySubject { get; set; }
+
+        [JsonProperty("latest_major_action_date")]
+        public string DateLatestMajorAction { get; set; }
+
+        [JsonProperty("latest_major_action")]
+        public string LatestMajorAction { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/RecentBillByMember.cs b/ProPublicaCongressAPI/InternalModels/RecentBillByMember.cs
@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class RecentBillByMember
+    {
+        [JsonProperty("congress")]
+        public int Congress { get; set; }
+
+        [JsonProperty("number")]
+        public string BillNumber { get; set; }
+
+        [JsonProperty("bill_uri")]
+        public string BillDetailUrl { get; set; }
+
+        [JsonProperty("title")]
+        public string BillTitle { get; set; }
+
+        [JsonProperty("sponsor_id")]
+        public string SponsorMemberId { get; set; }
+
+        [JsonProperty("introduced_date")]
+        public string DateIntroduced { get; set; }
+
+        [JsonProperty("cosponsors")]
+        public int CosponsorCount { get; set; }
+
+        [JsonProperty("committees")]
+        public string Committees { get; set; }
+
+        [JsonProperty("primary_subject")]
+        public string PrimarySubject { get; set; }
+
+        [JsonProperty("latest_major_action_date")]
+        public string DateLatestMajorAction { get; set; }
+
+        [JsonProperty("latest_major_action")]
+        public string LatestMajorAction { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/RecentBillsByMemberContainer.cs b/ProPublicaCongressAPI/InternalModels/RecentBillsByMemberContainer.cs
@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class RecentBillsByMemberContainer
+    {
+        [JsonProperty("id")]
+        public string MemberId { get; set; }
+
+        [JsonProperty("member_uri")]
+        public string MemberDetailUrl { get; set; }
+
+        [JsonProperty("name")]
+        public string MemberName { get; set; }
+
+        [JsonProperty("num_results")]
+        public int NumberOfResults { get; set; }
+
+        [JsonProperty("offset")]
+        public int Offset { get; set; }
+
+        [JsonProperty("bills")]
+        public IReadOnlyCollection<RecentBillByMember> Bills { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/InternalModels/RecentBillsContainer.cs b/ProPublicaCongressAPI/InternalModels/RecentBillsContainer.cs
@@ -0,0 +1,23 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ProPublicaCongressAPI.InternalModels
+{
+    internal class RecentBillsContainer
+    {
+        [JsonProperty("congress")]
+        public int Congress { get; set; }
+
+        [JsonProperty("chamber")]
+        public string Chamber { get; set; }
+
+        [JsonProperty("num_results")]
+        public int NumberOfResults { get; set; }
+
+        [JsonProperty("offset")]
+        public int Offset { get; set; }
+
+        [JsonProperty("bills")]
+        public IReadOnlyCollection<RecentBill> Bills { get; set; }
+    }
+}
diff --git a/ProPublicaCongressAPI/ProPublicaCongressAPI.csproj b/ProPublicaCongressAPI/ProPublicaCongressAPI.csproj
@@ -58,6 +58,12 @@
     <Compile Include="Contracts\MemberVotesContainer.cs" />
     <Compile Include="Contracts\NewMember.cs" />
     <Compile Include="Contracts\NewMembersContainer.cs" />
+    <Compile Include="Contracts\RecentBill.cs" />
+    <Compile Include="Contracts\RecentBillByMember.cs" />
+    <Compile Include="Contracts\RecentBillsByMemberContainer.cs" />
+    <Compile Include="Contracts\RecentBillsContainer.cs" />
+    <Compile Include="Contracts\RecentBillByMemberType.cs" />
+    <Compile Include="Contracts\RecentBillType.cs" />
     <Compile Include="Contracts\RollCallVote.cs" />
     <Compile Include="Contracts\RollCallVoteContainer.cs" />
     <Compile Include="Contracts\RollCallVotesContainer.cs" />
@@ -75,6 +81,10 @@
     <Compile Include="Contracts\VoteByTypeContainer.cs" />
     <Compile Include="Contracts\VoteByTypeMember.cs" />
     <Compile Include="InternalModels\CurrentMember.cs" />
+    <Compile Include="InternalModels\RecentBill.cs" />
+    <Compile Include="InternalModels\RecentBillByMember.cs" />
+    <Compile Include="InternalModels\RecentBillsByMemberContainer.cs" />
+    <Compile Include="InternalModels\RecentBillsContainer.cs" />
     <Compile Include="InternalModels\RollCallVoteContainer.cs" />
     <Compile Include="InternalModels\RollCallVoteSummaryDemocratic.cs" />
     <Compile Include="InternalModels\RollCallVoteSummaryIndependent.cs" />

diff --git a/ProPublicaCongressAPI/ProPublicaCongressApiClient.cs b/ProPublicaCongressAPI/ProPublicaCongressApiClient.cs
@@ -37,13 +37,50 @@ public class ProPublicaCongressApiClient
         private const string nomineesByStateUrl = "v1/{0}/nominees/state/{1}.json"; // 0 = congress, 1 = state
         private const string statePartyCountUrl = "v1/states/members/party.json";
         private const string committeesUrl = "v1/{0}/{1}/committees/{2}.json"; // 0 = congress, 1 = chamber, 2 = committee-id
+        private const string offsetParameter = "?offset={0}";
 
         public ProPublicaCongressApiClient(string apiKey)
         {
             this.apiKey = apiKey;
             AutoMapperConfiguration.Initialize();
         }
 
+        public async Task<Contracts.RecentBillsByMemberContainer> GetRecentBillsByMember(string memberId, RecentBillByMemberType billType, int? offset = null)
+        {
+            string url = apiBaseUrl + String.Format(recentBillsByMemberUrl, memberId, billType.ToString().ToLower());
+
+            // we can offset the results to page through them since this endpoint only returns 20 at a time
+            if (offset.HasValue && offset.Value > 0)
+            {
+                url += String.Format(offsetParameter, offset.Value);
+            }
+
+            var internalModel = await GetMultipleResultDataAsync<InternalModels.RecentBillsByMemberContainer>(url);
+            var contract = AutoMapperConfiguration.Mapper.Map<
+                InternalModels.RecentBillsByMemberContainer,
+                Contracts.RecentBillsByMemberContainer>(internalModel.Results.ElementAt(0));
+
+            return contract;
+        }
+
+        public async Task<Contracts.RecentBillsContainer> GetRecentBills(int congress, Chamber chamber, RecentBillType billType, int? offset = null)
+        {
+            string url = apiBaseUrl + String.Format(recentBillsUrl, congress, chamber.ToString().ToLower(), billType.ToString().ToLower());
+
+            // we can offset the results to page through them since this endpoint only returns 20 at a time
+            if(offset.HasValue && offset.Value > 0)
+            {
+                url += String.Format(offsetParameter, offset.Value);
+            }
+
+            var internalModel = await GetMultipleResultDataAsync<InternalModels.RecentBillsContainer>(url);
+            var contract = AutoMapperConfiguration.Mapper.Map<
+                InternalModels.RecentBillsContainer,
+                Contracts.RecentBillsContainer>(internalModel.Results.ElementAt(0));
+
+            return contract;
+        }
+
         public async Task<Contracts.SenateNominationVoteContainer> GetSenateNominationVotes(int congress)
         {
             string url = apiBaseUrl + String.Format(senateNominationsUrl, congress);