Merge pull request #28 from borkinc/message_replies

Quick fix API

DAO/MessageDAO.py

@@ -13,8 +13,8 @@ def get_all_messages(self):
         cursor = self.get_cursor()
         query = 'WITH like_count AS (SELECT mid, COUNT(*) AS likes FROM vote WHERE upvote = TRUE GROUP BY mid), ' \
                 'dislike_count AS (SELECT mid, COUNT(*) as dislikes FROM vote WHERE upvote = FALSE GROUP BY mid) ' \
-                'SELECT messages.mid, cid, message, image, COALESCE(likes, 0) as likes, COALESCE(dislikes, 0) ' \
-                'as dislikes, username, ' \
+                'SELECT messages.mid, users.uid, cid, message, image, COALESCE(likes, 0) as likes, ' \
+                'COALESCE(dislikes, 0) as dislikes, username, ' \
                 'messages.created_on FROM messages LEFT OUTER JOIN like_count ON messages.mid = like_count.mid ' \
                 'LEFT OUTER JOIN dislike_count ON messages.mid = dislike_count.mid ' \
                 'LEFT OUTER JOIN photo ON messages.mid = photo.mid INNER JOIN users on messages.uid = users.uid ' \

app.py

@@ -80,7 +80,6 @@ def num_of_dislikes_photos(pid):
 api.add_resource(Chats, '/chats')
 api.add_resource(Chat, '/chats/<int:cid>')
 api.add_resource(ChatMembers, '/chats/<int:cid>/members')
-api.add_resource(ChatOwner, '/chats/<int:cid>/owner')
 api.add_resource(Contacts, '/contacts')
 api.add_resource(Contact, '/contacts/<int:uid>')
 api.add_resource(ChatMessages, '/chats/<int:chat_id>/messages')