Backend: Remove user projects when removing user.

backend/app.py

@@ -193,6 +193,7 @@ def delete_user():
             'message': 'No user with that username'
         }), BAD_REQUEST_STATUS_CODE)
     else:
+        db.delete_user_projects(user.id)
         db.delete_user(user.id)
         return generate_response(jsonify({
             'success': True,
@@ -219,12 +220,6 @@ def update_editor_settings_request(id):
     return generate_response(db.user_schema.jsonify(db.update_user(id, user)),
         OK_STATUS_CODE)
 
-@app.route('/api/user/<id>', methods=['DELETE'])
-@jwt_required
-def delete_user_request(id):
-    return generate_response(db.user_schema.jsonify(db.delete_user(id)),
-        OK_STATUS_CODE)
-
 @app.route('/api/project', methods=['GET'])
 @jwt_required
 def get_projects_request():
@@ -294,6 +289,17 @@ def update_project_request(id):
     return generate_response(db.project_schema.jsonify(
         db.update_project(updated_project)), OK_STATUS_CODE)
 
+@app.route('/api/project/<id>', methods=['DELETE'])
+@jwt_required
+def delete_project_request(id):
+    project = json.loads(request.json['project'])
+    # TODO: Check that the user trying to delete the project is the creator!
+    db.delete_project(project['id'])
+    return generate_response(db.project_schema.jsonify({
+            'success': True,
+            'message': 'Successfully deleted project'
+        }), OK_STATUS_CODE)
+
 if __name__ == '__main__':
     #app.run(debug=True)
 

backend/database.py

@@ -2,6 +2,7 @@ import os
 
 from __init__ import app
 
+import json
 from datetime import datetime
 from flask import Flask, request, jsonify
 from flask_sqlalchemy import SQLAlchemy
@@ -220,6 +221,17 @@ def delete_project(id):
     db.session.commit()
     return project
 
+def delete_user_projects(id):
+    """ Deletes all projects owned by user with id. """
+    user = User.query.get(id)
+    projects = Project.query.all()
+    app.logger.error(projects)
+    for project in projects:
+        creatorObj = json.loads(project.creator.replace('\'', '"'))
+        if creatorObj['id'] == id:
+            db.session.delete(project)
+    db.session.commit()
+
 def delete_all_projects():
     num_projects_deleted = db.session.query(Project).delete()
     db.session.commit()