Merge my branch, which properly implements casting quickvotes

[selectricity-live] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index e94eaaa87bda85e78589d83d21a97bdb8341399e..8a8dce4d8072faca8cbc29b7e9e1d496c2a521c9 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,14 +1,21 @@
 class VoteResultStruct < ActionWebService::Struct
 class VoteResultStruct < ActionWebService::Struct

-  member :plurality_winners, :string
-  member :approval_winners, :string
-  member :condorcet_winners, :string
-  member :ssd_winners, :string
-  member :borda_winners, :string
-  member :errors, :string
+  member :plurality_winners, [:int]
+  member :approval_winners, [:int]
+  member :condorcet_winners, [:int]
+  member :ssd_winners, [:int]
+  member :borda_winners, [:int]
+  member :errors, [:string]
+end
+class CandidateMap < ActionWebService::Struct
+  member :candidate_ids, [:int]
+  member :candidate_names, [:string]
+  member :errors, [:string]

 end
 class SelectricityAPI < ActionWebService::API::Base
 end
 class SelectricityAPI < ActionWebService::API::Base

-  api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
+  api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]

   api_method :get_quickvote_results, :expects => [:string], :returns => [VoteResultStruct]
   api_method :get_quickvote_results, :expects => [:string], :returns => [VoteResultStruct]

+  api_method :get_quickvote_candidate_map, :expects => [:string], :returns => [CandidateMap]
+  api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]

 end
 
 
 end