add sampling feature and variables filter in the getresults function

Author: sreeder

odm2api/ODM2/services/readService.py

@@ -514,14 +514,17 @@ 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):
+    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
         """
         getResults()
         * Pass nothing - returns a list of all Results objects
         * Pass a list of ResultID - returns a single Results object
         * Pass an ActionID - returns a single Results object
+        * Pass a Sampling Feature ID- returns a list of objects with that Sampling Feature ID
+        * Pass a Variable ID - returns a list of results with that Variable ID
+        * Pass a Simulation ID - return a list of results that were generated by that simulation
         """
 
         query = self._session.query(Results)
@@ -531,9 +534,11 @@ def getResults(self, ids=None, type= None, uuids= None,  actionid=None, simulati
         if simulationid: query = query.join(FeatureActions)\
             .join(Actions)\
             .join(Simulations)\
-            .filter_by(SimulationID = simulationid)
+            .filter_by(SimulationID=simulationid)
         if ids: query = query.filter(Results.ResultID.in_(ids))
         if uuids: query =query.filter(Results.ResultUUID.in_(uuids))
+        if sfid: query = query.join(FeatureActions).filter_by(SamplingFeatureID=sfid)
+        if variableid: query = query.filter_by(VariableID=variableid)
 
         try:
             return query.all()