Feature/fixcosmosdb

CONTRIBUTORS.md

@@ -0,0 +1,11 @@
+In no particular order...
+
+Ada Taylor '16
+Luke O'Malley '14
+Lars Johnson '15
+Allen Park '15
+Amol Bhave '17
+Tim Wilczynski '14
+Jesse Orlowski '16
+Cosmos Darwin '15
+Will Oursler '15

src/rooms/rooms.py

@@ -1,25 +1,33 @@
 #!/usr/bin/python
 
 # Setup flask basics.
+from ..utils import db
 from flask import Flask, jsonify
 app = Flask(__name__)
 
-import cosmos_db
 
 @app.route('/')
 def serve_rooms():
-	roomnums = [ room.num for room in cosmos_db.allRooms ]
+	room_db = db.init('room')
+	rooms = room_db.query(db.Room).all()
+	roomnums = [ room.num for room in rooms ]
 	return jsonify( rooms = roomnums )
 
 @app.route('/<roomnum>/')
 def serve_room( roomnum ):
-	room = cosmos_db.find( roomnum )
+	room_db = db.init('room')
+	room = room_db.query(db.Room).get(roomnum)
+
 	return jsonify(
 		roomnum = room.num,
-		grt = room.grt,
-		capacity = room.capacity,
-		sq_ft = room.size,
-		side = room.view )
+		type = room.type,
+		size = room.size,
+		view = room.view,
+		X = room.X,
+		Y = room.Y,
+		hasCurvyWall = room.hasCurvyWall,
+		bathroom = room.bathroom
+	)
 
 if __name__ == "__main__":
 	app.debug = True # TODO: Remove in production.

src/utils/db/Makefile

@@ -9,9 +9,11 @@ init-db:
 	@# TODO: List from db.py?
 	python db.py init user
 	python db.py init group
+	python db.py init room
 
 populate-db:
-	python authcore_setup.py
+	python init_auth.py
+	python init_rooms.py
 
 # Remove all runtime based information.
 # Should return the repo to a "source-only" state.

src/utils/db/authcore_setup.py

@@ -5,25 +5,3 @@
 
 from db import *
 
-user_db = init('user')
-user = user_db.query(User).get( 'admin' )
-if user:
-	exit()
-newuser = User()
-newuser.username = 'admin'
-newuser.salt = base64.b64encode( os.urandom(128) )
-newuser.passhash = pbkdf2.PBKDF2( 'password', newuser.salt ).hexread(32)
-user_db.add( newuser )
-user_db.commit()
-
-group_db = init('group')
-group = group_db.query(Group).get( 'accounts-admin' )
-if group:
-	exit()
-newgroup = Group()
-newgroup.groupname = 'accounts-admin'
-newgroup.owner = 'accounts-admin'
-newgroup.immediate_members = json.dumps(['admin'])
-newgroup.subgroups = json.dumps([])
-group_db.add( newgroup )
-group_db.commit()

src/utils/db/db.py

@@ -9,6 +9,7 @@
 
 UserBase = declarative_base()
 GroupBase = declarative_base()
+RoomBase = declarative_base()
 
 class User(UserBase):
 	__tablename__= "user"
@@ -24,6 +25,21 @@ class Group(GroupBase):
 	immediate_members = Column(String(512))
 	subgroups = Column(String(512))
 
+class Room(RoomBase):
+	__tablename__ = "room"
+	num = Column(String, primary_key=True)
+	type = Column(String)
+	size = Column(String)
+	view = Column(String)
+	X = Column(Integer)
+	Y = Column(Integer)
+	hasCurvyWall = Column(String)
+	bathroom = Column(String)
+
+class Section(RoomBase):
+	__tablename__ = "section"
+	label = Column(String, primary_key=True)
+
 def dbsetup(name, base):
 	thisdir = os.path.dirname(os.path.abspath(__file__))
 	dbdir   = os.path.join(thisdir, 'db', name)

src/utils/db/init_auth.py

@@ -0,0 +1,32 @@
+import base64
+import pbkdf2
+import os
+import json
+
+from db import *
+
+# TODO: init_users
+# TODO init_groups
+
+user_db = init('user')
+user = user_db.query(User).get( 'admin' )
+if user:
+	exit() # TODO: Shouldn't exit because other stuff runs below.
+newuser = User()
+newuser.username = 'admin'
+newuser.salt = base64.b64encode( os.urandom(128) )
+newuser.passhash = pbkdf2.PBKDF2( 'password', newuser.salt ).hexread(32)
+user_db.add( newuser )
+user_db.commit()
+
+group_db = init('group')
+group = group_db.query(Group).get( 'accounts-admin' )
+if group:
+	exit()
+newgroup = Group()
+newgroup.groupname = 'accounts-admin'
+newgroup.owner = 'accounts-admin'
+newgroup.immediate_members = json.dumps(['admin'])
+newgroup.subgroups = json.dumps([])
+group_db.add( newgroup )
+group_db.commit()