Skip to content

Commit

Permalink
Merge pull request #31429 from code-dot-org/lets-make-this-table
Browse files Browse the repository at this point in the history
Create UserLevelInfo Table
  • Loading branch information
dmcavoy committed Oct 29, 2019
2 parents 35b72c0 + a7ea285 commit 217fd8f
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 1 deletion.
11 changes: 11 additions & 0 deletions dashboard/app/models/user_level_info.rb
@@ -0,0 +1,11 @@
# == Schema Information
#
# Table name: user_level_infos
#
# id :integer not null, primary key
# time_spent :integer default(0)
# user_level_id :integer unsigned
#

class UserLevelInfo < ApplicationRecord
end
@@ -0,0 +1,8 @@
class CreateUserLevelInfos < ActiveRecord::Migration[5.0]
def change
create_table :user_level_infos do |t|
t.integer :time_spent, default: 0
t.bigint :user_level_id, unsigned: true
end
end
end
7 changes: 6 additions & 1 deletion dashboard/db/schema.rb
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20190904030041) do
ActiveRecord::Schema.define(version: 20191023192120) do

create_table "activities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
t.integer "user_id"
Expand Down Expand Up @@ -1432,6 +1432,11 @@
t.index ["user_id"], name: "index_user_geos_on_user_id", using: :btree
end

create_table "user_level_infos", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
t.integer "time_spent", default: 0
t.bigint "user_level_id", unsigned: true
end

create_table "user_levels", id: :bigint, unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
t.integer "user_id", null: false
t.integer "level_id", null: false
Expand Down
5 changes: 5 additions & 0 deletions dashboard/test/factories/factories.rb
Expand Up @@ -1214,4 +1214,9 @@
association :level
association :script_level
end

factory :user_level_info do
time_spent 10
user_level_id 1
end
end
9 changes: 9 additions & 0 deletions dashboard/test/models/user_level_info_test.rb
@@ -0,0 +1,9 @@
require 'test_helper'

class UserLevelInfoTest < ActiveSupport::TestCase
test "can create user_level_info" do
user_level_info = create :user_level_info
assert_equal user_level_info.user_level_id, 1
assert_equal user_level_info.time_spent, 10
end
end

0 comments on commit 217fd8f

Please sign in to comment.