Merge branch 'master' into page

app/models/chat_room.rb

@@ -0,0 +1,5 @@
+class ChatRoom < ApplicationRecord
+  has_many :chat_room_participations
+  has_many :users, through: :chat_room_participations
+  has_many :requests
+end

app/models/chat_room_participation.rb

@@ -0,0 +1,4 @@
+class ChatRoomParticipation < ApplicationRecord
+  belongs_to :user
+  belongs_to :chat_room
+end

app/models/connection.rb

@@ -8,7 +8,7 @@ class Connection < ApplicationRecord
 
   def create_inverted_connection
     unless Connection.where('user_id = ? and contact_id = ?', self.contact.id, self.user.id).length > 0
-      Connection.create!(user: self.contact, contact: self.user)
+      inverted = Connection.create!(user: self.contact, contact: self.user)
     end
   end
 end

app/models/request.rb

@@ -0,0 +1,4 @@
+class Request < ApplicationRecord
+  belongs_to :user
+  belongs_to :chat_room
+end

app/models/user.rb

@@ -6,6 +6,9 @@ class User < ApplicationRecord
          :recoverable, :rememberable, :validatable
 
   has_many :connections
+  has_many :chat_room_participations
+  has_many :chat_rooms, through: :chat_room_participations
+  has_many :requests
 
   mount_uploader :photo, PhotoUploader