Merge pull request #509 from ComputerScienceHouse/develop

Dev -> main

Author: pikachu0542

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-name: Build
+name: Sonarqube
 
 on:
   push:
@@ -10,8 +10,9 @@ on:
 
 jobs:
   build:
-    name: Build and analyze
+    name: Sonarqube Analysis
     runs-on: ubuntu-latest
+    if: ${{ !startsWith(github.head_ref, 'dependabot/') }}
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/sonarqube.yml

@@ -35,8 +35,8 @@ ENV PORT=${PORT}
 EXPOSE ${PORT}
 
 COPY conditional /opt/conditional/conditional
-COPY *.py package.json /opt/conditional
-COPY --from=build-frontend /opt/conditional/conditional/static /opt/conditional/conditional/static
+COPY *.py package.json /opt/conditional/
+COPY --from=build-frontend /opt/conditional/conditional/static/ /opt/conditional/conditional/static/
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 

Dockerfile

@@ -24,6 +24,20 @@ OIDC_CLIENT_CONFIG = {
 }
 ```
 
+#### Add S3 Config
+An S3 bucket is used to store files that users upload (currently just for major project submissions). In order to have this work properly, you need to provide some credentials to the app.
+
+There are 2 ways that you can get the needed credentials. 
+1. Reach out to an RTP for creds to the dev bucket
+2. Create your own bucket using [DEaDASS](https://deadass.csh.rit.edu/), and the site will give you the credentials you need. 
+
+```py
+S3_URI = env.get("S3_URI", "https://s3.csh.rit.edu")
+S3_BUCKET_ID = env.get("S3_BUCKET_ID", "major-project-media")
+AWS_ACCESS_KEY_ID = env.get("AWS_ACCESS_KEY_ID", "")
+AWS_SECRET_ACCESS_KEY = env.get("AWS_SECRET_ACCESS_KEY", "")
+```
+
 #### Database 
 You can either develop using the dev database, or use the local database provided in the docker compose file
 
@@ -82,6 +96,11 @@ It is likely easier to use containers like `podman` or `docker` or the correspon
 
 With podman, I have been using 
 
+```sh
+podman compose up --watch
+```
+
+If you want, you can run without compose support using
 ```sh
 podman compose up --force-recreate --build
 ```

README.md

@@ -175,7 +175,7 @@ def display_attendance_hm(user_dict=None):
 def submit_committee_attendance(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
 
-    approved = user_dict_is_eval_director(user_dict)
+    approved = user_dict_is_eboard(user_dict)
     post_data = request.get_json()
 
     committee = post_data['committee']

conditional/blueprints/attendance.py

@@ -2,16 +2,16 @@
 from flask import Blueprint, request
 
 from conditional import start_of_year, auth
-from conditional.models.models import Conditional
+from conditional.models.models import Conditional, MajorProject
 from conditional.models.models import HouseMeeting
-from conditional.models.models import MajorProject
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MemberSeminarAttendance
 from conditional.models.models import TechnicalSeminar
 from conditional.models.models import SpringEval
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
 from conditional.util.housing import get_queue_position
+from conditional.util.major_project import get_project_list
 from conditional.util.member import gatekeep_values, get_active_members, get_freshman_data, get_voting_members, \
     get_cm, get_hm, is_gatekeep_active, req_cm
 from conditional.util.user_dict import user_dict_is_active, user_dict_is_bad_standing, user_dict_is_intromember, \
@@ -84,13 +84,19 @@ def display_dashboard(user_dict=None):
 
     data['major_projects'] = [
         {
-            'id': p.id,
-            'name': p.name,
-            'status': p.status,
-            'description': p.description
-        } for p in
-        MajorProject.query.filter(MajorProject.uid == uid,
-                                  MajorProject.date > start_of_year())]
+            "id": p.id,
+            "date": p.date,
+            "name": p.name,
+            "proj_name": p.name,
+            "tldr": p.tldr,
+            "time_spent": p.time_spent,
+            "skills": p.skills,
+            "desc": p.description,
+            "links": list(filter(None, p.links.split("\n"))),
+            "status": p.status,
+        }
+        for p in get_project_list().filter(MajorProject.uid == uid)
+    ]
 
     data['major_projects_count'] = len(data['major_projects'])
 

conditional/blueprints/dashboard.py

@@ -1,60 +1,94 @@
+import collections
 import json
-import requests
+import os
 
 from flask import Blueprint
 from flask import request
 from flask import jsonify
 from flask import redirect
 
-from sqlalchemy import desc
-
+import requests
+import boto3
 import structlog
 
-from conditional.util.context_processors import get_member_name
+from werkzeug.utils import secure_filename
 
+from conditional import db, get_user, auth, app
 from conditional.models.models import MajorProject
+from conditional.models.models import MajorProjectSkill
 
-from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.context_processors import get_member_name
 from conditional.util.ldap import ldap_get_member
 from conditional.util.flask import render_template
+from conditional.util.s3 import list_files_in_folder
+from conditional.util.user_dict import user_dict_is_eval_director
+from conditional.util.major_project import get_project_list
 
-from conditional import db, start_of_year, get_user, auth, app
+collections.Callable = collections.abc.Callable
 
 logger = structlog.get_logger()
 
 major_project_bp = Blueprint("major_project_bp", __name__)
 
-
 @major_project_bp.route("/major_project/")
 @auth.oidc_auth("default")
 @get_user
 def display_major_project(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
     log.info("Display Major Project Page")
 
-    major_projects = [
+    # There is probably a better way to do this, but it does work
+    proj_list: list = get_project_list()
+
+    bucket: str = app.config['S3_BUCKET_ID']
+
+    major_projects: list[dict] = [
         {
+            "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.time_spent,
+            "skills": p.skills,
+            "desc": p.description,
+            "links": list(filter(None, p.links.split("\n"))),
             "status": p.status,
-            "description": p.description,
-            "id": p.id,
             "is_owner": bool(user_dict["username"] == p.uid),
+            "files": list_files_in_folder(bucket, f"{p.id}/")
         }
-        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)
     # return names in 'first last (username)' format
     return render_template(
         "major_project_submission.html",
         major_projects=major_projects,
-        major_projects_len=major_projects_len,
-        username=user_dict["username"],
-    )
+        major_projects_len=len(major_projects),
+        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)')
+
+    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: str = 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 +99,83 @@ def submit_major_project(user_dict=None):
     log.info("Submit Major Project")
 
     post_data = request.get_json()
+
     name = post_data["projectName"]
+    tldr = post_data['projectTldr']
+    time_spent = post_data['projectTimeSpent']
+    skills = post_data['projectSkills']
     description = post_data["projectDescription"]
+    links = post_data['projectLinks']
 
-    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
+    if not name or not tldr or not time_spent or not description:
         return jsonify({"success": False}), 400
-    project = MajorProject(user_dict["username"], name, description)
 
-    # Don't you dare try pinging @channel
-    name = name.replace("<!", "<! ")
+    project: MajorProject = MajorProject(user_id, name, tldr, time_spent, description, links)
 
-    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!"
-        }
-    )
+    # Save the info to the database
     db.session.add(project)
     db.session.commit()
+
+    project = MajorProject.query.filter(
+        MajorProject.name == name,
+        MajorProject.uid == user_id
+    ).first()
+
+    skills_list: list = list(filter(lambda x: x != 'None', skills))
+
+    for skill in skills_list:
+        skill = skill.strip()
+
+        if skill not in ("", '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("<!", "<! ")
+
+    # Connect to S3 bucket
+    s3 = boto3.client("s3",
+                        aws_access_key_id=app.config['AWS_ACCESS_KEY_ID'],
+                        aws_secret_access_key=app.config['AWS_SECRET_ACCESS_KEY'],
+                        endpoint_url=app.config['S3_URI'])
+
+    # Collect all the locally cached files and put them in the bucket
+    temp_dir: str = f"/tmp/{user_id}"
+    if os.path.exists(temp_dir):
+        for file in os.listdir(temp_dir):
+            filepath = f"{temp_dir}/{file}"
+
+            s3.upload_file(filepath, 'major-project-media', f"{project.id}/{file}")
+
+            os.remove(filepath)
+
+        # Delete the temp directory once all the files have been stored in S3
+        os.rmdir(temp_dir)
+
+
+    # Send the slack ping only after we know that the data was properly saved to the DB
+    if app.config['DEV_DISABLE_SLACK_PING']:
+        log.info("Slack ping skipped due to environment override")
+    else:
+        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
 
 
@@ -95,7 +185,7 @@ def submit_major_project(user_dict=None):
 def major_project_review(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
 
-    if not ldap_is_eval_director(user_dict["account"]):
+    if not user_dict_is_eval_director(user_dict["account"]):
         return redirect("/dashboard", code=302)
 
     post_data = request.get_json()
@@ -106,8 +196,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
 
 
@@ -121,10 +213,12 @@ def major_project_delete(pid, user_dict=None):
     major_project = MajorProject.query.filter(MajorProject.id == pid).first()
     creator = major_project.uid
 
-    if creator == user_dict["username"] or ldap_is_eval_director(user_dict["account"]):
+    if creator == user_dict["username"] or user_dict_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