Added Flask-Migrate / Flask-SQLAlchemy

Author: mbillow

.gitignore

@@ -69,7 +69,7 @@ target/
 /.c9
 
 # Sensitive project files
-/config.json
+/config.py
 /data.db
 
 # Frontend dependencies

app.py

@@ -0,0 +1,18 @@
+import os
+from conditional import app
+from conditional.util.ldap import ldap_init
+
+app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
+app.templates_folder = os.path.join(os.getcwd(), "conditional/templates")
+app.config['SERVER_NAME'] = "{}:{}".format(app.config['IP'], app.config['PORT'])
+
+ldap_init(app.config['LDAP_RO'],
+          app.config['LDAP_URL'],
+          app.config['LDAP_BIND_DN'],
+          app.config['LDAP_BIND_PW'],
+          app.config['LDAP_USER_OU'],
+          app.config['LDAP_GROUP_OU'],
+          app.config['LDAP_COMMITTEE_OU'])
+
+if __name__ == "__main__":
+    app.run()

conditional/__init__.py

@@ -0,0 +1,54 @@
+from flask import Flask
+from flask import redirect
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+import structlog
+
+app = Flask(__name__)
+
+app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+
+db = SQLAlchemy(app)
+migrate = Migrate(app, db)
+logger = structlog.get_logger()
+
+from conditional.blueprints.dashboard import dashboard_bp
+from conditional.blueprints.attendance import attendance_bp
+from conditional.blueprints.major_project_submission import major_project_bp
+from conditional.blueprints.intro_evals import intro_evals_bp
+from conditional.blueprints.intro_evals_form import intro_evals_form_bp
+from conditional.blueprints.housing import housing_bp
+from conditional.blueprints.spring_evals import spring_evals_bp
+from conditional.blueprints.conditional import conditionals_bp
+from conditional.blueprints.member_management import member_management_bp
+from conditional.blueprints.slideshow import slideshow_bp
+
+app.register_blueprint(dashboard_bp)
+app.register_blueprint(attendance_bp)
+app.register_blueprint(major_project_bp)
+app.register_blueprint(intro_evals_bp)
+app.register_blueprint(intro_evals_form_bp)
+app.register_blueprint(housing_bp)
+app.register_blueprint(spring_evals_bp)
+app.register_blueprint(conditionals_bp)
+app.register_blueprint(member_management_bp)
+app.register_blueprint(slideshow_bp)
+
+logger.info('conditional started')
+
+
+@app.route('/<path:path>')
+def static_proxy(path):
+    # send_static_file will guess the correct MIME type
+    return app.send_static_file(path)
+
+
+@app.route('/')
+def default_route():
+    return redirect('/dashboard')
+
+
+@app.cli.command()
+def zoo():
+    from conditional.models.migrate import free_the_zoo
+    free_the_zoo(app.config['ZOO_DATABASE_URI'])

conditional/__main__.py

@@ -1,57 +1,53 @@
-from flask import Blueprint
-from flask import jsonify
-from flask import redirect
-from flask import request
-
-from util.ldap import ldap_get_non_alumni_members
-from util.ldap import ldap_get_name
-from util.ldap import ldap_get_current_students
-from util.ldap import ldap_is_eboard
-from util.ldap import ldap_is_eval_director
-from util.ldap import ldap_get_active_members
-
-from db.models import CurrentCoops
-from db.models import CommitteeMeeting
-from db.models import FreshmanCommitteeAttendance
-from db.models import MemberCommitteeAttendance
-from db.models import TechnicalSeminar
-from db.models import FreshmanSeminarAttendance
-from db.models import MemberSeminarAttendance
-from db.models import HouseMeeting
-from db.models import FreshmanHouseMeetingAttendance
-from db.models import MemberHouseMeetingAttendance
-from db.models import FreshmanAccount
+from flask import Blueprint, jsonify, redirect, request
 from datetime import datetime
-
-from util.flask import render_template
-
 import structlog
 import uuid
 
+from conditional.util.ldap import ldap_get_current_students
+from conditional.util.ldap import ldap_is_eboard
+from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_get_active_members
+
+from conditional.models.models import CurrentCoops
+from conditional.models.models import CommitteeMeeting
+from conditional.models.models import FreshmanCommitteeAttendance
+from conditional.models.models import MemberCommitteeAttendance
+from conditional.models.models import TechnicalSeminar
+from conditional.models.models import FreshmanSeminarAttendance
+from conditional.models.models import MemberSeminarAttendance
+from conditional.models.models import HouseMeeting
+from conditional.models.models import FreshmanHouseMeetingAttendance
+from conditional.models.models import MemberHouseMeetingAttendance
+from conditional.models.models import FreshmanAccount
+
+from conditional.util.flask import render_template
+
+from conditional import db
+
 logger = structlog.get_logger()
 
 attendance_bp = Blueprint('attendance_bp', __name__)
 
 
 def get_name(m):
-    first = None
     if 'givenName' in m:
         first = m['givenName'][0].decode('utf-8')
     else:
         first = ""
-    last = None
+
     if 'sn' in m:
         last = m['sn'][0].decode('utf-8')
     else:
         last = ""
