[#28] fixed getResultsBySimulationID

Author: Castronova

odm2api/ODM2/services/readService.py

@@ -964,9 +964,10 @@ def getRelatedModelsByCode(self, modelcode):
 
     def getResultsBySimulationID(self, simulationID):
         try:
-            return self._session.query(Result).filter(Simulation.SimulationID == simulationID).all()
-        except:
-            return None
+            return self._session.query(Results).filter(Simulations.SimulationID == simulationID).all()
+        except Exception, e:
+            print e
+        return None
 
 # ################################################################################
 # ODM2

tests/test_odm2/data/populated.sql

@@ -320,7 +320,7 @@ CREATE TABLE Results (
 	ON UPDATE NO ACTION ON DELETE NO ACTION
 );
 INSERT INTO "Results" VALUES(1,'1fed5778-4524-11e5-9cb8-7831c1d1cf54',1,'Time series coverage',1,199,NULL,0,'2015-08-17 15:08:36.145605',-7,NULL,NULL,'Unknown','Surface Water',9986);
-INSERT INTO "Results" VALUES(2,'ec03509a-9b85-4b6a-b315-5f6b4d0ad395',2,'Time series coverage',2,201,NULL,1,'2015-08-17',-6,NULL,NULL,NULL,'Surface Water',40);
+INSERT INTO "Results" VALUES(2,'ec03509a-9b85-4b6a-b315-5f6b4d0ad395',2,'Time series coverage',2,201,NULL,1,'2015-08-17 0:0:0.0',-6,NULL,NULL,NULL,'Surface Water',40);
 CREATE TABLE SamplingFeatures (
 	SamplingFeatureID INTEGER   NOT NULL PRIMARY KEY,
 	SamplingFeatureUUID VARCHAR(36)   NOT NULL,

tests/test_odm2/test_readservice.py

@@ -212,10 +212,20 @@ def test_getResultsBySimulationID(self):
 
         # get a simulation from the database
         res = self.engine.execute('SELECT * FROM Simulations').fetchone()
-        simID = res[0]
+        simulation = rawSql2Alchemy(res, models.Simulations)
 
         # get simulation by id using the api
-        resapi = self.reader.getResultsBySimulationID(simulationID=simID)
+        resapi = self.reader.getResultsBySimulationID(simulation.SimulationID)
         assert resapi is not None
+        assert len(resapi) > 0
+
+        # test simulation id that doesnt exist
+        resapi = self.reader.getResultsBySimulationID(10)
+        assert resapi is not None
+        assert len(resapi) == 0
+
+        # test invalid argument
+        resapi = self.reader.getResultsBySimulationID(models.ActionBy)
+        assert resapi is None