From 8e7ca204ab9a702be483621f4fe9df68b03ffec0 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 7 Apr 2014 03:40:16 -0400 Subject: Added Submitted_peer_evaluations to matches --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index e3e07f9..92e8299 100755 --- a/generate.sh +++ b/generate.sh @@ -17,7 +17,7 @@ bundle exec rails generate delayed_job:active_record # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server default_user_permissions:integer -bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string +bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string submitted_peer_evaluations:integer bundle exec rails generate scaffold team match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text -- cgit v1.2.3 From c3af0f5b51dfe842ad9e4c5ea93e202e26e818ac Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 7 Apr 2014 04:16:18 -0400 Subject: Ran generate.sh --- app/controllers/matches_controller.rb | 2 +- app/views/matches/_form.html.erb | 4 ++++ app/views/matches/index.html.erb | 2 ++ app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.html.erb | 5 +++++ app/views/matches/show.json.jbuilder | 2 +- .../20140406195921_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140406235927_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140406235933_create_servers.rb | 9 --------- db/migrate/20140406235940_create_matches.rb | 13 ------------- db/migrate/20140406235946_create_teams.rb | 9 --------- db/migrate/20140406235952_create_alerts.rb | 10 ---------- db/migrate/20140406235958_create_pms.rb | 11 ----------- db/migrate/20140407000005_create_tournaments.rb | 17 ----------------- db/migrate/20140407000011_create_games.rb | 15 --------------- db/migrate/20140407000017_create_users.rb | 13 ------------- db/migrate/20140407000024_create_sessions.rb | 11 ----------- .../20140407000030_create_server_settings.rb | 8 -------- db/migrate/20140407000036_create_game_settings.rb | 15 --------------- ...20140407000042_create_tournament_preferences.rb | 12 ------------ db/migrate/20140407000048_create_scores.rb | 11 ----------- .../20140407000054_create_remote_usernames.rb | 11 ----------- ...7000100_create_tournament_players_join_table.rb | 8 -------- ...407000106_create_tournament_hosts_join_table.rb | 8 -------- .../20140407000112_create_team_user_join_table.rb | 8 -------- .../20140407000118_create_match_team_join_table.rb | 8 -------- .../20140407000143_add_hidden_attrs_to_user.rb | 6 ------ .../20140407041416_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140407081419_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140407081422_create_servers.rb | 9 +++++++++ db/migrate/20140407081425_create_matches.rb | 14 ++++++++++++++ db/migrate/20140407081427_create_teams.rb | 9 +++++++++ db/migrate/20140407081430_create_alerts.rb | 10 ++++++++++ db/migrate/20140407081434_create_pms.rb | 11 +++++++++++ db/migrate/20140407081437_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140407081440_create_games.rb | 15 +++++++++++++++ db/migrate/20140407081443_create_users.rb | 13 +++++++++++++ db/migrate/20140407081446_create_sessions.rb | 11 +++++++++++ .../20140407081449_create_server_settings.rb | 8 ++++++++ db/migrate/20140407081452_create_game_settings.rb | 15 +++++++++++++++ ...20140407081454_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140407081458_create_scores.rb | 11 +++++++++++ .../20140407081501_create_remote_usernames.rb | 11 +++++++++++ ...7081503_create_tournament_players_join_table.rb | 8 ++++++++ ...407081506_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140407081509_create_team_user_join_table.rb | 8 ++++++++ .../20140407081512_create_match_team_join_table.rb | 8 ++++++++ .../20140407081524_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 3 ++- test/controllers/matches_controller_test.rb | 4 ++-- test/fixtures/matches.yml | 2 ++ 51 files changed, 261 insertions(+), 246 deletions(-) delete mode 100644 db/migrate/20140406195921_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140406235927_create_delayed_jobs.rb delete mode 100644 db/migrate/20140406235933_create_servers.rb delete mode 100644 db/migrate/20140406235940_create_matches.rb delete mode 100644 db/migrate/20140406235946_create_teams.rb delete mode 100644 db/migrate/20140406235952_create_alerts.rb delete mode 100644 db/migrate/20140406235958_create_pms.rb delete mode 100644 db/migrate/20140407000005_create_tournaments.rb delete mode 100644 db/migrate/20140407000011_create_games.rb delete mode 100644 db/migrate/20140407000017_create_users.rb delete mode 100644 db/migrate/20140407000024_create_sessions.rb delete mode 100644 db/migrate/20140407000030_create_server_settings.rb delete mode 100644 db/migrate/20140407000036_create_game_settings.rb delete mode 100644 db/migrate/20140407000042_create_tournament_preferences.rb delete mode 100644 db/migrate/20140407000048_create_scores.rb delete mode 100644 db/migrate/20140407000054_create_remote_usernames.rb delete mode 100644 db/migrate/20140407000100_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140407000106_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140407000112_create_team_user_join_table.rb delete mode 100644 db/migrate/20140407000118_create_match_team_join_table.rb delete mode 100644 db/migrate/20140407000143_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140407041416_create_simple_captcha_data.rb create mode 100644 db/migrate/20140407081419_create_delayed_jobs.rb create mode 100644 db/migrate/20140407081422_create_servers.rb create mode 100644 db/migrate/20140407081425_create_matches.rb create mode 100644 db/migrate/20140407081427_create_teams.rb create mode 100644 db/migrate/20140407081430_create_alerts.rb create mode 100644 db/migrate/20140407081434_create_pms.rb create mode 100644 db/migrate/20140407081437_create_tournaments.rb create mode 100644 db/migrate/20140407081440_create_games.rb create mode 100644 db/migrate/20140407081443_create_users.rb create mode 100644 db/migrate/20140407081446_create_sessions.rb create mode 100644 db/migrate/20140407081449_create_server_settings.rb create mode 100644 db/migrate/20140407081452_create_game_settings.rb create mode 100644 db/migrate/20140407081454_create_tournament_preferences.rb create mode 100644 db/migrate/20140407081458_create_scores.rb create mode 100644 db/migrate/20140407081501_create_remote_usernames.rb create mode 100644 db/migrate/20140407081503_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140407081506_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140407081509_create_team_user_join_table.rb create mode 100644 db/migrate/20140407081512_create_match_team_join_table.rb create mode 100644 db/migrate/20140407081524_add_hidden_attrs_to_user.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 32108d9..968bb1e 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -69,6 +69,6 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) + params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) end end diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 9fe255c..bb33501 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -31,6 +31,10 @@ <%= f.label :remote_id %>
<%= f.text_field :remote_id %> +
+ <%= f.label :submitted_peer_evaluations %>
+ <%= f.number_field :submitted_peer_evaluations %> +
<%= f.submit %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 8d699f9..7b7676a 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -8,6 +8,7 @@ Name Winner Remote + Submitted peer evaluations @@ -22,6 +23,7 @@ <%= match.name %> <%= match.winner %> <%= match.remote_id %> + <%= match.submitted_peer_evaluations %> <%= link_to 'Show', match %> <%= link_to 'Edit', edit_match_path(match) %> <%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 18f172d..8efb8f9 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id + json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 1ee7f1d..1164113 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -25,5 +25,10 @@ <%= @match.remote_id %>

