From c9f2abad7b9c967e23ed2b2867d426eb27f61387 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Mar 2014 21:29:24 -0500 Subject: make the join tables not have models --- app/controllers/tournaments_controller.rb | 2 +- app/models/team_match_pair.rb | 4 ---- app/models/tournament_user_pair.rb | 4 ---- app/models/user_team_pair.rb | 4 ---- app/models/user_tournament_pair.rb | 4 ---- app/views/tournaments/_form.html.erb | 8 ++++---- app/views/tournaments/index.html.erb | 4 ++-- app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 10 +++++----- app/views/tournaments/show.json.jbuilder | 2 +- config/routes.rb | 8 ++++++++ db/migrate/20140307003703_create_teams.rb | 9 --------- db/migrate/20140307003709_create_alerts.rb | 10 ---------- db/migrate/20140307003714_create_pms.rb | 11 ----------- db/migrate/20140307003719_create_tournaments.rb | 16 ---------------- db/migrate/20140307003926_create_servers.rb | 8 -------- db/migrate/20140307003931_create_matches.rb | 10 ---------- db/migrate/20140307003956_create_games.rb | 15 --------------- db/migrate/20140307004001_create_users.rb | 13 ------------- db/migrate/20140307004006_create_sessions.rb | 9 --------- db/migrate/20140307004011_create_server_settings.rb | 8 -------- db/migrate/20140307004016_create_tournament_options.rb | 12 ------------ db/migrate/20140307004021_create_game_options.rb | 11 ----------- db/migrate/20140307004027_create_scores.rb | 11 ----------- db/migrate/20140307004031_create_user_team_pairs.rb | 10 ---------- .../20140307004036_create_user_tournament_pairs.rb | 10 ---------- db/migrate/20140307004041_create_team_match_pairs.rb | 10 ---------- db/migrate/20140307004100_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140307022637_create_servers.rb | 8 ++++++++ db/migrate/20140307022643_create_matches.rb | 10 ++++++++++ db/migrate/20140307022648_create_teams.rb | 9 +++++++++ db/migrate/20140307022653_create_alerts.rb | 10 ++++++++++ db/migrate/20140307022658_create_pms.rb | 11 +++++++++++ db/migrate/20140307022704_create_tournaments.rb | 16 ++++++++++++++++ db/migrate/20140307022709_create_games.rb | 15 +++++++++++++++ db/migrate/20140307022714_create_users.rb | 13 +++++++++++++ db/migrate/20140307022719_create_sessions.rb | 9 +++++++++ db/migrate/20140307022725_create_server_settings.rb | 8 ++++++++ db/migrate/20140307022729_create_tournament_options.rb | 12 ++++++++++++ db/migrate/20140307022734_create_game_options.rb | 11 +++++++++++ db/migrate/20140307022740_create_scores.rb | 11 +++++++++++ ...0140307022745_create_tournament_players_join_table.rb | 8 ++++++++ .../20140307022749_create_tournament_hosts_join_table.rb | 8 ++++++++ db/migrate/20140307022754_create_user_team_join_table.rb | 8 ++++++++ .../20140307022759_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140307022818_add_hidden_attrs_to_user.rb | 8 ++++++++ generate.sh | 10 ++++++---- test/fixtures/team_match_pairs.yml | 9 --------- test/fixtures/tournament_user_pairs.yml | 9 --------- test/fixtures/tournaments.yml | 4 ++-- test/fixtures/user_team_pairs.yml | 9 --------- test/fixtures/user_tournament_pairs.yml | 9 --------- test/models/team_match_pair_test.rb | 7 ------- test/models/tournament_user_pair_test.rb | 7 ------- test/models/user_team_pair_test.rb | 7 ------- test/models/user_tournament_pair_test.rb | 7 ------- 56 files changed, 213 insertions(+), 281 deletions(-) delete mode 100644 app/models/team_match_pair.rb delete mode 100644 app/models/tournament_user_pair.rb delete mode 100644 app/models/user_team_pair.rb delete mode 100644 app/models/user_tournament_pair.rb delete mode 100644 db/migrate/20140307003703_create_teams.rb delete mode 100644 db/migrate/20140307003709_create_alerts.rb delete mode 100644 db/migrate/20140307003714_create_pms.rb delete mode 100644 db/migrate/20140307003719_create_tournaments.rb delete mode 100644 db/migrate/20140307003926_create_servers.rb delete mode 100644 db/migrate/20140307003931_create_matches.rb delete mode 100644 db/migrate/20140307003956_create_games.rb delete mode 100644 db/migrate/20140307004001_create_users.rb delete mode 100644 db/migrate/20140307004006_create_sessions.rb delete mode 100644 db/migrate/20140307004011_create_server_settings.rb delete mode 100644 db/migrate/20140307004016_create_tournament_options.rb delete mode 100644 db/migrate/20140307004021_create_game_options.rb delete mode 100644 db/migrate/20140307004027_create_scores.rb delete mode 100644 db/migrate/20140307004031_create_user_team_pairs.rb delete mode 100644 db/migrate/20140307004036_create_user_tournament_pairs.rb delete mode 100644 db/migrate/20140307004041_create_team_match_pairs.rb delete mode 100644 db/migrate/20140307004100_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140307022637_create_servers.rb create mode 100644 db/migrate/20140307022643_create_matches.rb create mode 100644 db/migrate/20140307022648_create_teams.rb create mode 100644 db/migrate/20140307022653_create_alerts.rb create mode 100644 db/migrate/20140307022658_create_pms.rb create mode 100644 db/migrate/20140307022704_create_tournaments.rb create mode 100644 db/migrate/20140307022709_create_games.rb create mode 100644 db/migrate/20140307022714_create_users.rb create mode 100644 db/migrate/20140307022719_create_sessions.rb create mode 100644 db/migrate/20140307022725_create_server_settings.rb create mode 100644 db/migrate/20140307022729_create_tournament_options.rb create mode 100644 db/migrate/20140307022734_create_game_options.rb create mode 100644 db/migrate/20140307022740_create_scores.rb create mode 100644 db/migrate/20140307022745_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140307022749_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140307022754_create_user_team_join_table.rb create mode 100644 db/migrate/20140307022759_create_match_team_join_table.rb create mode 100644 db/migrate/20140307022818_add_hidden_attrs_to_user.rb delete mode 100644 test/fixtures/team_match_pairs.yml delete mode 100644 test/fixtures/tournament_user_pairs.yml delete mode 100644 test/fixtures/user_team_pairs.yml delete mode 100644 test/fixtures/user_tournament_pairs.yml delete mode 100644 test/models/team_match_pair_test.rb delete mode 100644 test/models/tournament_user_pair_test.rb delete mode 100644 test/models/user_team_pair_test.rb delete mode 100644 test/models/user_tournament_pair_test.rb diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 346e16b..571203c 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status) + params.require(:tournament).permit(:game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) end end diff --git a/app/models/team_match_pair.rb b/app/models/team_match_pair.rb deleted file mode 100644 index 85f8eaa..0000000 --- a/app/models/team_match_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class TeamMatchPair < ActiveRecord::Base - belongs_to :team - belongs_to :match -end diff --git a/app/models/tournament_user_pair.rb b/app/models/tournament_user_pair.rb deleted file mode 100644 index eb4e9c5..0000000 --- a/app/models/tournament_user_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class TournamentUserPair < ActiveRecord::Base - belongs_to :tournament - belongs_to :user -end diff --git a/app/models/user_team_pair.rb b/app/models/user_team_pair.rb deleted file mode 100644 index c55dc2e..0000000 --- a/app/models/user_team_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class UserTeamPair < ActiveRecord::Base - belongs_to :user - belongs_to :team -end diff --git a/app/models/user_tournament_pair.rb b/app/models/user_tournament_pair.rb deleted file mode 100644 index b2676e5..0000000 --- a/app/models/user_tournament_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class UserTournamentPair < ActiveRecord::Base - belongs_to :user - belongs_to :tournament -end diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index c2c0ba7..d098cbb 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -16,6 +16,10 @@ <%= f.text_field :game_id %>
+ <%= f.label :status %>
+ <%= f.number_field :status %> +
+
<%= f.label :min_players_per_team %>
<%= f.number_field :min_players_per_team %>
@@ -39,10 +43,6 @@ <%= f.label :randomized_teams %>
<%= f.check_box :randomized_teams %> -
- <%= f.label :status %>
- <%= f.number_field :status %> -
<%= f.submit %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index dec16d1..fb8b381 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -4,13 +4,13 @@ Game + Status Min players per team Max players per team Min teams per match Max teams per match Set rounds Randomized teams - Status @@ -21,13 +21,13 @@ <% @tournaments.each do |tournament| %> <%= tournament.game %> + <%= tournament.status %> <%= tournament.min_players_per_team %> <%= tournament.max_players_per_team %> <%= tournament.min_teams_per_match %> <%= tournament.max_teams_per_match %> <%= tournament.set_rounds %> <%= tournament.randomized_teams %> - <%= tournament.status %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index df8eee4..e95c6a7 100644 --- a/app/views/tournaments/index.json.jbuilder +++ b/app/views/tournaments/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@tournaments) do |tournament| - json.extract! tournament, :id, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status + json.extract! tournament, :id, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams json.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 355bc90..208c6f4 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -6,6 +6,11 @@

