fix typos found by tests, add FeatureGeometryWKT to testscripts

Author: Stephanie Reeder

odm2api/ODM2/services/readService.py

@@ -263,7 +263,7 @@ def getProcessingLevels(self, ids=None, codes=None):
     Sampling Feature
     """
 
-    def getSamplingFeatures(self, ids=None, codes=None, uuid=None, type=None, wkt=None):
+    def getSamplingFeatures(self, ids=None, codes=None, uuids=None, type=None, wkt=None):
         """
         getSamplingFeatures
         * Pass nothing - returns a list of all sampling feature objects with each object of type specific to that sampling feature
@@ -278,6 +278,7 @@ def getSamplingFeatures(self, ids=None, codes=None, uuid=None, type=None, wkt=No
         if type: q = q.filter_by(SamplingFeatureTypeCV=type)
         if ids: q = q.filter(SamplingFeatures.SamplingFeatureID.in_(ids))
         if codes: q = q.filter(SamplingFeatures.SamplingFeatureCode.in_(codes))
+        if uuids: q = q.filter(SamplingFeatures.SamplingFeatureUUID.in_(uuids))
         if wkt: q = q.filter_by(FeatureGeometryWKT=wkt)
         try:
             return q.all()
@@ -423,7 +424,7 @@ def getAffiliations(self, ids=None, personfirst=None, personlast=None, orgcode=N
     Results
     """
 
-    def getResults(self, ids=None, actionid=None, simulationid = None):
+    def getResults(self, ids=None, uuids= None,  actionid=None, simulationid = None):
 
         # TODO what if user sends in both type and actionid vs just actionid
         """
@@ -436,12 +437,12 @@ def getResults(self, ids=None, actionid=None, simulationid = None):
         query = self._session.query(Results)
 
         if actionid: query = query.join(FeatureActions).filter_by(ActionID=actionid)
-        if simulationid: query = query.join(Results)\
-            .join(FeatureActions)\
+        if simulationid: query = query.join(FeatureActions)\
             .join(Actions)\
             .join(Simulations)\
             .filter(Simulations.SimulationID == simulationid)
         if ids: query = query.filter(Results.ResultID.in_(ids))
+        if uuids: query =query.filter(Results.ResultUUID.in_(uuids))
 
         try:
             return query.all()
@@ -490,7 +491,7 @@ def getResults(self, ids=None, actionid=None, simulationid = None):
     Datasets
     """
 
-    def getDataSets(self, codes=None):
+    def getDataSets(self, codes=None, uuids=None):
         """
         getDataSets()
         * Pass nothing - returns a list of all DataSet objects
@@ -500,6 +501,8 @@ def getDataSets(self, codes=None):
         q = self._session.query(DataSets)
         if codes:
             q = q.filter(DataSets.DataSetCode.in_(codes))
+        if uuids:
+            q.q.filter(DataSets.DataSetUUID.in_(uuids))
         try:
             return q.all()
         except:
@@ -761,17 +764,7 @@ def getSimulations(self, name=None, actionid=None):
         except:
             return None
 
-    #
-    # def getResultsBySimulationID(self, simulationid):
-    #     try:
-    #         return self._session.query(Results) \
-    #             .join(FeatureActions) \
-    #             .join(Actions) \
-    #             .join(Simulations) \
-    #             .filter(Simulations.SimulationID == simulationid).all()
-    #     except Exception, e:
-    #         print e
-    #         return None
+
 
     def getModels(self, codes=None):
         m = self._session.query(Models)
@@ -796,7 +789,7 @@ def getRelatedModels(self, id=None, code=None):
 
         m = self._session.query(Models).select_from(RelatedModels).join(RelatedModels.RelatedModelObj)
         if id: m = m.filter(RelatedModels.ModelID == id)
-        if code: m = m.filter(Models.ModelCode == code)
+        if code: m = m.filter(RelatedModels.ModelCode == code)
 
         try:
             return m.all()

tests/test_odm2/test_createservice.py

@@ -4,6 +4,7 @@
 from odm2api.ODM2 import models
 from odm2api.ODMconnection import dbconnection
 from odm2api.ODM2.services.createService import CreateODM2
+import uuid
 # run this test from the root directory using:
 # python -m pytest tests/test_odm2/test_createservice.py
 
@@ -63,8 +64,8 @@ def test_createVariable(self):
         nodv = -9999
         speciation="mg/L as PO4"
         definition="This is a test variable"
-        v = models.Variables(VariableCode = code, VariableNameCV=name, VariableTypeCV=vType, NoDataValue= nodv, SpeciationCV = speciation,
-                      VariableDefinition=definition)
+        v = models.Variables(VariableCode = code, VariableNameCV=name, VariableTypeCV=vType, NoDataValue= nodv, SpeciationCV = None,
+                      VariableDefinition=None)
         # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=None,definition=None)
         self.writer.createVariable(v)
         # assert that this dataset has been successfully inserted
@@ -77,9 +78,9 @@ def test_createVariable(self):
         assert(res[5] == None)          # speciation
         assert(res[6] == nodv )         # nodata
 
-        v = models.Variables(VariableCode = code, VariableName=name, VariableTypeCV=vType, NoDataValue= nodv, Speciation = speciation,
-                      Definition=definition)
-        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=None,definition=None)
+        v = models.Variables(VariableCode = code, VariableNameCV=name, VariableTypeCV=vType, NoDataValue= nodv, SpeciationCV = speciation,
+                      VariableDefinition=None)
+        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=speciation,definition=None)
         self.writer.createVariable(v)
 
         # assert that this dataset has been successfully inserted
