Merge branch 'fixrelated'

Author: valentinedwv

odm2api/ODM2/models.py

@@ -1024,7 +1024,7 @@ class RelatedModels(Base):
     __tablename__ = 'relatedmodels'
     __table_args__ = {u'schema': 'odm2'}  # __table_args__ = {u'schema': Schema.getSchema()}
 
-    RelationID = Column('relationid', Integer, primary_key=True, nullable=False)
+    RelatedID = Column('relatedid', Integer, primary_key=True, nullable=False)
     ModelID = Column('modelid', ForeignKey(Models.ModelID), nullable=False)
     RelationshipTypeCV = Column('relationshiptypecv', ForeignKey(CVRelationshipType.Name), nullable=False,
                                 index=True)

odm2api/ODM2/models_sqlite.py

@@ -1016,7 +1016,7 @@ class RelatedModels(Base):
     __tablename__ = 'relatedmodels'
     # __table_args__ = {u'schema': 'odm2'}  # # __table_args__ = {u'schema': Schema.getSchema()}
 
-    RelationID = Column('relationid', Integer, primary_key=True, nullable=False)
+    RelatedID = Column('relatedid', Integer, primary_key=True, nullable=False)
     ModelID = Column('modelid', ForeignKey(Models.ModelID), nullable=False)
     RelationshipTypeCV = Column('relationshiptypecv', ForeignKey(CVRelationshipType.Name), nullable=False,
                                 index=True)

odm2api/ODM2/services/readService.py

@@ -944,7 +944,6 @@ def getRelatedModelsByID(self, modelid):
         :return: all models related to the specified id
         """
         try:
-            return self._session.query(RelatedModels).filter_by(RelatedModelID=modelid).all()
         except Exception as e:
             print(e)
         return None
@@ -956,7 +955,6 @@ def getRelatedModelsByCode(self, modelcode):
         :return: all models related to the provided model code
         """
         try:
-            return self._session.query(RelatedModels).join(Models, RelatedModels.RelatedModelID == Models.ModelID) \
                 .filter(Models.ModelCode == modelcode).all()
         except Exception as e:
             print(e)

odm2api/base.py

@@ -54,6 +54,9 @@ def __init__(self,  session_factory, debug=False):
     #self._session_factory=""
    # def getSessionFactory( session = None):
     def getSession(self):
+        if self._session is None:
+            self._session = self._session_factory.getSession()
+
         return self._session
 
 

tests/test_connection.py

@@ -20,8 +20,9 @@
     ["sqlite_wof","sqlite", "./tests/spatialite/wof2odm/ODM2.sqlite", None,      None,   None]
 ]
 dbs_test = [
-    ["sqlite", "./tests/spatialite/odm2_test.sqlite", None, None, None]
 
+    #     ["sqlite_local","sqlite", "./tests/spatialite/odm2_test.sqlite", None, None, None],
+    ["sqlite_memory", "sqlite", ":memory:", None, None, None]
 ]
 class Connection:
     def __init__(self, request):

tests/test_odm2/data/populated.sql

@@ -15947,7 +15947,7 @@ CREATE TABLE Models (
 INSERT INTO "Models" VALUES(1,'swat','soil and water assessment tool','The Soil and Water Assessment Tool (SWAT) is a public domain Model jointly developed by USDA Agricultural Research Service (USDA-ARS) and Texas A&M AgriLife Research, part of The Texas A&M University System. SWAT is a small watershed to river basin-scale Model to simulate the quality and quantity of surface and ground water and predict the environmental impact of land use, land management practices, and climate change.',NULL,NULL);
 INSERT INTO "Models" VALUES(2,'swmm','storm water management model','SWMM is a dynamic hydrology-hydraulic water quality simulation model. It is used for single event or long-term (continuous) simulation of runoff quantity and quality from primarily urban areas. The runoff component operates on a collection of sub catchment areas that receive precipitation and generate runoff and pollutant loads. The routing portion transports this runoff through a system of pipes, channels, storage/treatment devices, pumps, and regulators.','5.1.010','http://www.epa.gov/water-research/storm-water-management-model-swmm');
 CREATE TABLE RelatedModels (
-	RelationID INTEGER   NOT NULL PRIMARY KEY,
+	RelatedID INTEGER   NOT NULL PRIMARY KEY,
 	ModelID INTEGER   NOT NULL,
 	RelationshipTypeCV VARCHAR (255)  NOT NULL,
 	RelatedModelID INTEGER   NOT NULL,

tests/test_odm2/test_createservice.py

@@ -113,27 +113,32 @@ def test_createVariable(self):
         assert(res[5] == speciation)    # speciation
         assert(res[6] == nodv )         # nodata
 
-
-
+    @pytest.mark.skipif(True, reason="implement")
     def test_createMethod(self):
         pass
 
+    @pytest.mark.skipif(True, reason="implement")
     def test_createProcessingLevel(self):
-        pass 
+        pass
 
+    @pytest.mark.skipif(True, reason="implement")
     def test_createSamplingFeature(self):
         pass
 
+    @pytest.mark.skipif(True, reason="implement")
     def test_createUnit(self):
         pass
-    
+
+    @pytest.mark.skipif(True, reason="implement")
     def test_createOrganization(self):
-        pass 
+        pass
 
+    @pytest.mark.skipif(True, reason="implement")
     def test_createPerson(self):
         pass
 
-    def test_createAffiliation(self): 
+    @pytest.mark.skipif(True, reason="implement")
+    def test_createAffiliation(self):
         pass
 
     def test_createDataset(self):
@@ -156,16 +161,19 @@ def test_createDataset(self):
         res = self.engine.execute('SELECT * from DataSets')
         assert(len(res.fetchall()) == 1)
 
-
+    @pytest.mark.skipif(True, reason="implement")
     def test_createDatasetResults(self):
         pass
-    
+
+    @pytest.mark.skipif(True, reason="implement")
     def test_createAction(self):
         pass
 
-    def test_createActionBy(self): 
+    @pytest.mark.skipif(True, reason="implement")
+    def test_createActionBy(self):
         pass
-    
+
+    @pytest.mark.skipif(True, reason="implement")
     def test_createFeatureAction(self):
         pass
 
@@ -213,28 +221,28 @@ def test_createTimeSeriesResult(self):
         # assert that this basic tsr exists in the datbase
         res = self.engine.execute('SELECT * FROM TimeSeriesResults').first()
         assert(res is not None)
-        
-
 
+    @pytest.mark.skipif(True, reason="implement")
     def test_createTimeSeriesResultValues(self):
         pass
 
-
-    def test_createSite(self): 
+    @pytest.mark.skipif(True, reason="implement")
+    def test_createSite(self):
         pass
 
-
-    def test_createSpatialReference(self): 
+    @pytest.mark.skipif(True, reason="implement")
+    def test_createSpatialReference(self):
         pass
 
-    def test_createDeploymentAction(self): 
+    @pytest.mark.skipif(True, reason="implement")
+    def test_createDeploymentAction(self):
         pass
 
-
+    @pytest.mark.skipif(True, reason="implement")
     def test_createModel(self):
         pass
 
-
+    @pytest.mark.skipif(True, reason="implement")
     def test_createRelatedModel(self):
         pass