Restored all my existing work

Author: pikachu0542

conditional/blueprints/major_project_submission.py

@@ -1,18 +1,24 @@
 import json
+import os
 import requests
 
+import requests
+import boto3
+
+from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from flask import Blueprint
 from flask import request
 from flask import jsonify
 from flask import redirect
 
-from sqlalchemy import desc
+from sqlalchemy import func, desc
 
 import structlog
+from werkzeug.utils import secure_filename
 
 from conditional.util.context_processors import get_member_name
 
-from conditional.models.models import MajorProject
+from conditional.models.models import MajorProject, MajorProjectSkill
 
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_get_member
@@ -32,19 +38,39 @@ def display_major_project(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
     log.info("Display Major Project Page")
 
+    # There is probably a better way to do this, but it does work
+
+    proj_list = db.session.query(
+        MajorProject.id,
+        MajorProject.date,
+        MajorProject.uid,
+        MajorProject.name,
+        MajorProject.tldr,
+        MajorProject.timeSpent,
+        MajorProject.description,
+        MajorProject.status,
+        func.array_agg(MajorProjectSkill.skill).label("skills")
+    ).outerjoin(MajorProjectSkill,
+        MajorProject.id == MajorProjectSkill.project_id
+    ).group_by(MajorProject.id
+    ).where(MajorProject.date >= start_of_year()
+    ).order_by(desc(MajorProject.date))
+
     major_projects = [
         {
+            "id": p.id,
+            "date": p.date,
             "username": p.uid,
             "name": ldap_get_member(p.uid).cn,
             "proj_name": p.name,
+            "tldr": p.tldr,
+            "time_spent": p.timeSpent,
+            "skills": p.skills,
+            "desc": p.description,
             "status": p.status,
-            "description": p.description,
-            "id": p.id,
-            "is_owner": bool(user_dict["username"] == p.uid),
+            "is_owner": bool(user_dict["username"] == p.uid)
         }
-        for p in MajorProject.query.filter(
-            MajorProject.date > start_of_year()
-        ).order_by(desc(MajorProject.id))
+        for p in proj_list
     ]
 
     major_projects_len = len(major_projects)
@@ -53,8 +79,32 @@ def display_major_project(user_dict=None):
         "major_project_submission.html",
         major_projects=major_projects,
         major_projects_len=major_projects_len,
-        username=user_dict["username"],
-    )
+        username=user_dict["username"])
+
+@major_project_bp.route("/major_project/upload", methods=["POST"])
+@auth.oidc_auth("default")
+@get_user
+def upload_major_project_files(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
+    log.info('Uploading Major Project File(s)')
+
+    log.info(f"user_dict: {user_dict}")
+
+    if len(list(request.files.keys())) <1:
+        return "No file", 400
+    
+    # Temporarily save files to a place, to be uploaded on submit
+
+    for _, file in request.files.lists():
+        file = file[0]
+        safe_name = secure_filename(file.filename)
+        filename = f"/tmp/{user_dict['username']}/{safe_name}"
+
+        os.makedirs(os.path.dirname(filename), exist_ok=True)
+        file.save(filename)
+    
+    return jsonify({"success": True}), 200
+
 
 
 @major_project_bp.route("/major_project/submit", methods=["POST"])
@@ -65,27 +115,88 @@ def submit_major_project(user_dict=None):
     log.info("Submit Major Project")
 
     post_data = request.get_json()
+
+    print(f"Post Data: {post_data}") # TODO: Remove this later
+
     name = post_data["projectName"]
+    tldr = post_data['projectTldr']
+    time_spent = post_data['projectTimeSpent']
+    skills = post_data['projectSkills']
     description = post_data["projectDescription"]
 
-    if name == "" or description == "":
+    user_id = user_dict['username']
+
+    log.info(user_id)
+
+    # All fields are required in order to be able to submit the form
+    # TODO: Do we want any of the fields to have enforced min or max lengths?
+    if name == "" or tldr == "" or time_spent == "" or skills == "" or description == "":
         return jsonify({"success": False}), 400
-    project = MajorProject(user_dict["username"], name, description)
+    
+    # TODO: Ensure all the information is being passed to the object
+    project = MajorProject(user_id, name, tldr, time_spent, description)
 
-    # Don't you dare try pinging @channel
+    # Save the info to the database
+    db.session.add(project)
+    db.session.commit()
+
+
+    project = MajorProject.query.filter(
+        MajorProject.name == name and MajorProject.uid == user_id
+    ).first()
+    
+    skills_list = filter(lambda x: x != 'None', skills)
+    print(f"Skills: {list(skills_list)}")
+
+    for skill in skills_list:
+        skill = skill.strip()
+        
+        if skill != "" and skill != 'None':
+            mp_skill = MajorProjectSkill(project.id, skill)
+            db.session.add(mp_skill)
+
+    db.session.commit()
+    
+    # Fail if attempting to retreive non-existent project
+    if project is None:
+        return jsonify({"success": False}), 500
+    
+    # Sanitize input so that the Slackbot cannot ping @channel
     name = name.replace("<!", "<! ")
 
-    username = user_dict["username"]
-    send_slack_ping(
-        {
-            "text": f"<!subteam^S5XENJJAH> *{get_member_name(username)}* ({username})"
-            f" submitted their major project, *{name}*! Please be sure to reach out"
-            f" to E-Board members to answer any questions they may have regarding"
-            f" your project!"
-        }
+    # Connect to S3 bucket
+    s3 = boto3.resource(
+        "s3", 
+        endpoint_url="https://s3.csh.rit.edu",
+        aws_access_key_id=AWS_ACCESS_KEY_ID,
+        aws_secret_access_key=AWS_SECRET_ACCESS_KEY
     )
-    db.session.add(project)
-    db.session.commit()
+
+    bucket = s3.create_bucket(Bucket="major-project-media")
+
+    # Collect all the locally cached files and put them in the bucket
+    for file in os.listdir(f"/tmp/{user_id}"):
+        filepath = f"/tmp/{user_id}/{file}"
+
+        # TODO: Remove this later
+        print(f"Filepath in S3: {filepath}")
+
+        bucket.upload_file(filepath, f"{project.id}--{file}")
+        os.remove(filepath)
+        
+    # Delete the temp directory once all the files have been stored in S3
+    os.rmdir(f"/tmp/{user_id}")
+
+
+    # Send the slack ping only after we know that the data was properly saved to the DB
+    # TODO: Maybe add more info to the slack ping?
+    # send_slack_ping(
+    #     {
+    #         "text": f"<!subteam^S5XENJJAH> *{get_member_name(user_id)}* ({user_id})"
+    #         f" submitted their major project, *{name}*!"
+    #     }
+    # )
+
     return jsonify({"success": True}), 200
 
 
@@ -106,8 +217,10 @@ def major_project_review(user_dict=None):
 
     print(post_data)
     MajorProject.query.filter(MajorProject.id == pid).update({"status": status})
+
     db.session.flush()
     db.session.commit()
+    
     return jsonify({"success": True}), 200
 
 
@@ -123,12 +236,14 @@ def major_project_delete(pid, user_dict=None):
 
     if creator == user_dict["username"] or ldap_is_eval_director(user_dict["account"]):
         MajorProject.query.filter(MajorProject.id == pid).delete()
+        
         db.session.flush()
         db.session.commit()
+        
         return jsonify({"success": True}), 200
 
     return "Must be project owner to delete!", 401
 
 
 def send_slack_ping(payload):
-    requests.post(app.config["WEBHOOK_URL"], json.dumps(payload), timeout=120)
+    requests.post(app.config["WEBHOOK_URL"], json.dumps(payload), timeout=120)