'merge

Author: sreeder

Examples/Sample.py

@@ -22,7 +22,7 @@
 # session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
 
 # session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
-session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/YODA-Tools/tests/test_files/ODM2_ts_specimen.sqlite', 2.0)
+session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/YODA-Tools/tests/test_files/XL_specimen.sqlite', 2.0)
 
 
 
@@ -37,9 +37,6 @@
 read = ReadODM2(session_factory)
 create = CreateODM2(session_factory)
 
-results = read.getResults(siteid=1)
-resultValues = read.getResultValues(resultids=[1, 2, 3, 4, 5, 6])
-related = read.getRelatedSamplingFeatures(sfid = 1)
 
 # Run some basic sample queries.
 # ------------------------------

odm2api/ODM2/services/readService.py

@@ -362,7 +362,7 @@ def getSamplingFeatures(self, ids=None, codes=None, uuids=None, type=None, wkt=N
             print("Error running Query: %s" % e)
             return None
 
-    def getRelatedSamplingFeatures(self, sfid=None, relationshiptype=None, code=None):
+    def getRelatedSamplingFeatures(self, sfid=None, rfid = None, relationshiptype=None):
         #TODO: add functionality to filter by code
         """
 
@@ -374,14 +374,20 @@ def getRelatedSamplingFeatures(self, sfid=None, relationshiptype=None, code=None
         #     join(User.addresses). \
         #     filter(User.name == 'ed')
         #throws an error when joining entire samplingfeature, works fine when just getting an element. this is being caused by the sampling feature inheritance
-        sf = self._session.query(SamplingFeatures.SamplingFeatureID).select_from(RelatedFeatures).join(RelatedFeatures.SamplingFeatureObj)
-        if sfid: sf = sf.filter(RelatedFeatures.SamplingFeatureID == sfid)
+
+        sf = self._session.query(distinct(SamplingFeatures.SamplingFeatureID))\
+                                .select_from(RelatedFeatures)
+
+
+        if sfid: sf = sf.join(RelatedFeatures.RelatedFeatureObj).filter(RelatedFeatures.SamplingFeatureID == sfid)
+        if rfid: sf = sf.join(RelatedFeatures.SamplingFeatureObj).filter(RelatedFeatures.RelatedFeatureID == rfid)
         if relationshiptype: sf = sf.filter(RelatedFeatures.RelationshipTypeCV == relationshiptype)
-        # if code: sf = sf.filter(RelatedFeatures.RelatedFeatureObj.Sampling)
         try:
-            sfids =[x for x in sf.all()]
+            sfids =[x[0] for x in sf.all()]
             if len(sfids)>0:
-                return self.getSamplingFeatures(ids = sfids)
+                sflist= self.getSamplingFeatures(ids=sfids)
+                return sflist
+
         except Exception as e:
             print("Error running Query: %s" % e)
         return None
@@ -555,9 +561,11 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi
         if siteid:
             sfids = [x[0] for x in self._session.query(distinct(SamplingFeatures.SamplingFeatureID))
                                                     .select_from(RelatedFeatures)
-                                                    .join(RelatedFeatures.RelatedFeatureObj)
-                                                    .filter(RelatedFeatures.RelatedFeatureID == siteid).all()]
-            query = query.join(FeatureActions).filter(SamplingFeatures.SamplingFeatureID.in_(sfids))
+                                                    .join(RelatedFeatures.SamplingFeatureObj)
+                                                    .filter(RelatedFeatures.RelatedFeatureID == siteid)
+                                                    #.filter(RelatedFeatures.RelationshipTypeCV == "Was Collected at")
+                                                    .all()]
+            query = query.join(FeatureActions).filter(FeatureActions.SamplingFeatureID.in_(sfids))
 
         try:
             return query.all()