+

+ Submitted peer evaluations: + <%= @match.submitted_peer_evaluations %> +

+ <%= link_to 'Edit', edit_match_path(@match) %> | <%= link_to 'Back', matches_path %> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index bfd2be4..37496c9 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at diff --git a/db/migrate/20140406195921_create_simple_captcha_data.rb b/db/migrate/20140406195921_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140406195921_create_simple_captcha_data.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration - def self.up - create_table :simple_captcha_data do |t| - t.string :key, :limit => 40 - t.string :value, :limit => 6 - t.timestamps - end - - add_index :simple_captcha_data, :key, :name => "idx_key" - end - - def self.down - drop_table :simple_captcha_data - end -end diff --git a/db/migrate/20140406235927_create_delayed_jobs.rb b/db/migrate/20140406235927_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140406235927_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. - table.text :handler, :null => false # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/db/migrate/20140406235933_create_servers.rb b/db/migrate/20140406235933_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140406235933_create_servers.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - t.integer :default_user_permissions - - t.timestamps - end - end -end diff --git a/db/migrate/20140406235940_create_matches.rb b/db/migrate/20140406235940_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140406235940_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140406235946_create_teams.rb b/db/migrate/20140406235946_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140406235946_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140406235952_create_alerts.rb b/db/migrate/20140406235952_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140406235952_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140406235958_create_pms.rb b/db/migrate/20140406235958_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140406235958_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000005_create_tournaments.rb b/db/migrate/20140407000005_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140407000005_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000011_create_games.rb b/db/migrate/20140407000011_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140407000011_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000017_create_users.rb b/db/migrate/20140407000017_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140407000017_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140407000024_create_sessions.rb b/db/migrate/20140407000024_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140407000024_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - t.string :token - - t.timestamps - end - add_index :sessions, :token, unique: true - end -end diff --git a/db/migrate/20140407000030_create_server_settings.rb b/db/migrate/20140407000030_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140407000030_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000036_create_game_settings.rb b/db/migrate/20140407000036_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140407000036_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :stype - t.string :name - t.text :default - t.text :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000042_create_tournament_preferences.rb b/db/migrate/20140407000042_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140407000042_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000048_create_scores.rb b/db/migrate/20140407000048_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140407000048_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000054_create_remote_usernames.rb b/db/migrate/20140407000054_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140407000054_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140407000100_create_tournament_players_join_table.rb b/db/migrate/20140407000100_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140407000100_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140407000106_create_tournament_hosts_join_table.rb b/db/migrate/20140407000106_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140407000106_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140407000112_create_team_user_join_table.rb b/db/migrate/20140407000112_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140407000112_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140407000118_create_match_team_join_table.rb b/db/migrate/20140407000118_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140407000118_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140407000143_add_hidden_attrs_to_user.rb b/db/migrate/20140407000143_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140407000143_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140407041416_create_simple_captcha_data.rb b/db/migrate/20140407041416_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140407041416_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140407081419_create_delayed_jobs.rb b/db/migrate/20140407081419_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140407081419_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, :force => true do |table| + table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue + table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. + table.text :handler, :null => false # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.string :queue # The name of the queue this job is in + table.timestamps + end + + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' + end + + def self.down + drop_table :delayed_jobs + end +end diff --git a/db/migrate/20140407081422_create_servers.rb b/db/migrate/20140407081422_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140407081422_create_servers.rb @@ -0,0 +1,9 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + t.integer :default_user_permissions + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081425_create_matches.rb b/db/migrate/20140407081425_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140407081425_create_matches.rb @@ -0,0 +1,14 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + t.integer :submitted_peer_evaluations + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081427_create_teams.rb b/db/migrate/20140407081427_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140407081427_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081430_create_alerts.rb b/db/migrate/20140407081430_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140407081430_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081434_create_pms.rb b/db/migrate/20140407081434_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140407081434_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081437_create_tournaments.rb b/db/migrate/20140407081437_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140407081437_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081440_create_games.rb b/db/migrate/20140407081440_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140407081440_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081443_create_users.rb b/db/migrate/20140407081443_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140407081443_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140407081446_create_sessions.rb b/db/migrate/20140407081446_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140407081446_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140407081449_create_server_settings.rb b/db/migrate/20140407081449_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140407081449_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081452_create_game_settings.rb b/db/migrate/20140407081452_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140407081452_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :stype + t.string :name + t.text :default + t.text :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081454_create_tournament_preferences.rb b/db/migrate/20140407081454_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140407081454_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +class CreateTournamentPreferences < ActiveRecord::Migration + def change + create_table :tournament_preferences do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081458_create_scores.rb b/db/migrate/20140407081458_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140407081458_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081501_create_remote_usernames.rb b/db/migrate/20140407081501_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140407081501_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140407081503_create_tournament_players_join_table.rb b/db/migrate/20140407081503_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140407081503_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140407081506_create_tournament_hosts_join_table.rb b/db/migrate/20140407081506_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140407081506_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140407081509_create_team_user_join_table.rb b/db/migrate/20140407081509_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140407081509_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140407081512_create_match_team_join_table.rb b/db/migrate/20140407081512_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140407081512_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140407081524_add_hidden_attrs_to_user.rb b/db/migrate/20140407081524_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140407081524_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index f4612b8..9214da8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140407000143) do +ActiveRecord::Schema.define(version: 20140407081524) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -75,6 +75,7 @@ ActiveRecord::Schema.define(version: 20140407000143) do t.string "name" t.integer "winner_id" t.string "remote_id" + t.integer "submitted_peer_evaluations" t.datetime "created_at" t.datetime "updated_at" end diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index 8782b2c..aca7008 100644 --- a/test/controllers/matches_controller_test.rb +++ b/test/controllers/matches_controller_test.rb @@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase test "should create match" do assert_difference('Match.count') do - post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id } end assert_redirected_to match_path(assigns(:match)) @@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase end test "should update match" do - patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 8e86062..f64a72e 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -6,6 +6,7 @@ one: name: MyString winner_id: remote_id: MyString + submitted_peer_evaluations: 1 two: status: 1 @@ -13,3 +14,4 @@ two: name: MyString winner_id: remote_id: MyString + submitted_peer_evaluations: 1 -- cgit v1.2.3