+
     return "{first} {last}".format(first=first, last=last)
 
 
 @attendance_bp.route('/attendance/ts_members')
 def get_all_members():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
                      request_id=str(uuid.uuid4()))
-    log.info('api', action='retrieve techincal seminar attendance list')
+    log.info('api', action='retrieve technical seminar attendance list')
 
     members = ldap_get_current_students()
 
@@ -200,8 +196,6 @@ def submit_committee_attendance():
                      request_id=str(uuid.uuid4()))
     log.info('api', action='submit committee meeting attendance')
 
-    from db.database import db_session
-
     user_name = request.headers.get('x-webauth-user')
 
     if not ldap_is_eboard(user_name):
@@ -217,23 +211,23 @@ def submit_committee_attendance():
     timestamp = datetime.strptime(timestamp, "%Y-%m-%d")
     meeting = CommitteeMeeting(committee, timestamp)
 
-    db_session.add(meeting)
-    db_session.flush()
-    db_session.refresh(meeting)
+    db.session.add(meeting)
+    db.session.flush()
+    db.session.refresh(meeting)
 
     for m in m_attendees:
         logger.info('backend',
                     action=("gave attendance to %s for %s" % (m, committee))
                     )
-        db_session.add(MemberCommitteeAttendance(m, meeting.id))
+        db.session.add(MemberCommitteeAttendance(m, meeting.id))
 
     for f in f_attendees:
         logger.info('backend',
                     action=("gave attendance to freshman-%s for %s" % (f, committee))
                     )
-        db_session.add(FreshmanCommitteeAttendance(f, meeting.id))
+        db.session.add(FreshmanCommitteeAttendance(f, meeting.id))
 
-    db_session.commit()
+    db.session.commit()
     return jsonify({"success": True}), 200
 
 
@@ -243,8 +237,6 @@ def submit_seminar_attendance():
                      request_id=str(uuid.uuid4()))
     log.info('api', action='submit technical seminar attendance')
 
-    from db.database import db_session
-
     user_name = request.headers.get('x-webauth-user')
 
     if not ldap_is_eboard(user_name):
@@ -260,23 +252,23 @@ def submit_seminar_attendance():
     timestamp = datetime.strptime(timestamp, "%Y-%m-%d")
     seminar = TechnicalSeminar(seminar_name, timestamp)
 
-    db_session.add(seminar)
-    db_session.flush()
-    db_session.refresh(seminar)
+    db.session.add(seminar)
+    db.session.flush()
+    db.session.refresh(seminar)
 
     for m in m_attendees:
         logger.info('backend',
                     action=("gave attendance to %s for %s" % (m, seminar_name))
                     )
-        db_session.add(MemberSeminarAttendance(m, seminar.id))
+        db.session.add(MemberSeminarAttendance(m, seminar.id))
 
     for f in f_attendees:
         logger.info('backend',
                     action=("gave attendance to freshman-%s for %s" % (f, seminar_name))
                     )
-        db_session.add(FreshmanSeminarAttendance(f, seminar.id))
+        db.session.add(FreshmanSeminarAttendance(f, seminar.id))
 
-    db_session.commit()
+    db.session.commit()
     return jsonify({"success": True}), 200
 
 
@@ -286,8 +278,6 @@ def submit_house_attendance():
                      request_id=str(uuid.uuid4()))
     log.info('api', action='submit house meeting attendance')
 
-    from db.database import db_session
-
     # status: Attended | Excused | Absent
 
     user_name = request.headers.get('x-webauth-user')
@@ -301,17 +291,18 @@ def submit_house_attendance():
 
     meeting = HouseMeeting(timestamp)
 
-    db_session.add(meeting)
-    db_session.flush()
-    db_session.refresh(meeting)
+    db.session.add(meeting)
+    db.session.flush()
+    db.session.refresh(meeting)
 
     if "members" in post_data:
         for m in post_data['members']:
             logger.info('backend',
                         action=(
-                        "gave %s to %s for %s house meeting" % (m['status'], m['uid'], timestamp.strftime("%Y-%m-%d")))
+                            "gave %s to %s for %s house meeting" % (
+                                m['status'], m['uid'], timestamp.strftime("%Y-%m-%d")))
                         )
-            db_session.add(MemberHouseMeetingAttendance(
+            db.session.add(MemberHouseMeetingAttendance(
                 m['uid'],
                 meeting.id,
                 None,
@@ -321,13 +312,13 @@ def submit_house_attendance():
         for f in post_data['freshmen']:
             logger.info('backend',
                         action=("gave %s to freshman-%s for %s house meeting" % (
-                        f['status'], f['id'], timestamp.strftime("%Y-%m-%d")))
+                            f['status'], f['id'], timestamp.strftime("%Y-%m-%d")))
                         )
-            db_session.add(FreshmanHouseMeetingAttendance(
+            db.session.add(FreshmanHouseMeetingAttendance(
                 f['id'],
                 meeting.id,
                 None,
                 f['status']))
 
-    db_session.commit()
+    db.session.commit()
     return jsonify({"success": True}), 200