Add rit_id column

Prevent stripping of leading zeros by using a string column and an auto
incrementing id

Fixes #44

Author: mxmeinhold

migrations/versions/65977197d0bd_add_application_rit_id.py

@@ -0,0 +1,41 @@
+"""Add application rit_id
+
+Revision ID: 65977197d0bd
+Revises: f7fc75087f9f
+Create Date: 2021-04-11 22:15:29.825856
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import orm
+from sqlalchemy.ext.declarative import declarative_base
+
+
+# revision identifiers, used by Alembic.
+revision = '65977197d0bd'
+down_revision = 'f7fc75087f9f'
+branch_labels = None
+depends_on = None
+
+Base = declarative_base()
+
+
+class Applicant(Base):
+    __tablename__ = 'application'
+    id = sa.Column(sa.Integer, primary_key=True)
+    rit_id = sa.Column(sa.String(20), nullable=False)
+
+
+def upgrade():
+    op.add_column('application', sa.Column('rit_id', sa.String(20), nullable=False))
+
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    for application in session.query(Applicant):
+        application.rit_id = str(application.id)
+
+    session.commit()
+
+def downgrade():
+    op.drop_column('application', 'rit_id')

selections/__init__.py

@@ -88,7 +88,8 @@ def main(info=None):
                     'gender': a.gender,
                     'reviewed': a.id in reviewed_apps,
                     'interview': a.phone_int,
-                    'review_count': Submission.query.filter_by(application=a.id).count()
+                    'review_count': Submission.query.filter_by(application=a.id).count(),
+                    'rit_id': a.rit_id,
                     } for a in Applicant.query.filter_by(team=member.team).all()
                 ]
 

selections/blueprints/application.py

@@ -39,13 +39,14 @@ def get_application(app_id, info=None):
 @app.route('/application', methods=['POST'])
 @auth.oidc_auth
 @before_request
-def create_application():
-    applicant_id = request.form.get('id')
+def create_application(info=None):
+    applicant_rit_id = request.form.get('rit_id')
     applicant = Applicant(
-        id=applicant_id,
         body=request.form.get('application'),
         team=request.form.get('team'),
-        gender=request.form.get('gender'))
+        gender=request.form.get('gender'),
+        rit_id=applicant_rit_id,
+    )
     db.session.add(applicant)
     db.session.flush()
     db.session.commit()
@@ -66,7 +67,7 @@ def import_application():
     unparsed_applications = defaultdict(list)
     applications = {}
 
-    old_apps = [int(app.id) for app in Applicant.query.all()]
+    old_apps = [app.id for app in Applicant.query.all()]
 
     try:
         document = docx.Document(word_file)
@@ -83,10 +84,10 @@ def import_application():
 
     for array in unparsed_applications:
         app_info = unparsed_applications[array][0].split('\t')
-        app_id = app_info[0]
+        app_rit_id = app_info[0]
         app_gender = gender[app_info[1]]
         app_text = app_info[2]
-        if int(app_id) in old_apps:
+        if app_rit_id in old_apps:
             # If the application is already in the DB, skip it.
             continue
 
@@ -96,9 +97,9 @@ def import_application():
             else:
                 app_text += '\n{}'.format(line)
 
-        applications[app_id] = [app_gender, app_text]
+        applications[app_rit_id] = [app_gender, app_text]
         new_app = Applicant(
-            id=app_id,
+            rit_id=app_rit_id,
             body=app_text,
             team=-1,
             gender=app_gender)

selections/models.py

@@ -15,6 +15,7 @@ class Applicant(db.Model):
     team = Column(Integer, nullable=False)
     gender = Column(gender_enum, nullable=False)
     phone_int = Column(Boolean, server_default='0', nullable=False)
+    rit_id = Column(String(20), nullable=False)
 
 
 

selections/templates/create.html

@@ -5,7 +5,7 @@
             <div class="card-body">
                 <h3 class="card-title">Add Application</h3>
                 <form action="/application" method="post" id="evals-create-application">
-                    <input type="text" class="form-control" placeholder="Application ID" name="id"></input> <br>
+                    <input type="text" class="form-control" placeholder="Application ID" name="rit_id"></input> <br>
                     <textarea class="form-control" placeholder="Application Text" name="application"
                               rows="10"></textarea>
                     <br>

selections/templates/index.html

@@ -39,6 +39,7 @@ <h4 class="card-title">Pending Applications</h4>
                         <thead>
                         <tr>
                             <th scope="col">ID</th>
+                            <th scope="col">RIT ID</th>
                             <th scope="col">Gender</th>
                         </tr>
                         </thead>
@@ -51,6 +52,7 @@ <h4 class="card-title">Pending Applications</h4>
                                             <i class="fas fa-clipboard-list"></i> {{ person.id }}
                                         </a>
                                     </th>
+                                    <td>{{ person.rit_id }}</td>
                                     <td>{{ person.gender }}</td>
                                 </tr>
                             {% endif %}
@@ -70,6 +72,7 @@ <h4 class="card-title">All Applications</h4>
                         <thead>
                         <tr>
                             <th>ID</th>
+                            <th>RIT ID</th>
                             <th>Gender</th>
                             <th>Reviewers</th>
                             <th>Interview</th>
@@ -82,6 +85,7 @@ <h4 class="card-title">All Applications</h4>
                                 <th>
                                     <a href="/application/review/{{ application.id }}"><i
                                             class="fas fa-clipboard-check"></i> {{ application.id }}</a></th>
+                                <td>{{ application.rit_id }}</td>
                                 <td>{{ application.gender }}</td>
                                 <td>
                                     {% for member in reviewers[application.id] %}

selections/templates/review_app.html

@@ -21,6 +21,7 @@ <h3 class="card-title" style="text-align:left;">Application {{ application.id }}
                 {% endif %}
 
 			</span></h3>
+                <h6 class="card-subtitle mb-2 text-muted">RIT ID: {{ application.rit_id }}</h6>
                 <h6 class="card-subtitle mb-2 text-muted">Gender: {{ application.gender }}</h6>
                 <h6 class="card-subtitle mb-2 text-muted">Team: {{ application.team }}</h6>
                 {% for paragraph in split_body %}

selections/templates/vote.html

@@ -7,6 +7,7 @@
                 <div class="card">
                     <div class="card-body">
                         <h3 class="card-title">Application {{ application.id }}</h3>
+                        <h6 class="card-subtitle mb-2 text-muted">RIT ID: {{ application.rit_id }}</h6>
                         <h6 class="card-subtitle mb-2 text-muted">Gender: {{ application.gender }}</h6>
                         {% for paragraph in split_body %}
                             <p class="card-text">{{ paragraph }}</p>