ual_ldap_quota_query: Fix ugrad overlap with ual-faculty, ual-grads #78

UAL-RE · Oct 7, 2020 · 40f008e · 40f008e
1 parent 050600f
commit 40f008e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/requiam/quota.py b/requiam/quota.py
@@ -48,7 +48,11 @@ def ual_ldap_quota_query(ual_class, org_codes=None):
                      f'(! ({ual_dcc}) ) )'
 
     if ual_class == 'ugrad':
-        ldap_query = f'({ual_ugrads})'
+        ldap_query = f'( & ({ual_ugrads}) ' + \
+                     f'(! ({ual_faculty}) ) ' + \
+                     f'(! ({ual_staff}) ) ' + \
+                     f'(! ({ual_dcc}) )' + \
+                     f'(! ({ual_grads}) ) )'
 
     # Filter by org codes
     if not isinstance(org_codes, type(None)):