Identify STARS Liaison in MemberSuite differently

Author: rerb

membersuite_api_client/organizations/services.py

@@ -139,10 +139,26 @@ def get_individuals_for_primary_organization(self,
 
         return individuals
 
+    # get_stars_liaison_for_organization doesn't belong here.  It should
+    # live in some AASHE-specific place, not in OrganizationService.
     def get_stars_liaison_for_organization(self, organization):
+
         candidates = self.get_individuals_for_primary_organization(
             organization=organization)
+
+        # Check for a STARS Primary Contact first:
         for candidate in candidates:
             if "StarsPrimaryContact__rt" in candidate.fields:
                 return candidate
+
+        # No STARS Primary Contact? Try the account's primary contact:
+        for candidate in candidates:
+            if "Primary_Contact__rt" in candidate.fields:
+                return candidate
+
+        # No primary contact? Try billing contact:
+        for candidate in candidates:
+            if "Billing_Contact__rt" in candidate.fields:
+                return candidate
+
         return None

membersuite_api_client/security/services.py

@@ -82,6 +82,10 @@ def logout(client):
         raise LogoutError(result=result)
 
 
+# get_user_for_membersuite_entity introduces a dependency on
+# Django (django.contrib.auth.models, to be precise).  That's
+# quite a drag.  Goes someplace else.  Need to drop dependency
+# on Django.
 def get_user_for_membersuite_entity(membersuite_entity):
     """Returns a User for `membersuite_entity`.