Use relationship object in join

Author: lsetiawan

odm2api/ODM2/services/readService.py

@@ -554,11 +554,12 @@ def getAffiliations(self, ids=None, personfirst=None, personlast=None, orgcode=N
         q = self._session.query(Affiliations)
 
         if ids: q = q.filter(Affiliations.AffiliationID.in_(ids))
-        if orgcode: q = q.join(Organizations).filter(Organizations.OrganizationCode.ilike(orgcode))
-        if personfirst or personlast:
-            q = q.join(People)
-            if personfirst: q = q.filter(People.PersonFirstName.ilike(personfirst))
-            if personlast: q = q.filter(People.PersonLastName.ilike(personlast))
+        if orgcode: q = q.join(Affiliations.OrganizationObj).filter(
+            Organizations.OrganizationCode.ilike(orgcode))
+        if personfirst: q = q.join(Affiliations.PersonObj).filter(
+            People.PersonFirstName.ilike(personfirst))
+        if personlast: q = q.join(Affiliations.PersonObj).filter(
+            People.PersonLastName.ilike(personlast))
 
         try:
             return q.all()