ual_ldap_quota_query: Fix grad overlap with ual-faculty #78

UAL-RE · Oct 7, 2020 · 050600f · 050600f
1 parent e656fcd
commit 050600f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/requiam/quota.py b/requiam/quota.py
@@ -42,7 +42,10 @@ def ual_ldap_quota_query(ual_class, org_codes=None):
                      f'({ual_dcc}) )'
 
     if ual_class == 'grad':
-        ldap_query = f'({ual_grads})'
+        ldap_query = f'( & ({ual_grads}) ' + \
+                     f'(! ({ual_faculty}) ) ' + \
+                     f'(! ({ual_staff}) ) ' + \
+                     f'(! ({ual_dcc}) ) )'
 
     if ual_class == 'ugrad':
         ldap_query = f'({ual_ugrads})'