Skip to content

Fixed getSamplingFeatureDatasets issue #130 #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lsetiawan merged 2 commits into from
Dec 13, 2017
Merged

Fixed getSamplingFeatureDatasets issue #130 #131

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b08624
Fixed getSamplingFeatureDatasets issue #130
Elijahwalkerwest Dec 8, 2017
9592471
Fix getSamplingFeatureDataset
lsetiawan Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix getSamplingFeatureDataset
  • Loading branch information
@lsetiawan
lsetiawan committed Dec 13, 2017
commit 9592471d1bb0dd35df48b9bb5806161f72620e0f
49 changes: 26 additions & 23 deletions odm2api/ODM2/services/readService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,25 +97,27 @@ def __init__(self, samplingfeature, datasetresults, relatedfeatures):

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
self.datasets[dsr.DataSetObj]=[]
res = dsr.ResultObj
# res.FeatureActionObj = None
self.datasets[dsr.DataSetObj].append(res)
else:
#if the dataset is in the dictionary, append the result object to the list
res = dsr.ResultObj
# res.FeatureActionObj = None
self.datasets[dsr.DataSetObj].append(res)
if datasetresults:
Copy link
Member

@lsetiawan lsetiawan Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this line to handle cases that there are no datasets associated.

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
self.datasets[dsr.DataSetObj]=[]
res = dsr.ResultObj
# res.FeatureActionObj = None
self.datasets[dsr.DataSetObj].append(res)
else:
#if the dataset is in the dictionary, append the result object to the list
res = dsr.ResultObj
# res.FeatureActionObj = None
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
if relatedfeatures:
Copy link
Member

@lsetiawan lsetiawan Dec 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this line to handle cases that there are no relatedfeatures.

for related in relatedfeatures:
if related.SamplingFeatureTypeCV == 'Site':
self.related_features = related



Expand Down Expand Up @@ -887,7 +889,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, type=None):
def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=None, sftype=None):
"""
Retrieve a list of Datasets associated with the given sampling feature data.

Expand All @@ -899,7 +901,8 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
uuids (list, optional): List of UUIDs string.
dstype (str, optional): Type of Dataset from
`controlled vocabulary name <http://vocabulary.odm2.org/datasettype/>`_.

sftype (str, optional): Type of SamplingFeature from
`controlled vocabulary name <http://vocabulary.odm2.org/samplingfeaturetype/>`_.

Returns:
list: List of DataSetsResults Objects associated with the given sampling feature
Expand All @@ -911,18 +914,19 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
>>> READ.getSamplingFeatureDatasets(uuids=['a6f114f1-5416-4606-ae10-23be32dbc202',
... '5396fdf3-ceb3-46b6-aaf9-454a37278bb4'])
>>> READ.getSamplingFeatureDatasets(dstype='singleTimeSeries')
>>> READ.getSamplingFeatureDatasets(sftype='Specimen')

"""


# make sure one of the three arguments has been sent in
# if all(v is None for v in [ids, codes, uuids, type]):
# raise ValueError('Expected samplingFeatureID OR samplingFeatureUUID OR samplingFeatureCode OR samplingFeatureType '
# 'argument')
if all(v is None for v in [ids, codes, uuids, sftype]):
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 sftype:
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureTypeCV == sftype)
if ids:
sf_query = sf_query.filter(SamplingFeatures.SamplingFeatureID.in_(ids))
if codes:
Expand All @@ -934,7 +938,6 @@ def getSamplingFeatureDatasets(self, ids=None, codes=None, uuids=None, dstype=No
for sf in sf_query.all():
sf_list.append(sf)

sfds = None
try:
sfds=[]
for sf in sf_list:
Expand Down