Merge pull request #143 from ODM2/samplingfeaturedataset_dev

Samplingfeaturedataset dev

Author: lsetiawan

.travis.yml

@@ -39,8 +39,6 @@ matrix:
   - python: 3.6
     env: TEST_TARGET=docs
   allow_failures:
-  - python: 2.7
-    env: TEST_TARGET=coding_standards
   - python: 3.6
     env: TEST_TARGET=default
 

odm2api/ODM2/services/readService.py

@@ -39,6 +39,7 @@
 import pandas as pd
 
 from sqlalchemy import distinct, exists
+from sqlalchemy.orm import contains_eager
 
 __author__ = 'sreeder'
 
@@ -81,7 +82,6 @@ class SamplingFeatureDataSet():
     def __init__(self, samplingfeature, datasetresults, relatedfeatures):
         sf = samplingfeature
 
-        self.SamplingFeature = sf
         self.SamplingFeatureID = sf.SamplingFeatureID
         self.SamplingFeatureUUID = sf.SamplingFeatureUUID
         self.SamplingFeatureTypeCV = sf.SamplingFeatureTypeCV
@@ -1020,10 +1020,14 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
             sfds = []
             for sf in sf_list:
 
-                q = self._session.query(DataSetsResults) \
-                    .join(Results) \
-                    .join(FeatureActions) \
-                    .filter(FeatureActions.SamplingFeatureID == sf.SamplingFeatureID)
+                # Eager loading the data.
+                q = self._session.query(DataSetsResults)\
+                    .join(DataSetsResults.ResultObj)\
+                    .join(Results.FeatureActionObj)\
+                    .filter(FeatureActions.SamplingFeatureID == sf.SamplingFeatureID)\
+                    .options(contains_eager(DataSetsResults.ResultObj)
+                             .contains_eager(Results.FeatureActionObj)
+                             .load_only(FeatureActions.SamplingFeatureID))
 
                 if dstype:
                     q = q.filter_by(DatasetTypeCV=dstype)