Fixed getSamplingFeatureDatasets issue #130

Author: Elijahwalkerwest

odm2api/ODM2/services/readService.py

@@ -74,9 +74,11 @@ def __init__(self, affiliation, person, org):
 
 class SamplingFeatureDataSet():
     datasets={}
-    def __init__(self, samplingfeature, datasetresults):
+    related_features={}
+    def __init__(self, samplingfeature, datasetresults, relatedfeatures):
         sf = samplingfeature
 
+        self.SamplingFeature = sf
         self.SamplingFeatureID = sf.SamplingFeatureID
         self.SamplingFeatureUUID = sf.SamplingFeatureUUID
         self.SamplingFeatureTypeCV = sf.SamplingFeatureTypeCV
@@ -88,11 +90,13 @@ def __init__(self, samplingfeature, datasetresults):
         self.ElevationDatumCV = sf.ElevationDatumCV
         self.FeatureGeometryWKT = sf.FeatureGeometryWKT
         self.assignDatasets(datasetresults)
+        self.assignRelatedFeatures(relatedfeatures)
 
-        print(self.datasets)
 
+        print(self.datasets)
 
     def assignDatasets(self, datasetresults):
+        self.datasets = {}
         for dsr in datasetresults:
             if dsr.DataSetObj not in self.datasets:
                 #if the dataset is not in the dictionary, add it and the first result
@@ -107,6 +111,14 @@ def assignDatasets(self, datasetresults):
                 self.datasets[dsr.DataSetObj].append(res)
 
 
+    def assignRelatedFeatures(self, relatedfeatures):
+        self.related_features = {}
+        for related in relatedfeatures:
+            if related.SamplingFeatureTypeCV == 'Site':
+                self.related_features = related
+
+
+
 
 
 class ReadODM2(serviceBase):
@@ -875,7 +887,7 @@ def getDataSetsValues(self, ids=None, codes=None, uuids=None, dstype=None):
         return None
 
 
-    def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=None):
+    def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=None, type=None):
         """
         Retrieve a list of Datasets associated with the given sampling feature data.
 
@@ -904,16 +916,20 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
 
 
         # make sure one of the three arguments has been sent in
-        if all(v is None for v in [ids, codes, uuids]):
-            raise ValueError('Expected samplingFeatureID OR samplingFeatureUUID OR samplingFeatureCode argument')
+        # if all(v is None for v in [ids, codes, uuids, type]):
+        #     raise ValueError('Expected samplingFeatureID OR samplingFeatureUUID OR samplingFeatureCode OR samplingFeatureType '
+        #                      'argument')
 
         sf_query = self._session.query(SamplingFeatures)
+        if type:
+            sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureTypeCV == type)
         if ids:
             sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureID.in_(ids))
         if codes:
             sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureCode.in_(codes))
         if uuids:
             sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureUUID.in_(uuids))
+
         sf_list = []
         for sf in sf_query.all():
             sf_list.append(sf)
@@ -934,7 +950,9 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
 
                 vals = q.all()
 
-                sfds.append(SamplingFeatureDataSet(sf, vals))
+                related = self.getRelatedSamplingFeatures(sf.SamplingFeatureID)
+
+                sfds.append(SamplingFeatureDataSet(sf, vals, related))
         except Exception as e:
             print('Error running Query: {}'.format(e))
             return None