add code for related queries

Author: Stephanie Reeder

odm2api/ODM2/services/readService.py

@@ -230,6 +230,16 @@ def getSamplingFeatures(self, id=None, code=None, type=None, wkt=None):
             print e
             return None
 
+    def getRelatedSamplingFeatures(self, id):
+        """
+
+        getRelatedSamplingFeatures()
+        * Pass a SamplingFeatureID - get a list of sampling feature objects related to the input sampling feature along with the relationship type
+        """
+
+        sf= self._session.query(SamplingFeatures).select_from(RelatedFeatures).join(RelatedFeatures.RelatedFeatureObj)
+        if id: sf= sf.filter(RelatedFeatures.RelatedFeatureID == id)
+        return sf.all()
 
     """
     Action
@@ -257,15 +267,16 @@ def getActions(self, id = None, type=None, sfid=None):
             return None
 
     def getRelatedActions(self, actionid=None):
-        #Todo getrelatedactions
+
         """
         getRelatedActions()
         * Pass an ActionID - get a list of Action objects related to the input action along with the relatinship type
 
         """
+        q= self._session.query(Actions).select_from(RelatedActions).join(RelatedActions.RelatedActionObj)
+        if actionid: q= q.filter(RelatedActions.ActionID ==actionid)
 
-        #q = self._session.query(Actions).filter_by
-        pass
+        return q.all()
 
     """
     Unit
@@ -557,6 +568,7 @@ def getMethodCitations(self):
         self._session.query(MethodCitations).all()
 
     def getRelatedAnnotations(self):
+        #q= read._session.query(Actions).select_from(RelatedActions).join(RelatedActions.RelatedActionObj)
         self._session.query(RelatedAnnotations).all()
     def getRelatedCitations(self):
         self._session.query(RelatedCitations).all()
@@ -601,7 +613,6 @@ def getResultValues(self, resultid= None, type=None, starttime=None, endtime=Non
         elif type == "transect": Result = TransectResultValues
 
 
-
         q = self._session.query(Result)
         if resultid: q = q.filter_by(ResultID=resultid)
         if starttime: q= q.filter(Result.ValueDateTime >= starttime)
@@ -729,9 +740,11 @@ def getRelatedModels(self, id = None, code = None):
         :return:
         :rtype:
         """
-        m=self._session.query(Models).join(RelatedModels, Models.ModelID == RelatedModels.RelatedModelID)
-        if id: m= m.filter_by(ModelID=id)
-        if code: m= m.filter_by(ModelCode = code)
+
+
+        m=self._session.query(Models).select_from(RelatedModels).join(RelatedModels.RelatedModelObj)
+        if id: m= m.filter(RelatedModels.ModelID==id)
+        if code: m= m.filter(RelatedModels.ModelCode == code)
 
         try:
             return m.all()