@@ -92,9 +93,9 @@ def test_createVariable(self):
         assert(res[5] == speciation)    # speciation
         assert(res[6] == nodv )         # nodata
 
-        v = models.Variables(VariableCode = code, VariableName=name, VariableTypeCV=vType, NoDataValue= nodv, Speciation = speciation,
-                      Definition=definition)
-        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=None,definition=None)
+        v = models.Variables(VariableCode = code, VariableNameCV=name, VariableTypeCV=vType, NoDataValue= nodv, SpeciationCV = None,
+                      VariableDefinition=definition)
+        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=None,definition=definition)
         self.writer.createVariable(v)
 
 
@@ -109,9 +110,9 @@ def test_createVariable(self):
         assert(res[6] == nodv )         # nodata
 
 
-        v = models.Variables(VariableCode = code, VariableName=name, VariableTypeCV=vType, NoDataValue= nodv, Speciation = speciation,
-                      Definition=definition)
-        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=None,definition=None)
+        v = models.Variables(VariableCode = code, VariableNameCV=name, VariableTypeCV=vType, NoDataValue= nodv, SpeciationCV = speciation,
+                      VariableDefinition=definition)
+        # self.writer.createVariable(code = code,name = name,vType = vType,nodv =nodv,speciation=speciation,definition=definition)
         self.writer.createVariable(v)
 
 
@@ -163,8 +164,8 @@ def test_createDataset(self):
         #                                    dscode=code,
         #                                    dstitle=title,
         #                                    dsabstract=desc)
-        #TODO uuid
-        d = models.DataSets(DataSetTypeCV = type, DataSetCode =code, DataSetTitle=title, DataSetAbstract = desc)
+
+        d = models.DataSets(DataSetTypeCV = type, DataSetCode =code, DataSetTitle=title, DataSetAbstract = desc, DataSetUUID = uuid.uuid4().hex)
         dataset = self.writer.createDataset(d)
 
 
@@ -201,7 +202,7 @@ def test_createResult(self):
         #                         resulttypecv = 'time series',
         #                         taxonomicclass=None, resultdatetime=None, resultdatetimeutcoffset=None,
         #                         validdatetime=None, validdatetimeutcoffset=None, statuscv=None)
-        #TODO uuid
+
         r = models.Results(FeatureActionID = 1,
                     VariableID=1,
                     UnitsID =1,
@@ -214,7 +215,9 @@ def test_createResult(self):
                     ResultDateTimeUTCOffset = None,
                     ValidDateTime=None,
                     ValidDateTimeUTCOffset = None,
-                    StatusCV = None
+                    StatusCV = None,
+                    ResultUUID = uuid.uuid4().hex
+
             )
         self.writer.createResult(r)
 
