Merge pull request #40 from sagidayan/API_Dev

Api dev

SE_API/CourseRoutes.py

@@ -57,7 +57,7 @@ def create_course(token):
     403 - Invalid token or not a lecturer
     """
     if not request.data:
-        return bad_request()
+        return bad_request("no data")
     if not is_lecturer(token):  #todo: change to lecturer id
         return forbidden("Invalid token or not a lecturer!")
 
@@ -77,20 +77,20 @@ def create_course(token):
         if end_date <= start_date:
             return bad_request("end date cant be before (or same day) start date")
 
-        course = Course(courseName=payload['courseName'], campusName=payload['campusName'],
+        course = Course(courseName=payload['courseName'], campusName=payload['campusName'], master_id=user.key().id(),
                         startDate=start_date, endDate=end_date)
-
         #check if name already exists
         try:
             query = Course.all()
             query.filter("courseName = ", payload['courseName'])
             for c in query.run(limit=1):
-                return forbidden("Campus with same name already exists")
+                return forbidden("Course with same name already exists")
         except Exception as e:
             print e
 
 
-    except Exception:
+    except Exception as e:
+        print e
         return bad_request()
 
 

SE_API/UserRoutes.py

@@ -67,7 +67,7 @@ def getUserByToken(token):
                         status=200,
                         mimetype="application/json")  # Real response!
 
-    return bad_request("No User Found")
+    return no_content("No User Found")
 
 
 @user_routes.route('/api/users/updateUser/<string:token>', methods=["POST"])
@@ -83,8 +83,8 @@ def updateUser(token):
     <b>Payload</b><br>
      - JSON Object, Example: <br>
      {<br>
-         'name': 'Campus name',<br>
-         'isLecturer': '@campus.ac.com',<br>
+         'name': 'new name',<br>
+         'isLecturer': true<br>
     }<br>
     <br>
     <b>Response</b>
@@ -100,23 +100,24 @@ def updateUser(token):
     try:
         payload = json.loads(request.data)
     except Exception as e:
-        return bad_request(e)
+        return bad_request()
 
     user = get_user_by_token(token)
     if user is None:
         return bad_request("Not a user!")
 
     try:
-        user.name = payload['user']
+        user.name = payload['name']
     except Exception:
         pass
 
     try:
         user.isLecturer = payload['isLecturer']
-    except Exception:
-        pass
-
+    except Exception as e:
+        print e
 
+    db.put(user)
+    db.save
     return ok("User updated")