From 50371ba04b52f74bfc2ceb05a429e072ad4848bb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Mar 2014 15:23:30 -0500 Subject: add a user_tournament_pair --- app/models/user_tournament_pair.rb | 4 ++++ db/migrate/20140306024707_create_servers.rb | 8 -------- db/migrate/20140306024709_create_tournaments.rb | 9 --------- db/migrate/20140306024711_create_matches.rb | 10 ---------- db/migrate/20140306024713_create_teams.rb | 8 -------- db/migrate/20140306024715_create_alerts.rb | 10 ---------- db/migrate/20140306024718_create_pms.rb | 11 ----------- db/migrate/20140306024720_create_games.rb | 13 ------------- db/migrate/20140306024722_create_users.rb | 13 ------------- db/migrate/20140306024724_create_sessions.rb | 9 --------- db/migrate/20140306024727_create_game_attributes.rb | 11 ----------- db/migrate/20140306024729_create_server_settings.rb | 8 -------- db/migrate/20140306024731_create_user_team_pairs.rb | 10 ---------- db/migrate/20140306024733_create_team_match_pairs.rb | 10 ---------- db/migrate/20140306024735_create_tournament_options.rb | 8 -------- db/migrate/20140306024744_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140306202154_create_servers.rb | 8 ++++++++ db/migrate/20140306202156_create_tournaments.rb | 9 +++++++++ db/migrate/20140306202158_create_matches.rb | 10 ++++++++++ db/migrate/20140306202200_create_teams.rb | 8 ++++++++ db/migrate/20140306202202_create_alerts.rb | 10 ++++++++++ db/migrate/20140306202204_create_pms.rb | 11 +++++++++++ db/migrate/20140306202207_create_games.rb | 13 +++++++++++++ db/migrate/20140306202209_create_users.rb | 13 +++++++++++++ db/migrate/20140306202211_create_sessions.rb | 9 +++++++++ db/migrate/20140306202213_create_game_attributes.rb | 11 +++++++++++ db/migrate/20140306202215_create_server_settings.rb | 8 ++++++++ db/migrate/20140306202217_create_tournament_options.rb | 8 ++++++++ db/migrate/20140306202219_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140306202222_create_user_tournament_pairs.rb | 10 ++++++++++ db/migrate/20140306202224_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140306202232_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 12 +++++++++++- generate.sh | 4 +++- test/fixtures/user_tournament_pairs.yml | 9 +++++++++ test/models/user_tournament_pair_test.rb | 7 +++++++ 36 files changed, 190 insertions(+), 148 deletions(-) create mode 100644 app/models/user_tournament_pair.rb delete mode 100644 db/migrate/20140306024707_create_servers.rb delete mode 100644 db/migrate/20140306024709_create_tournaments.rb delete mode 100644 db/migrate/20140306024711_create_matches.rb delete mode 100644 db/migrate/20140306024713_create_teams.rb delete mode 100644 db/migrate/20140306024715_create_alerts.rb delete mode 100644 db/migrate/20140306024718_create_pms.rb delete mode 100644 db/migrate/20140306024720_create_games.rb delete mode 100644 db/migrate/20140306024722_create_users.rb delete mode 100644 db/migrate/20140306024724_create_sessions.rb delete mode 100644 db/migrate/20140306024727_create_game_attributes.rb delete mode 100644 db/migrate/20140306024729_create_server_settings.rb delete mode 100644 db/migrate/20140306024731_create_user_team_pairs.rb delete mode 100644 db/migrate/20140306024733_create_team_match_pairs.rb delete mode 100644 db/migrate/20140306024735_create_tournament_options.rb delete mode 100644 db/migrate/20140306024744_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140306202154_create_servers.rb create mode 100644 db/migrate/20140306202156_create_tournaments.rb create mode 100644 db/migrate/20140306202158_create_matches.rb create mode 100644 db/migrate/20140306202200_create_teams.rb create mode 100644 db/migrate/20140306202202_create_alerts.rb create mode 100644 db/migrate/20140306202204_create_pms.rb create mode 100644 db/migrate/20140306202207_create_games.rb create mode 100644 db/migrate/20140306202209_create_users.rb create mode 100644 db/migrate/20140306202211_create_sessions.rb create mode 100644 db/migrate/20140306202213_create_game_attributes.rb create mode 100644 db/migrate/20140306202215_create_server_settings.rb create mode 100644 db/migrate/20140306202217_create_tournament_options.rb create mode 100644 db/migrate/20140306202219_create_user_team_pairs.rb create mode 100644 db/migrate/20140306202222_create_user_tournament_pairs.rb create mode 100644 db/migrate/20140306202224_create_team_match_pairs.rb create mode 100644 db/migrate/20140306202232_add_hidden_attrs_to_user.rb create mode 100644 test/fixtures/user_tournament_pairs.yml create mode 100644 test/models/user_tournament_pair_test.rb diff --git a/app/models/user_tournament_pair.rb b/app/models/user_tournament_pair.rb new file mode 100644 index 0000000..b2676e5 --- /dev/null +++ b/app/models/user_tournament_pair.rb @@ -0,0 +1,4 @@ +class UserTournamentPair < ActiveRecord::Base + belongs_to :user + belongs_to :tournament +end diff --git a/db/migrate/20140306024707_create_servers.rb b/db/migrate/20140306024707_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140306024707_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/20140306024709_create_tournaments.rb b/db/migrate/20140306024709_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140306024709_create_tournaments.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024711_create_matches.rb b/db/migrate/20140306024711_create_matches.rb deleted file mode 100644 index 325863d..0000000 --- a/db/migrate/20140306024711_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/20140306024713_create_teams.rb b/db/migrate/20140306024713_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140306024713_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024715_create_alerts.rb b/db/migrate/20140306024715_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140306024715_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/20140306024718_create_pms.rb b/db/migrate/20140306024718_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140306024718_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/20140306024720_create_games.rb b/db/migrate/20140306024720_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140306024720_create_games.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :players_per_team - t.integer :teams_per_match - t.integer :set_rounds - t.integer :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024722_create_users.rb b/db/migrate/20140306024722_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140306024722_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/20140306024724_create_sessions.rb b/db/migrate/20140306024724_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140306024724_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/20140306024727_create_game_attributes.rb b/db/migrate/20140306024727_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140306024727_create_game_attributes.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateGameAttributes < ActiveRecord::Migration - def change - create_table :game_attributes do |t| - t.references :game, index: true - t.text :key - t.integer :type - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024729_create_server_settings.rb b/db/migrate/20140306024729_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140306024729_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/20140306024731_create_user_team_pairs.rb b/db/migrate/20140306024731_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140306024731_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/20140306024733_create_team_match_pairs.rb b/db/migrate/20140306024733_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140306024733_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/20140306024735_create_tournament_options.rb b/db/migrate/20140306024735_create_tournament_options.rb deleted file mode 100644 index d2df22e..0000000 --- a/db/migrate/20140306024735_create_tournament_options.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentOptions < ActiveRecord::Migration - def change - create_table :tournament_options do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024744_add_hidden_attrs_to_user.rb b/db/migrate/20140306024744_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140306024744_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/20140306202154_create_servers.rb b/db/migrate/20140306202154_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140306202154_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/20140306202156_create_tournaments.rb b/db/migrate/20140306202156_create_tournaments.rb new file mode 100644 index 0000000..36fcf7e --- /dev/null +++ b/db/migrate/20140306202156_create_tournaments.rb @@ -0,0 +1,9 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306202158_create_matches.rb b/db/migrate/20140306202158_create_matches.rb new file mode 100644 index 0000000..325863d --- /dev/null +++ b/db/migrate/20140306202158_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/20140306202200_create_teams.rb b/db/migrate/20140306202200_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140306202200_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140306202202_create_alerts.rb b/db/migrate/20140306202202_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140306202202_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/20140306202204_create_pms.rb b/db/migrate/20140306202204_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140306202204_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/20140306202207_create_games.rb b/db/migrate/20140306202207_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140306202207_create_games.rb @@ -0,0 +1,13 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :players_per_team + t.integer :teams_per_match + t.integer :set_rounds + t.integer :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140306202209_create_users.rb b/db/migrate/20140306202209_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140306202209_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/20140306202211_create_sessions.rb b/db/migrate/20140306202211_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140306202211_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/20140306202213_create_game_attributes.rb b/db/migrate/20140306202213_create_game_attributes.rb new file mode 100644 index 0000000..b63f134 --- /dev/null +++ b/db/migrate/20140306202213_create_game_attributes.rb @@ -0,0 +1,11 @@ +class CreateGameAttributes < ActiveRecord::Migration + def change + create_table :game_attributes do |t| + t.references :game, index: true + t.text :key + t.integer :type + + t.timestamps + end + end +end diff --git a/db/migrate/20140306202215_create_server_settings.rb b/db/migrate/20140306202215_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140306202215_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/20140306202217_create_tournament_options.rb b/db/migrate/20140306202217_create_tournament_options.rb new file mode 100644 index 0000000..d2df22e --- /dev/null +++ b/db/migrate/20140306202217_create_tournament_options.rb @@ -0,0 +1,8 @@ +class CreateTournamentOptions < ActiveRecord::Migration + def change + create_table :tournament_options do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140306202219_create_user_team_pairs.rb b/db/migrate/20140306202219_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140306202219_create_user_team_pairs.rb @@ -0,0 +1,10 @@ +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/20140306202222_create_user_tournament_pairs.rb b/db/migrate/20140306202222_create_user_tournament_pairs.rb new file mode 100644 index 0000000..9885b20 --- /dev/null +++ b/db/migrate/20140306202222_create_user_tournament_pairs.rb @@ -0,0 +1,10 @@ +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/20140306202224_create_team_match_pairs.rb b/db/migrate/20140306202224_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140306202224_create_team_match_pairs.rb @@ -0,0 +1,10 @@ +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/20140306202232_add_hidden_attrs_to_user.rb b/db/migrate/20140306202232_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140306202232_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/db/schema.rb b/db/schema.rb index b0d0766..3a0ce17 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: 20140306024744) do +ActiveRecord::Schema.define(version: 20140306202232) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -118,6 +118,16 @@ ActiveRecord::Schema.define(version: 20140306024744) do add_index "user_team_pairs", ["team_id"], name: "index_user_team_pairs_on_team_id" add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id" + create_table "user_tournament_pairs", force: true do |t| + t.integer "user_id" + t.integer "tournament_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "user_tournament_pairs", ["tournament_id"], name: "index_user_tournament_pairs_on_tournament_id" + add_index "user_tournament_pairs", ["user_id"], name: "index_user_tournament_pairs_on_user_id" + create_table "users", force: true do |t| t.string "name" t.string "email" diff --git a/generate.sh b/generate.sh index fcd962f..aca13bb 100755 --- a/generate.sh +++ b/generate.sh @@ -30,9 +30,11 @@ bundle exec rails generate scaffold session user:references # Just models bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST bundle exec rails generate model server_settings $NOTEST +bundle exec rails generate model tournament_option $NOTEST + 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 -bundle exec rails generate model tournament_option $NOTEST # Just controllers bundle exec rails generate controller search $NOTEST diff --git a/test/fixtures/user_tournament_pairs.yml b/test/fixtures/user_tournament_pairs.yml new file mode 100644 index 0000000..974ee71 --- /dev/null +++ b/test/fixtures/user_tournament_pairs.yml @@ -0,0 +1,9 @@ +# 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/user_tournament_pair_test.rb b/test/models/user_tournament_pair_test.rb new file mode 100644 index 0000000..6167ff6 --- /dev/null +++ b/test/models/user_tournament_pair_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTournamentPairTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3