Fix Housing Queue Population with Epoch

Author: liam-middlebrook

conditional/util/housing.py

@@ -1,40 +1,52 @@
 from functools import lru_cache
-from conditional.util.ldap import ldap_get_housing_points, ldap_get_room_number, ldap_get_name, ldap_is_active, \
-    ldap_is_current_student
-from conditional.models import models
+from datetime import datetime
+from conditional.util.ldap import ldap_get_housing_points
+from conditional.util.ldap import ldap_get_room_number
+from conditional.util.ldap import ldap_get_name
+from conditional.util.ldap import ldap_is_active
+from conditional.util.ldap import ldap_get_onfloor_members
+from conditional.util.ldap import ldap_is_current_student
 
+from conditional.models.models import OnFloorStatusAssigned
 
+from conditional import db
 @lru_cache(maxsize=1024)
-def get_housing_queue():
+def __get_ofm__():
+
+    # check that everyone in onfloor has onfloorstatus
+    onfloors = [uids['uid'][0].decode('utf-8') for uids in ldap_get_onfloor_members()]
+
+    # this is bad and we shouldn't do this every time
+    for member in onfloors:
+        if OnFloorStatusAssigned.query.filter(OnFloorStatusAssigned.uid == member).first() is None:
+            db.session.add(OnFloorStatusAssigned(member, datetime.min))
+
+    db.session.flush()
+    db.session.commit()
     ofm = [
         {
             'uid': m.uid,
             'time': m.onfloor_granted,
             'points': ldap_get_housing_points(m.uid)
-        } for m in models.OnFloorStatusAssigned.query.all()
+        } for m in OnFloorStatusAssigned.query.all()
         if ldap_is_active(m.uid)]
 
     # sort by housing points then by time in queue
     ofm.sort(key=lambda m: m['time'])
     ofm.sort(key=lambda m: m['points'], reverse=True)
 
+    return ofm
+
+def get_housing_queue():
+    ofm = __get_ofm__()
+
     queue = [m['uid'] for m in ofm if ldap_get_room_number(m['uid']) == "N/A" and ldap_is_current_student(m['uid'])]
 
     return queue
 
 
 def get_queue_with_points():
-    ofm = [
-        {
-            'uid': m.uid,
-            'time': m.onfloor_granted,
-            'points': ldap_get_housing_points(m.uid)
-        } for m in models.OnFloorStatusAssigned.query.all()
-        if ldap_is_active(m.uid)]
-
-    # sort by housing points then by time in queue
-    ofm.sort(key=lambda m: m['time'])
-    ofm.sort(key=lambda m: m['points'], reverse=True)
+    ofm = __get_ofm__()
 
     queue = [
         {