@@ -235,14 +238,16 @@ def test_createTimeSeriesResult(self):
             # create a basic result record
             # self.writer.createResult(featureactionid = 1,variableid = 1,unitid = 1,processinglevelid = 1,
             #                         valuecount = 0,sampledmedium = 'unknown',resulttypecv = 'time series')
-            #TODO uuid
+
             r = models.Results(FeatureActionID = 1,
                     VariableID=1,
                     UnitsID =1,
                     ProcessingLevelID = 1,
                     ValueCount = 0,
                     SampledMediumCV = 'unknown',
                     ResultTypeCV = 'time series',
+                    ResultUUID = uuid.uuid4().hex
+
 
             )
             self.writer.createResult(r)
@@ -252,9 +257,9 @@ def test_createTimeSeriesResult(self):
 
         # create most basic time series result record possible
         # tsr = self.writer.createTimeSeriesResult(result=result, aggregationstatistic='unknown')
-        t = models.TimeSeriesResults(ResultID = result.ResultID, AggregationStatisticCV = 'unknown')
-        tsr= self.writer.createResults(t)
-        # assert that this basic tsr exists in the datbase
+        # t = models.TimeSeriesResults(ResultID = result.ResultID, AggregationStatisticCV = 'unknown')
+        # tsr= self.writer.createResult(t)
+        # assert that this basic tsr exists in the database
         res = self.engine.execute('SELECT * FROM TimeSeriesResults').first()
         assert(res is not None)
 
@@ -308,15 +313,16 @@ def test_createSimulation(self):
         s = models.Simulations(ActionID = 1,
                                SimulationName ="MySimulation",
                                SimulationDescription = "My simulation description",
-                               SimulationsStartDateTime = st,
+                               SimulationStartDateTime = st,
                                SimulationStartDateTimeUTCOffset=6,
-                               SimulationEdnDateTime=et,
+                               SimulationEndDateTime=et,
                                SimulationEndDateTimeUTCOffset=6,
                                TimeStepValue=1,
-                               TimeStepuUnitsID=1,
-                               InputDataSetID=None
+                               TimeStepUnitsID=1,
+                               InputDataSetID=None,
+                               ModelID = 1
                                )
-        sim = self.writer.creatSimulation(s)
+        sim = self.writer.createSimulation(s)
 
         # assert that this record has been successfully inserted
         res = self.engine.execute('SELECT * from Simulations')

tests/test_odm2/test_readservice.py

@@ -138,7 +138,7 @@ def test_getRelatedModelsByID(self):
         resapi = self.reader.getRelatedModels(id = 2)
 
         assert resapi is not None
-        assert resapi[0].ModelObj.ModelCode == 'swat'
+        assert resapi[0].ModelCode == 'swat'
 
     def test_getRelatedModelsByCode(self):
 
@@ -148,7 +148,7 @@ def test_getRelatedModelsByCode(self):
 
         assert resapi is not None
         assert len(resapi) > 0
-        assert resapi[0].ModelObj.ModelCode == 'swat'
+        assert resapi[0].ModelCode == 'swat'
 
         # test model code that doesn't exist
         # resapi = self.reader.getRelatedModelsByCode('None')

tests/usecasesql/littlebearriver/sampledatabases/odm2_ms_sql_server/LBR_ODM2_MSSQLDump.sql

@@ -2916,6 +2916,7 @@ CREATE TABLE `SamplingFeatures` (
   `SamplingFeatureDescription` varchar(500) DEFAULT NULL,
   `SamplingFeatureGeotypeCV` varchar(255) DEFAULT NULL,
   `FeatureGeometry` geometry DEFAULT NULL,
+  `FeatureGeometryWKT` varchar(50) DEFAULT NULL,
   `Elevation_m` double DEFAULT NULL,
   `ElevationDatumCV` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`SamplingFeatureID`),

tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql

@@ -1709,6 +1709,7 @@ CREATE TABLE samplingfeatures (
     samplingfeaturedescription character varying(500),
     samplingfeaturegeotypecv character varying(255),
     featuregeometry public.geometry,
+    featuregeometrywkt character varying(50),
     elevation_m double precision,
     elevationdatumcv character varying(255),
     CONSTRAINT enforce_dims_featuregeometry CHECK ((public.st_ndims(featuregeometry) = 2))