fix typos found by tests

Author: Stephanie Reeder

odm2api/ODM2/services/readService.py

@@ -796,7 +796,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(RelatedModels.ModelCode == code)
+        if code: m = m.filter(Models.ModelCode == code)
 
         try:
             return m.all()

tests/test_odm2/data/empty.sql

@@ -278,6 +278,7 @@ BEGIN TRANSACTION;CREATE TABLE ActionAnnotations (
 	SamplingFeatureDescription VARCHAR (500)  NULL,
 	SamplingFeatureGeotypeCV VARCHAR (255)  NULL,
 	FeatureGeometry geometry   NULL,
+	FeatureGeometryWKT VARCHAR (50)   NULL,
 	Elevation_m FLOAT   NULL,
 	ElevationDatumCV VARCHAR (255)  NULL,
 	FOREIGN KEY (ElevationDatumCV) REFERENCES CV_ElevationDatum (Name)

tests/test_odm2/data/populated.sql

@@ -330,6 +330,7 @@ CREATE TABLE SamplingFeatures (
 	SamplingFeatureDescription VARCHAR (500)  NULL,
 	SamplingFeatureGeotypeCV VARCHAR (255)  NULL,
 	FeatureGeometry geometry   NULL,
+	FeatureGeometryWKT VARCHAR(50)   NULL,
 	Elevation_m FLOAT   NULL,
 	ElevationDatumCV VARCHAR (255)  NULL,
 	FOREIGN KEY (ElevationDatumCV) REFERENCES CV_ElevationDatum (Name)

tests/test_odm2/test_createservice.py

@@ -63,8 +63,8 @@ def test_createVariable(self):
         nodv = -9999
         speciation="mg/L as PO4"
         definition="This is a test variable"
-        v = models.Variables(VariableCode = code, VariableName=name, VariableTypeCV=vType, NoDataValue= nodv, Speciation = speciation,
-                      Definition=definition)
+        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=None,definition=None)
         self.writer.createVariable(v)
         # assert that this dataset has been successfully inserted
@@ -164,7 +164,7 @@ def test_createDataset(self):
         #                                    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)
         dataset = self.writer.createDataset(d)
 
 
@@ -309,9 +309,9 @@ def test_createSimulation(self):
                                SimulationName ="MySimulation",
                                SimulationDescription = "My simulation description",
                                SimulationsStartDateTime = st,
-                               SimulationStartOffset=6,
+                               SimulationStartDateTimeUTCOffset=6,
                                SimulationEdnDateTime=et,
-                               SimulationEndOffset=6,
+                               SimulationEndDateTimeUTCOffset=6,
                                TimeStepValue=1,
                                TimeStepuUnitsID=1,
                                InputDataSetID=None

tests/test_odm2/test_readservice.py

@@ -110,7 +110,7 @@ def test_getModelByCode(self):
 
 
         # get the model using the api
-        resapi = self.reader.getModels(code=modelCode)
+        resapi = self.reader.getModels(codes=[modelCode])
 
         assert resapi is not None
 
@@ -212,7 +212,7 @@ def test_getSimulationByActionID(self):
 
         # get simulation by actionid using the api
         # resapi = self.reader.getSimulationByActionID(actionID=actionID)
-        resapi = self.reader.getSimulation(actionid=actionID)
+        resapi = self.reader.getSimulations(actionid=actionID)
         assert resapi is not None
 
     def test_getResultsBySimulationID(self):