working mongo backend... eat it

mynameisfiber · mynameisfiber · commit 9ec0453f516c · 2014-10-12T14:35:07.000-04:00
diff --git a/app/contentnode.py b/app/contentnode.py
@@ -7,7 +7,7 @@
 
 class ContentNode(BaseHandler):
     def get(self):
-        node_id = self.get_int_argument("node_id")
+        node_id = self.get_argument("node_id")
         data = database.get("content_node", node_id)
         self.api_response(data)
 
diff --git a/app/ui.py b/app/ui.py
@@ -12,7 +12,8 @@ def get(self):
 
 class TextbookView(BaseHandler):
     def get(self):
-        self.render("textbook_view.html")
+        node_id = self.get_argument("node_id")
+        self.render("textbook_view.html", node_id = node_id)
 
 class EditContent(BaseHandler):
     def get(self):
diff --git a/app/user.py b/app/user.py
@@ -5,6 +5,6 @@
 
 class User(BaseHandler):
     def get(self):
-        user_id = self.get_int_argument("user_id")
+        user_id = self.get_argument("user_id")
         data = database.get("user", user_id)
         self.api_response(data)
diff --git a/app/usernode.py b/app/usernode.py
@@ -5,14 +5,14 @@
 
 class UserNode(BaseHandler):
     def get(self):
-        node_id = self.get_int_argument("node_id")
+        node_id = self.get_argument("node_id")
         data = db.get("user_node", node_id)
         self.api_response(data)
 
 
 class UserNodeGraph(BaseHandler):
     def get(self):
-        node_id = self.get_int_argument("node_id")
+        node_id = self.get_argument("node_id")
         max_depth = self.get_int_argument("max_depth", 4)
         data = db.get("user_node", node_id)
         data = extract_full_graph(data, max_depth-1)
diff --git a/lib/databases/base_sql.py b/lib/databases/base_sql.py
diff --git a/lib/databases/mongo.py b/lib/databases/mongo.py
@@ -1,11 +1,14 @@
 #!/usr/bin/env python2.7
 
 import pymongo
+from bson.objectid import ObjectId
+
 import lib
 
+
 _DB = None
 _CLIENT = None
-def init(uri='mongodb://localhost:27017/', test=False):
+def init(uri='mongodb://localhost:27017/'):
     global _DB, _CLIENT
     _CLIENT = pymongo.MongoClient(uri)
     _DB = _CLIENT["bigdipster"]
@@ -22,20 +25,22 @@ def save(table, data, require_all_fields=True, overwrite_id=False):
 def update(table, item_id, data, require_all_fields=True):
     global _DB
     try:
-        _DB[table].update({"_id" : item_id}, {"$set" : data}) 
+        return _DB[table].update({"_id" : ObjectId(item_id)}, {"$set" : data}) 
     except KeyError:
         raise lib.ItemNotFound(item_id)
 
 def get(table, item_id):
     global _DB
     try:
-        _DB[table].find_one({"_id" : item_id})
+        item = _DB[table].find_one({"_id" : ObjectId(item_id)})
+        item["_id"] = str(item["_id"])
+        return item
     except KeyError:
         raise lib.ItemNotFound(item_id)
 
 def exists(table, item_id):
     global _DB
     try:
-        _DB[table].find_one({"_id" : item_id})
+        return _DB[table].find_one({"_id" : ObjectId(item_id)})
     except KeyError:
         raise lib.ItemNotFound(item_id)
diff --git a/lib/schema_utils.py b/lib/schema_utils.py
@@ -88,14 +88,12 @@ def check_data(data, fields, require_all_fields=True):
 
 user_node_child_fields = {
     "type" : (is_in_list(["user_node", "content_node"]),),
-    "id" : (schema_or(is_user_node, is_content_node),),
     "start_time" : (schema_or(is_none, is_in_range(0)),),
     "end_time" : (schema_or(is_none, is_in_range(0)),),
     "title" : (is_string, ),
 }
 
 user_node_fields = {
-    "id" : (is_int, ),
     "title" : (is_string, ),
     "parent" : (schema_or(is_none, is_user_node), ),
     "owner" : (is_user, ),
@@ -105,7 +103,6 @@ def check_data(data, fields, require_all_fields=True):
 }
 
 user_fields = {
-    "id" : (is_int, ),
     "name" : (is_string, ),
     "type" : (is_in_list(['admin', 'teacher', 'student']), ),
     "user_nodes" : (is_list, schema_list_check(is_user_node)),
@@ -114,7 +111,6 @@ def check_data(data, fields, require_all_fields=True):
 }
 
 content_node_fields = {
-    'id' : (is_int, ),
     'title' : (is_string, ),
     'text' : (is_string, ),
     'description' : (is_string, ),
diff --git a/templates/textbook_view.html b/templates/textbook_view.html
@@ -12,7 +12,7 @@
     </head>
 
     <body>
-        <div class="textbook_root" nodeid="4"></div>
+        <div class="textbook_root" nodeid="{{ node_id }}"></div>
     </body>
     <script>
         TextbookView.init();
