From 2bafe9102c7bc696262cd14ec60e6c47712b0fb4 Mon Sep 17 00:00:00 2001
From: Sorrel Bri <sorrel@SBJ-comp.local>
Date: Tue, 8 Oct 2019 16:56:28 -0700
Subject: [PATCH] add room endpoints

---
 api/api.py                 | 22 ++++++++++++++++++----
 api/rooms/room.py          |  7 -------
 api/rooms/room_endpoint.py |  9 +++++++++
 websockets/socket.py       | 12 ++++++++++--
 4 files changed, 37 insertions(+), 13 deletions(-)
 delete mode 100644 api/rooms/room.py
 create mode 100644 api/rooms/room_endpoint.py

diff --git a/api/api.py b/api/api.py
index 78efbbb..3a88fc3 100644
--- a/api/api.py
+++ b/api/api.py
@@ -1,5 +1,6 @@
 from flask import Blueprint, request, jsonify, session
 from .users.user_endpoint import UserEndpoint
+from .users.room_endpoint import RoomEndpoint
 
 api = Blueprint('api', __name__, url_prefix='/api')
 
@@ -8,10 +9,23 @@ def api_home():
     response = {"message": "home page"}
     return jsonify(response)
 
-@api.route('/users')
-def api_users():
+@api.route('/users', methods=['GET'])
+def api_get_users():
     return jsonify(UserEndpoint.users())
 
-@api.route('/user')
-def api_user():
+@api.route('/user', methods=['GET'])
+def api_get_user():
     return jsonify(UserEndpoint.user())
+
+@api.route('/rooms', methods=['GET'])
+def api_get_rooms():
+    return RoomEndpoint.get_rooms()
+
+@api.route('/room', methods=['GET'])
+def api_get_room():
+    return RoomEndpoint.get_room()
+
+# protected route
+@api.route('/room', methods=['POST'])
+def api_post_room():
+    return pass
\ No newline at end of file
diff --git a/api/rooms/room.py b/api/rooms/room.py
deleted file mode 100644
index 13081d1..0000000
--- a/api/rooms/room.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from flask import Blueprint
-
-room = Blueprint('rooms', __name__)
-
-@room.route('/<int:room_id>')
-def func():
-    pass
\ No newline at end of file
diff --git a/api/rooms/room_endpoint.py b/api/rooms/room_endpoint.py
new file mode 100644
index 0000000..5ba537d
--- /dev/null
+++ b/api/rooms/room_endpoint.py
@@ -0,0 +1,9 @@
+from models.User import User, user_schema, users_schema
+from models.Room import Room
+from flask import request, jsonify, Response, json
+
+class RoomEndpoint(object):
+    def get_rooms():
+        pass
+    def get_room():
+        pass
\ No newline at end of file
diff --git a/websockets/socket.py b/websockets/socket.py
index 5de2d8c..12c5e9d 100644
--- a/websockets/socket.py
+++ b/websockets/socket.py
@@ -9,9 +9,17 @@ def handle_connection():
     
     cool
     ''')
-    send({'data':'connection'})
+    emit('message', {'data':'connection'})
 
 @socketio.on('message')
 def handle_message(message):
     print(message)
-    emit('message return', {'data':'a message was sent'})
\ No newline at end of file
+    emit('message return', {'message':'a message was sent'}, broadcast=True)
+
+@socketio.on('connect', namespace='/newroom')
+def handle_connection():
+    print('''
+
+    look cool a namespaced socketio connection!
+
+    ''')
\ No newline at end of file