Simplify permissions check.

[rails.git] / db / migrate / 20160822153055_create_issues_and_reports.rb

diff --git a/db/migrate/20160822153055_create_issues_and_reports.rb b/db/migrate/20160822153055_create_issues_and_reports.rb
index a66b22d25394e100355dcffc7ecfcf561c7ae6b2..4361c95285aa8bb2ed5687d8c41651c79111264d 100644 (file)
--- a/db/migrate/20160822153055_create_issues_and_reports.rb
+++ b/db/migrate/20160822153055_create_issues_and_reports.rb
@@ -5,7 +5,7 @@ class CreateIssuesAndReports < ActiveRecord::Migration[5.0]
       t.integer :reportable_id, :null => false
       t.integer :reported_user_id, :null => false
       t.integer :status
       t.integer :reportable_id, :null => false
       t.integer :reported_user_id, :null => false
       t.integer :status

-      t.string :issue_type
+      t.column :assigned_role, :user_role_enum, :null => false

       t.datetime :resolved_at
       t.integer :resolved_by
       t.integer :updated_by
       t.datetime :resolved_at
       t.integer :resolved_by
       t.integer :updated_by


@@ -22,28 +22,29 @@ class CreateIssuesAndReports < ActiveRecord::Migration[5.0]
 
     create_table :reports do |t|
       t.integer :issue_id
 
     create_table :reports do |t|
       t.integer :issue_id

-      t.integer :reporter_user_id
+      t.integer :user_id

       t.text :details, :null => false
       t.text :details, :null => false

+      t.string :category, :null => false

       t.timestamps :null => false
     end
 
     add_foreign_key :reports, :issues, :name => "reports_issue_id_fkey", :on_delete => :cascade
       t.timestamps :null => false
     end
 
     add_foreign_key :reports, :issues, :name => "reports_issue_id_fkey", :on_delete => :cascade

-    add_foreign_key :reports, :users, :column => :reporter_user_id, :name => "reports_reporter_user_id_fkey", :on_delete => :cascade
+    add_foreign_key :reports, :users, :column => :user_id, :name => "reports_user_id_fkey", :on_delete => :cascade

 
 

-    add_index :reports, :reporter_user_id
+    add_index :reports, :user_id

     add_index :reports, :issue_id
 
     create_table :issue_comments do |t|
       t.integer :issue_id, :null => false
     add_index :reports, :issue_id
 
     create_table :issue_comments do |t|
       t.integer :issue_id, :null => false

-      t.integer :commenter_user_id, :null => false
+      t.integer :user_id, :null => false

       t.text :body, :null => false
       t.timestamps :null => false
     end
 
     add_foreign_key :issue_comments, :issues, :name => "issue_comments_issue_id_fkey", :on_delete => :cascade
       t.text :body, :null => false
       t.timestamps :null => false
     end
 
     add_foreign_key :issue_comments, :issues, :name => "issue_comments_issue_id_fkey", :on_delete => :cascade

-    add_foreign_key :issue_comments, :users, :column => :commenter_user_id, :name => "issue_comments_commenter_user_id", :on_delete => :cascade
+    add_foreign_key :issue_comments, :users, :column => :user_id, :name => "issue_comments_user_id", :on_delete => :cascade

 
 

-    add_index :issue_comments, :commenter_user_id
+    add_index :issue_comments, :user_id

     add_index :issue_comments, :issue_id
   end
 end
     add_index :issue_comments, :issue_id
   end
 end