Merge branch 'master' into page

db/migrate/20180829122818_create_chat_rooms.rb

@@ -0,0 +1,8 @@
+class CreateChatRooms < ActiveRecord::Migration[5.2]
+  def change
+    create_table :chat_rooms do |t|
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20180829122930_create_chat_room_participations.rb

@@ -0,0 +1,10 @@
+class CreateChatRoomParticipations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :chat_room_participations do |t|
+      t.references :user, foreign_key: true
+      t.references :chat_room, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20180829123049_create_requests.rb

@@ -0,0 +1,11 @@
+class CreateRequests < ActiveRecord::Migration[5.2]
+  def change
+    create_table :requests do |t|
+      t.references :user, foreign_key: true
+      t.references :chat_room, foreign_key: true
+      t.boolean :accepted
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20180829123204_change_column_in_requests.rb

@@ -0,0 +1,5 @@
+class ChangeColumnInRequests < ActiveRecord::Migration[5.2]
+  def change
+    change_column :requests, :accepted, :boolean, default: false
+  end
+end

db/schema.rb

@@ -10,11 +10,25 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_08_29_105638) do
+ActiveRecord::Schema.define(version: 2018_08_29_123204) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "chat_room_participations", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "chat_room_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["chat_room_id"], name: "index_chat_room_participations_on_chat_room_id"
+    t.index ["user_id"], name: "index_chat_room_participations_on_user_id"
+  end
+
+  create_table "chat_rooms", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "connections", force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "contact_id"
@@ -22,6 +36,16 @@ ActiveRecord::Schema.define(version: 2018_08_29_105638) do
     t.index ["user_id"], name: "index_connections_on_user_id"
   end
 
+  create_table "requests", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "chat_room_id"
+    t.boolean "accepted", default: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["chat_room_id"], name: "index_requests_on_chat_room_id"
+    t.index ["user_id"], name: "index_requests_on_user_id"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
@@ -37,6 +61,10 @@ ActiveRecord::Schema.define(version: 2018_08_29_105638) do
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "chat_room_participations", "chat_rooms"
+  add_foreign_key "chat_room_participations", "users"
   add_foreign_key "connections", "users"
   add_foreign_key "connections", "users", column: "contact_id"
+  add_foreign_key "requests", "chat_rooms"
+  add_foreign_key "requests", "users"
 end