Merge branch 'master' into client-routesv2

db/migrate/20170205163247_create_exercise_collections.rb

@@ -0,0 +1,14 @@
+class CreateExerciseCollections < ActiveRecord::Migration
+  def change
+    create_table :exercise_collections do |t|
+      t.string :name
+      t.timestamps
+    end
+
+    create_table :exercise_collections_exercises, id: false do |t|
+      t.belongs_to :exercise_collection, index: true
+      t.belongs_to :exercise, index: true
+    end
+
+  end
+end

db/migrate/20170205165450_create_proxy_exercises.rb

@@ -0,0 +1,23 @@
+class CreateProxyExercises < ActiveRecord::Migration
+  def change
+    create_table :proxy_exercises do |t|
+      t.string :title
+      t.string :description
+      t.string :token
+      t.timestamps
+    end
+
+    create_table :exercises_proxy_exercises, id: false do |t|
+      t.belongs_to :proxy_exercise, index: true
+      t.belongs_to :exercise, index: true
+      t.timestamps
+    end
+
+    create_table :user_proxy_exercise_exercises do |t|
+      t.belongs_to :user, polymorphic: true, index: true
+      t.belongs_to :proxy_exercise, index: true
+      t.belongs_to :exercise, index: true
+      t.timestamps
+    end
+  end
+end

db/migrate/20170205210357_create_interventions.rb

@@ -0,0 +1,23 @@
+class CreateInterventions < ActiveRecord::Migration
+  def change
+    create_table :user_exercise_interventions do |t|
+      t.belongs_to :user, polymorphic: true
+      t.belongs_to :exercise
+      t.belongs_to :intervention
+      t.integer :accumulated_worktime_s
+      t.text :reason
+      t.timestamps
+    end
+
+    create_table :interventions do |t|
+      t.string :name
+      t.text :markup
+      t.timestamps
+    end
+
+    Intervention.createDefaultInterventions
+
+  end
+
+
+end

db/migrate/20170206141210_add_tags.rb

@@ -0,0 +1,19 @@
+class AddTags < ActiveRecord::Migration
+
+  def change
+    add_column :exercises, :expected_worktime_seconds, :integer, default: 60
+    add_column :exercises, :expected_difficulty, :integer, default: 1
+
+    create_table :tags do |t|
+      t.string :name, null: false
+      t.timestamps
+    end
+
+    create_table :exercise_tags do |t|
+      t.belongs_to :exercise
+      t.belongs_to :tag
+      t.integer :factor, default: 1
+    end
+  end
+
+end

db/migrate/20170206152503_add_user_feedback.rb

@@ -0,0 +1,11 @@
+class AddUserFeedback < ActiveRecord::Migration
+  def change
+    create_table :user_exercise_feedbacks do |t|
+      t.belongs_to :exercise, null: false
+      t.belongs_to :user, polymorphic: true, null: false
+      t.integer :difficulty
+      t.integer :working_time_seconds
+      t.string :feedback_text
+    end
+  end
+end

db/migrate/20170228165741_add_search.rb

@@ -0,0 +1,10 @@
+class AddSearch < ActiveRecord::Migration
+  def change
+    create_table :searches do |t|
+      t.belongs_to :exercise, null: false
+      t.belongs_to :user, polymorphic: true, null: false
+      t.string :search
+      t.timestamps
+    end
+  end
+end

db/migrate/20170321150454_add_reason_to_user_proxy_exercise_exercise.rb

@@ -0,0 +1,7 @@
+class AddReasonToUserProxyExerciseExercise < ActiveRecord::Migration
+  def change
+    change_table :user_proxy_exercise_exercises do |t|
+      t.string :reason
+    end
+  end
+end

db/migrate/20170323130756_add_index_to_submissions.rb

@@ -0,0 +1,6 @@
+class AddIndexToSubmissions < ActiveRecord::Migration
+  def change
+    add_index :submissions, :exercise_id
+    add_index :submissions, :user_id
+  end
+end

db/migrate/20170403162848_set_default_for_request_for_comment_solved.rb

@@ -0,0 +1,6 @@
+class SetDefaultForRequestForCommentSolved < ActiveRecord::Migration
+  def change
+    change_column_default :request_for_comments, :solved, false
+    RequestForComment.where(solved: nil).update_all(solved: false)
+  end
+end

db/migrate/20170411090543_improve_user_feedback.rb

@@ -0,0 +1,5 @@
+class ImproveUserFeedback < ActiveRecord::Migration
+  def change
+    add_column :user_exercise_feedbacks, :user_estimated_worktime, :integer
+  end
+end

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: 20161214144837) do
+ActiveRecord::Schema.define(version: 20170403162848) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -76,22 +76,54 @@ ActiveRecord::Schema.define(version: 20161214144837) do
     t.boolean  "network_enabled"
   end
 
+  create_table "exercise_collections", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "exercise_collections_exercises", id: false, force: :cascade do |t|
+    t.integer "exercise_collection_id"
+    t.integer "exercise_id"
+  end
+
+  add_index "exercise_collections_exercises", ["exercise_collection_id"], name: "index_exercise_collections_exercises_on_exercise_collection_id", using: :btree
+  add_index "exercise_collections_exercises", ["exercise_id"], name: "index_exercise_collections_exercises_on_exercise_id", using: :btree
+
+  create_table "exercise_tags", force: :cascade do |t|
+    t.integer "exercise_id"
+    t.integer "tag_id"
+    t.integer "factor",      default: 0
+  end
+
   create_table "exercises", force: :cascade do |t|
     t.text     "description"
     t.integer  "execution_environment_id"
