fix order of filtering objects

Author: sreeder

Examples/Sample.py

@@ -17,8 +17,8 @@
 #connect to database
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
-session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
-# session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
+# session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
+session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
 # session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 
 
@@ -32,7 +32,7 @@
 
 #_session = session_factory.getSession()
 read = ReadODM2(session_factory)
-create =CreateODM2(session_factory)
+create = CreateODM2(session_factory)
 
 
 

odm2api/ODM2/services/readService.py

@@ -514,7 +514,7 @@ def getAffiliations(self, ids=None, personfirst=None, personlast=None, orgcode=N
     Results
     """
 
-    def getResults(self, ids=None, type= None, uuids= None, actionid=None, simulationid = None, sfid= None, variableid = None):
+    def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationid = None, sfid= None, variableid = None):
 
         # TODO what if user sends in both type and actionid vs just actionid
         """
@@ -529,16 +529,18 @@ def getResults(self, ids=None, type= None, uuids= None, actionid=None, simulatio
 
         query = self._session.query(Results)
 
-        if actionid: query = query.join(FeatureActions).filter_by(ActionID=actionid)
-        if type: query = query.filter_by(ResultTypeCV= type)
+
+        if type: query = query.filter_by(ResultTypeCV=type)
+        if variableid: query = query.filter_by(VariableID=variableid)
+        if ids: query = query.filter(Results.ResultID.in_(ids))
+        if uuids: query = query.filter(Results.ResultUUID.in_(uuids))
         if simulationid: query = query.join(FeatureActions)\
             .join(Actions)\
             .join(Simulations)\
             .filter_by(SimulationID=simulationid)
-        if ids: query = query.filter(Results.ResultID.in_(ids))
-        if uuids: query =query.filter(Results.ResultUUID.in_(uuids))
+        if actionid: query = query.join(FeatureActions).filter_by(ActionID=actionid)
         if sfid: query = query.join(FeatureActions).filter_by(SamplingFeatureID=sfid)
-        if variableid: query = query.filter_by(VariableID=variableid)
+
 
         try:
             return query.all()