+ Status: + <%= @tournament.status %> +

+ +

Min players per team: <%= @tournament.min_players_per_team %>

@@ -35,10 +40,5 @@ <%= @tournament.randomized_teams %>

-

- Status: - <%= @tournament.status %> -

- <%= link_to 'Edit', edit_tournament_path(@tournament) %> | <%= link_to 'Back', tournaments_path %> diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index 7bedd4b..de2fbe0 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status, :created_at, :updated_at +json.extract! @tournament, :id, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at diff --git a/config/routes.rb b/config/routes.rb index 18f89d4..97e82f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,14 @@ Leaguer::Application.routes.draw do resources :games + resources :tournaments + + resources :pms + + resources :alerts + + resources :teams + resources :matches resources :servers diff --git a/db/migrate/20140307003703_create_teams.rb b/db/migrate/20140307003703_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140307003703_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/20140307003709_create_alerts.rb b/db/migrate/20140307003709_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140307003709_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/20140307003714_create_pms.rb b/db/migrate/20140307003714_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140307003714_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/20140307003719_create_tournaments.rb b/db/migrate/20140307003719_create_tournaments.rb deleted file mode 100644 index 545e603..0000000 --- a/db/migrate/20140307003719_create_tournaments.rb +++ /dev/null @@ -1,16 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - 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/20140307003926_create_servers.rb b/db/migrate/20140307003926_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140307003926_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140307003931_create_matches.rb b/db/migrate/20140307003931_create_matches.rb deleted file mode 100644 index 325863d..0000000 --- a/db/migrate/20140307003931_create_matches.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140307003956_create_games.rb b/db/migrate/20140307003956_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140307003956_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/20140307004001_create_users.rb b/db/migrate/20140307004001_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140307004001_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/20140307004006_create_sessions.rb b/db/migrate/20140307004006_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140307004006_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307004011_create_server_settings.rb b/db/migrate/20140307004011_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140307004011_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/20140307004016_create_tournament_options.rb b/db/migrate/20140307004016_create_tournament_options.rb deleted file mode 100644 index 53b601c..0000000 --- a/db/migrate/20140307004016_create_tournament_options.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentOptions < ActiveRecord::Migration - def change - create_table :tournament_options 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/20140307004021_create_game_options.rb b/db/migrate/20140307004021_create_game_options.rb deleted file mode 100644 index 2f62ef7..0000000 --- a/db/migrate/20140307004021_create_game_options.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateGameOptions < ActiveRecord::Migration - def change - create_table :game_options do |t| - t.integer :vartype - t.string :name - t.text :default - - t.timestamps - end - end -end diff --git a/db/migrate/20140307004027_create_scores.rb b/db/migrate/20140307004027_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140307004027_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/20140307004031_create_user_team_pairs.rb b/db/migrate/20140307004031_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140307004031_create_user_team_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTeamPairs < ActiveRecord::Migration - def change - create_table :user_team_pairs do |t| - t.references :user, index: true - t.references :team, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307004036_create_user_tournament_pairs.rb b/db/migrate/20140307004036_create_user_tournament_pairs.rb deleted file mode 100644 index 9885b20..0000000 --- a/db/migrate/20140307004036_create_user_tournament_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTournamentPairs < ActiveRecord::Migration - def change - create_table :user_tournament_pairs do |t| - t.references :user, index: true - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307004041_create_team_match_pairs.rb b/db/migrate/20140307004041_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140307004041_create_team_match_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateTeamMatchPairs < ActiveRecord::Migration - def change - create_table :team_match_pairs do |t| - t.references :team, index: true - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307004100_add_hidden_attrs_to_user.rb b/db/migrate/20140307004100_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140307004100_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :remember_token, :string - add_index :users, :remember_token, unique: true - add_column :users, :groups, :integer - end -end diff --git a/db/migrate/20140307022637_create_servers.rb b/db/migrate/20140307022637_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140307022637_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140307022643_create_matches.rb b/db/migrate/20140307022643_create_matches.rb new file mode 100644 index 0000000..325863d --- /dev/null +++ b/db/migrate/20140307022643_create_matches.rb @@ -0,0 +1,10 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140307022648_create_teams.rb b/db/migrate/20140307022648_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140307022648_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/20140307022653_create_alerts.rb b/db/migrate/20140307022653_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140307022653_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/20140307022658_create_pms.rb b/db/migrate/20140307022658_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140307022658_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/20140307022704_create_tournaments.rb b/db/migrate/20140307022704_create_tournaments.rb new file mode 100644 index 0000000..545e603 --- /dev/null +++ b/db/migrate/20140307022704_create_tournaments.rb @@ -0,0 +1,16 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + 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/20140307022709_create_games.rb b/db/migrate/20140307022709_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140307022709_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/20140307022714_create_users.rb b/db/migrate/20140307022714_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140307022714_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/20140307022719_create_sessions.rb b/db/migrate/20140307022719_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140307022719_create_sessions.rb @@ -0,0 +1,9 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140307022725_create_server_settings.rb b/db/migrate/20140307022725_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140307022725_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/20140307022729_create_tournament_options.rb b/db/migrate/20140307022729_create_tournament_options.rb new file mode 100644 index 0000000..53b601c --- /dev/null +++ b/db/migrate/20140307022729_create_tournament_options.rb @@ -0,0 +1,12 @@ +class CreateTournamentOptions < ActiveRecord::Migration + def change + create_table :tournament_options 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/20140307022734_create_game_options.rb b/db/migrate/20140307022734_create_game_options.rb new file mode 100644 index 0000000..2f62ef7 --- /dev/null +++ b/db/migrate/20140307022734_create_game_options.rb @@ -0,0 +1,11 @@ +class CreateGameOptions < ActiveRecord::Migration + def change + create_table :game_options do |t| + t.integer :vartype + t.string :name + t.text :default + + t.timestamps + end + end +end diff --git a/db/migrate/20140307022740_create_scores.rb b/db/migrate/20140307022740_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140307022740_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/20140307022745_create_tournament_players_join_table.rb b/db/migrate/20140307022745_create_tournament_players_join_table.rb new file mode 100644 index 0000000..9ff8a7a --- /dev/null +++ b/db/migrate/20140307022745_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :users, :tournaments do |t| + # t.index [:user_id, :tournament_id] + # t.index [:tournament_id, :user_id] + end + end +end diff --git a/db/migrate/20140307022749_create_tournament_hosts_join_table.rb b/db/migrate/20140307022749_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..0eff550 --- /dev/null +++ b/db/migrate/20140307022749_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :users, :tournaments do |t| + # t.index [:user_id, :tournament_id] + # t.index [:tournament_id, :user_id] + end + end +end diff --git a/db/migrate/20140307022754_create_user_team_join_table.rb b/db/migrate/20140307022754_create_user_team_join_table.rb new file mode 100644 index 0000000..7b4d17f --- /dev/null +++ b/db/migrate/20140307022754_create_user_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateUserTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :users, :matches do |t| + # t.index [:user_id, :match_id] + # t.index [:match_id, :user_id] + end + end +end diff --git a/db/migrate/20140307022759_create_match_team_join_table.rb b/db/migrate/20140307022759_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140307022759_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/20140307022818_add_hidden_attrs_to_user.rb b/db/migrate/20140307022818_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140307022818_add_hidden_attrs_to_user.rb @@ -0,0 +1,8 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :remember_token, :string + add_index :users, :remember_token, unique: true + add_column :users, :groups, :integer + end +end diff --git a/generate.sh b/generate.sh index db9e84b..22c6f4a 100755 --- a/generate.sh +++ b/generate.sh @@ -39,10 +39,12 @@ bundle exec rails generate model server_settings $NOTEST bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST bundle exec rails generate model game_option vartype:integer name:string default:text $NOTEST bundle exec rails generate model score user:references match:references value:integer $NOTEST -# Bridge Models -bundle exec rails generate model user_team_pair user:references team:references $NOTEST -bundle exec rails generate model user_tournament_pair user:references tournament:references -bundle exec rails generate model team_match_pair team:references match:references $NOTEST + +# Join tables +bundle exec rails generate migration CreateTournamentPlayersJoinTable users tournaments +bundle exec rails generate migration CreateTournamentHostsJoinTable users tournaments +bundle exec rails generate migration CreateUserTeamJoinTable users matches +bundle exec rails generate migration CreateMatchTeamJoinTable matches teams # Just controllers bundle exec rails generate controller search $NOTEST diff --git a/test/fixtures/team_match_pairs.yml b/test/fixtures/team_match_pairs.yml deleted file mode 100644 index 5f9cf2f..0000000 --- a/test/fixtures/team_match_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - team_id: - match_id: - -two: - team_id: - match_id: diff --git a/test/fixtures/tournament_user_pairs.yml b/test/fixtures/tournament_user_pairs.yml deleted file mode 100644 index dbc4a88..0000000 --- a/test/fixtures/tournament_user_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - tournament_id: - user_id: - -two: - tournament_id: - user_id: diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index c58a1ed..27c92f9 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -2,20 +2,20 @@ one: game_id: + status: 1 min_players_per_team: 1 max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 set_rounds: 1 randomized_teams: false - status: 1 two: game_id: + status: 1 min_players_per_team: 1 max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 set_rounds: 1 randomized_teams: false - status: 1 diff --git a/test/fixtures/user_team_pairs.yml b/test/fixtures/user_team_pairs.yml deleted file mode 100644 index a76036f..0000000 --- a/test/fixtures/user_team_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: - team_id: - -two: - user_id: - team_id: diff --git a/test/fixtures/user_tournament_pairs.yml b/test/fixtures/user_tournament_pairs.yml deleted file mode 100644 index 974ee71..0000000 --- a/test/fixtures/user_tournament_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: - tournament_id: - -two: - user_id: - tournament_id: diff --git a/test/models/team_match_pair_test.rb b/test/models/team_match_pair_test.rb deleted file mode 100644 index c250b3c..0000000 --- a/test/models/team_match_pair_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TeamMatchPairTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/tournament_user_pair_test.rb b/test/models/tournament_user_pair_test.rb deleted file mode 100644 index c8d1789..0000000 --- a/test/models/tournament_user_pair_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TournamentUserPairTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/user_team_pair_test.rb b/test/models/user_team_pair_test.rb deleted file mode 100644 index 55f5c58..0000000 --- a/test/models/user_team_pair_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class UserTeamPairTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/user_tournament_pair_test.rb b/test/models/user_tournament_pair_test.rb deleted file mode 100644 index 6167ff6..0000000 --- a/test/models/user_tournament_pair_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class UserTournamentPairTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end -- cgit v1.1-4-g5e80