-    t.string   "title",                    limit: 255
+    t.string   "title",                     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "user_id"
     t.text     "instructions"
     t.boolean  "public"
-    t.string   "user_type",                limit: 255
-    t.string   "token",                    limit: 255
+    t.string   "user_type",                 limit: 255
+    t.string   "token",                     limit: 255
     t.boolean  "hide_file_tree"
     t.boolean  "allow_file_creation"
-    t.boolean  "allow_auto_completion",                default: false
+    t.boolean  "allow_auto_completion",                 default: false
+    t.integer  "expected_worktime_seconds",             default: 0
+    t.integer  "expected_difficulty",                   default: 1
   end
 
+  create_table "exercises_proxy_exercises", id: false, force: :cascade do |t|
+    t.integer  "proxy_exercise_id"
+    t.integer  "exercise_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "exercises_proxy_exercises", ["exercise_id"], name: "index_exercises_proxy_exercises_on_exercise_id", using: :btree
+  add_index "exercises_proxy_exercises", ["proxy_exercise_id"], name: "index_exercises_proxy_exercises_on_proxy_exercise_id", using: :btree
+
   create_table "external_users", force: :cascade do |t|
     t.integer  "consumer_id"
     t.string   "email",       limit: 255
@@ -182,11 +214,26 @@ ActiveRecord::Schema.define(version: 20161214144837) do
   add_index "internal_users", ["remember_me_token"], name: "index_internal_users_on_remember_me_token", using: :btree
   add_index "internal_users", ["reset_password_token"], name: "index_internal_users_on_reset_password_token", using: :btree
 
+  create_table "interventions", force: :cascade do |t|
+    t.string   "name"
+    t.text     "markup"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "lti_parameters", force: :cascade do |t|
-    t.string   "external_user_id"
+    t.integer  "external_users_id"
     t.integer  "consumers_id"
     t.integer  "exercises_id"
-    t.jsonb    "lti_parameters",   default: {}, null: false
+    t.jsonb    "lti_parameters",    default: {}, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "proxy_exercises", force: :cascade do |t|
+    t.string   "title"
+    t.string   "description"
+    t.string   "token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -200,17 +247,26 @@ ActiveRecord::Schema.define(version: 20161214144837) do
   end
 
   create_table "request_for_comments", force: :cascade do |t|
-    t.integer  "user_id",                   null: false
-    t.integer  "exercise_id",               null: false
-    t.integer  "file_id",                   null: false
+    t.integer  "user_id",                                   null: false
+    t.integer  "exercise_id",                               null: false
+    t.integer  "file_id",                                   null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "user_type",     limit: 255
     t.text     "question"
-    t.boolean  "solved"
+    t.boolean  "solved",                    default: false
     t.integer  "submission_id"
   end
 
+  create_table "searches", force: :cascade do |t|
+    t.integer  "exercise_id", null: false
+    t.integer  "user_id",     null: false
+    t.string   "user_type",   null: false
+    t.string   "search"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "submissions", force: :cascade do |t|
     t.integer  "exercise_id"
     t.float    "score"
@@ -221,6 +277,15 @@ ActiveRecord::Schema.define(version: 20161214144837) do
     t.string   "user_type",   limit: 255
   end
 
+  add_index "submissions", ["exercise_id"], name: "index_submissions_on_exercise_id", using: :btree
+  add_index "submissions", ["user_id"], name: "index_submissions_on_user_id", using: :btree
+
+  create_table "tags", force: :cascade do |t|
+    t.string   "name",       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "testruns", force: :cascade do |t|
     t.boolean  "passed"
     t.text     "output"
@@ -230,4 +295,36 @@ ActiveRecord::Schema.define(version: 20161214144837) do
     t.datetime "updated_at"
   end
 
+  create_table "user_exercise_feedbacks", force: :cascade do |t|
+    t.integer "exercise_id",          null: false
+    t.integer "user_id",              null: false
+    t.string  "user_type",            null: false
+    t.integer "difficulty"
+    t.integer "working_time_seconds"
+    t.string  "feedback_text"
+  end
+
+  create_table "user_exercise_interventions", force: :cascade do |t|
+    t.integer  "user_id"
+    t.string   "user_type"
+    t.integer  "exercise_id"
+    t.integer  "intervention_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "user_proxy_exercise_exercises", force: :cascade do |t|
+    t.integer  "user_id"
+    t.string   "user_type"
+    t.integer  "proxy_exercise_id"
+    t.integer  "exercise_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "reason"
+  end
+
+  add_index "user_proxy_exercise_exercises", ["exercise_id"], name: "index_user_proxy_exercise_exercises_on_exercise_id", using: :btree
+  add_index "user_proxy_exercise_exercises", ["proxy_exercise_id"], name: "index_user_proxy_exercise_exercises_on_proxy_exercise_id", using: :btree
+  add_index "user_proxy_exercise_exercises", ["user_type", "user_id"], name: "index_user_proxy_exercise_exercises_on_user_type_and_user_id", using: :btree
+
 end