Merged changes from jdong's branch into HEAD.

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

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index da2f6f725f3a1698b2fb9ad42f7dbc752ac706fe..b1210c6e861eb9b02c1d8a7693ee5885241d5986 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,3 +1,17 @@
+class ElectionStruct < ActionWebService::Struct
+  member :name, :string
+  member :description, :string
+  member :candidate_ids, [:int]
+  member :candidate_names, [:string]
+  member :id, :int
+end
+class VoteInfo < ActionWebService::Struct
+  member :voter_id, :int
+  member :voter_ipaddress, :string
+  member :vote_time, :int
+  member :vote, [:int]
+end
+

 class VoteResultStruct < ActionWebService::Struct
   member :plurality_winners, [:int]
   member :approval_winners, [:int]
 class VoteResultStruct < ActionWebService::Struct
   member :plurality_winners, [:int]
   member :approval_winners, [:int]


@@ -12,10 +26,14 @@ class CandidateMap < ActionWebService::Struct
   member :errors, [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
   member :errors, [:string]
 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_candidate_map, :expects => [:string], :returns => [CandidateMap]
   api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]
   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]]

+  api_method :get_quickvote_votes, :expects => [:string], :returns => [ [VoteInfo] ]
+  api_method :list_quickvotes, :expects => [], :returns => [[ElectionStruct]]
+  api_method :get_quickvote, :expects => [:string], :returns => [ElectionStruct]
+  api_method :create_quickvote, :expects => [ElectionStruct], :returns => [:string]

 end
 
 
 end