cafe-grader-web Commit - r268:5fffb74cc182

cafe-grader-web

Commit `r268:5fffb74cc182` public

parent | child

Description:

created join tables for contests and users and problems

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r268:5fffb74cc182 - Tue, 16 Feb 2010 17:51:02 - 6 files changed: 42 inserted, 1 deleted

db/migrate/20100216162324_create_contests_users_join_table.rb created 644 ¶ +12

@@ -0,0 +1,12
	1	+ class CreateContestsUsersJoinTable < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :contests_users, :id => false do \|t\|
	4	+ t.integer :contest_id
	5	+ t.integer :user_id
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :contests_users
	11	+ end
	12	+ end

db/migrate/20100216162940_create_contests_problems_join_table.rb created 644 ¶ +12

@@ -0,0 +1,12
	1	+ class CreateContestsProblemsJoinTable < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :contests_problems, :id => false do \|t\|
	4	+ t.integer :contest_id
	5	+ t.integer :problem_id
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :contests_problems
	11	+ end
	12	+ end

app/models/contest.rb ¶ +4

@@ -1,2 +1,6
1	class Contest < ActiveRecord::Base	1	class Contest < ActiveRecord::Base
		2	+
		3	+ has_and_belongs_to_many :users
		4	+ has_and_belongs_to_many :problems
		5	+
2	end	6	end

app/models/problem.rb ¶ +1

               class Problem < ActiveRecord::Base
                 belongs_to :description
+            +   has_and_belongs_to_many :contests
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true

app/models/user.rb ¶ +2

               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 has_many :test_requests, :order => "submitted_at DESC"
                 has_many :messages,
                          :class_name => "Message",
                          :foreign_key => "sender_id",
                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
+            +   has_and_belongs_to_many :contests
+            +
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now

db/schema.rb ¶ +11 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100216105730) do
+            + ActiveRecord::Schema.define(:version => 20100216162940) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
                 create_table "codejom_statuses", :force => true do |t|
                   t.integer  "user_id"
                   t.boolean  "alive"
                   t.integer  "num_problems_passed"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.text     "description"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
+            +   create_table "contests_problems", :id => false, :force => true do |t|
+            +     t.integer "contest_id"
+            +     t.integer "problem_id"
+            +   end
+            +
+            +   create_table "contests_users", :id => false, :force => true do |t|
+            +     t.integer "contest_id"
+            +     t.integer "user_id"
+            +   end
+            +
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r268:5fffb74cc182 - Tue, 16 Feb 2010 17:51:02 - 6 files changed: 42 inserted, 1 deleted

Sign in to your account

Commit r268:5fffb74cc182 public

Author

r268:5fffb74cc182 - Tue, 16 Feb 2010 17:51:02 - 6 files changed: 42 inserted, 1 deleted

Commit `r268:5fffb74cc182` public