Fixed misplaced __init__ in model

Author: mbillow

conditional/blueprints/member_management.py

@@ -220,12 +220,12 @@ def edit_uid(uid, username, post_data):
 
     account = ldap_get_member(uid)
     active_member = post_data['activeMember']
-    room_number = post_data['roomNumber']
-    onfloor_status = post_data['onfloorStatus']
-    housing_points = post_data['housingPoints']
 
     current_account = ldap_get_member(username)
     if ldap_is_eval_director(current_account):
+        room_number = post_data['roomNumber']
+        onfloor_status = post_data['onfloorStatus']
+        housing_points = post_data['housingPoints']
         logger.info('backend', action="edit %s room: %s onfloor: %s housepts %s" %
                                       (uid, post_data['roomNumber'], post_data['onfloorStatus'],
                                        post_data['housingPoints']))

conditional/blueprints/spring_evals.py

@@ -1,5 +1,4 @@
 import uuid
-import datetime
 import structlog
 
 from flask import Blueprint, request
@@ -45,10 +44,7 @@ def get_cm_count(member_id):
             SpringEval.active).first()
 
         if spring_entry is None:
-            spring_entry = SpringEval(uid=uid,
-                                      active=True,
-                                      date_created=datetime.datetime.now(),
-                                      status="Pending")
+            spring_entry = SpringEval(uid)
             db.session.add(spring_entry)
             db.session.flush()
             db.session.commit()

conditional/models/models.py

@@ -248,12 +248,13 @@ class SpringEval(db.Model):
                          name="spring_eval_enum"),
                     nullable=False)
 
-class InHousingQueue(db.Model):
-    __tablename__ = 'in_housing_queue'
-    uid = Column(String(32), primary_key=True)
-
     def __init__(self, uid):
         self.uid = uid
         self.active = True
         self.date_created = datetime.now()
         self.status = "Pending"
+
+
+class InHousingQueue(db.Model):
+    __tablename__ = 'in_housing_queue'
+    uid = Column(String(32), primary_key=True)