[#28] fixed getRelatedModelsByID

Author: Castronova

odm2api/ODM2/services/readService.py

@@ -939,7 +939,7 @@ def getSimulationByActionID(self, actionID):
 
     def getRelatedModelsByID(self, modelid):
         try:
-            return self._session.query(Relatedmodel).filter_by(RelatedModelID=modelid).all()
+            return self._session.query(RelatedModels).filter_by(ModelID=modelid).all()
         except:
             return None
 

tests/test_odm2/data/populated.sql

@@ -15945,8 +15945,9 @@ CREATE TABLE Models (
 	ModelLink VARCHAR (255)  NULL
 );
 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 (
-	RelatedID INTEGER   NOT NULL PRIMARY KEY,
+	RelationID INTEGER   NOT NULL PRIMARY KEY,
 	ModelID INTEGER   NOT NULL,
 	RelationshipTypeCV VARCHAR (255)  NOT NULL,
 	RelatedModelID INTEGER   NOT NULL,

tests/test_odm2/test_readservice.py

@@ -4,14 +4,35 @@
 from odm2api.ODM2 import models
 from odm2api.ODMconnection import dbconnection
 from odm2api.ODM2.services.readService import ReadODM2
+from sqlalchemy.orm import class_mapper
+import sqlalchemy
 
 # run this test from the root directory using:
 # python -m pytest tests/test_odm2/test_readservice.py
 
+globals = {}
 
 
+def rawSql2Alchemy(rawsqlresult, sqlalchemyClass):
+    """
+    converts the results of a raw sql select query into SqlAlchemy Model Object
+    :param rawsqlresult: array of values, sql select results
+    :param sqlalchemyModelObj: model object to convert into
+    :return: populated model object
+    """
+
+    map = {}
+    class_attributes = [prop.key for prop in class_mapper(sqlalchemyClass).iterate_properties
+                            if isinstance(prop, sqlalchemy.orm.ColumnProperty)]
+
+    for i in range(len(class_attributes)):
+        map[class_attributes[i]] = rawsqlresult[i]
+
+    modelObj = sqlalchemyClass()
+    modelObj.__dict__ = map
+    return modelObj
+
 
-globals = {}
 
 class TestReadService:
 
@@ -81,8 +102,6 @@ def test_getAllModels(self):
 
         assert len(res) == len(resapi)
 
-
-
     def test_getModelByCode(self):
 
         # get a model from the database
@@ -114,14 +133,22 @@ def test_getModelByCode(self):
 
     def test_getRelatedModelsByID(self):
 
-        # get one model from the database
-        res = self.engine.execute('SELECT * FROM Models').fetchone()
-        model_id = res[0]
+        # get all models from the database
+        res = self.engine.execute('SELECT * FROM Models').fetchall()
+        m1 = rawSql2Alchemy(res[0], models.Models)
+        m2 = rawSql2Alchemy(res[1], models.Models)
+
+
+        # create a relationship between them
+        self.engine.execute('INSERT INTO RelatedModels Values(1, ?, "TestRelationship", ?)', (m1.ModelID), m2.ModelID)
+
+
 
         # get related models by id using the api
-        resapi = self.reader.getRelatedModelsByID(model_id)
+        resapi = self.reader.getRelatedModelsByID(m1.ModelID)
 
-        assert False
+        assert resapi is not None
+        assert resapi[0].RelatedModelObj.ModelCode == 'swmm'
 
     def test_getRelatedModelsByCode(self):
         pass