Fixed tests

slicebox · Feb 11, 2019 · b690238 · b690238
1 parent 9e350c1
commit b690238
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationDAO.scala b/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationDAO.scala
@@ -38,7 +38,7 @@ class AnonymizationDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Exe
   class AnonymizationKeyTable(tag: Tag) extends Table[AnonymizationKey](tag, AnonymizationKeyTable.name) {
     def id = column[Long]("id", O.PrimaryKey, O.AutoInc)
     def created = column[Long]("created")
-    def imageId = column[Long]("imageid")
+    def imageId = column[Long]("imageId")
     def patientName = column[String](DicomProperty.PatientName.name, O.Length(512))
     def anonPatientName = column[String]("anonPatientName", O.Length(512))
     def patientID = column[String](DicomProperty.PatientID.name, O.Length(128))
@@ -280,7 +280,7 @@ class AnonymizationDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Exe
 
           val query = queryAnonymizationKeysSelectPart +
             wherePart(queryPart(queryProperties)) +
-            orderByPart(orderBy, orderAscending) +
+            orderByPart(orderBy.map(o => s""""$o""""), orderAscending) +
             pagePart(startIndex, count)
 
           sql"#$query".as[AnonymizationKey]

diff --git a/src/main/scala/se/nimsa/sbx/metadata/PropertiesDAO.scala b/src/main/scala/se/nimsa/sbx/metadata/PropertiesDAO.scala
@@ -335,7 +335,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
               seriesTypesPart(seriesTypeIds) +
               andPart(filter, sourceRefs, seriesTypeIds, seriesTagIds) +
               seriesTagsPart(seriesTagIds) +
-              orderByPart(orderBy, orderAscending) +
+              orderByPart(flatSeriesOrderBy(orderBy), orderAscending) +
               pagePart(startIndex, count)
 
           sql"#$query".as[FlatSeries]
@@ -369,7 +369,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
               seriesTypesPart(seriesTypeIds) +
               andPart(filter, sourceRefs, seriesTypeIds, seriesTagIds) +
               seriesTagsPart(seriesTagIds) +
-              orderByPart(orderBy, orderAscending) +
+              orderByPart(orderBy.map(o => s""""Patients"."$o""""), orderAscending) +
               pagePart(startIndex, count)
 
           sql"#$query".as[Patient]
@@ -416,7 +416,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
 
             val query =
               metaDataDao.queryPatientsSelectPart +
-                queryMainPart(startIndex, count, orderBy, orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
+                queryMainPart(startIndex, count, orderBy.map(o => s""""Patients"."$o""""), orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
 
             sql"#$query".as[Patient]
           }
@@ -443,7 +443,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
 
             val query =
               metaDataDao.queryStudiesSelectPart +
-                queryMainPart(startIndex, count, orderBy, orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
+                queryMainPart(startIndex, count, orderBy.map(o => s""""Studies"."$o""""), orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
 
             sql"#$query".as[Study]
           }
@@ -470,7 +470,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
 
             val query =
               metaDataDao.querySeriesSelectPart +
-                queryMainPart(startIndex, count, orderBy, orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
+                queryMainPart(startIndex, count, orderBy.map(o => s""""Series"."$o""""), orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
 
             sql"#$query".as[Series]
           }
@@ -497,7 +497,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
 
             val query =
               metaDataDao.queryImagesSelectPart +
-                queryMainPart(startIndex, count, orderBy, orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
+                queryMainPart(startIndex, count, orderBy.map(o => s""""Images"."$o""""), orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
 
             sql"#$query".as[Image]
           }
@@ -524,7 +524,7 @@ class PropertiesDAO(val dbConf: DatabaseConfig[JdbcProfile])(implicit ec: Execut
 
             val query =
               metaDataDao.flatSeriesBasePart +
-                queryMainPart(startIndex, count, orderBy, orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
+                queryMainPart(startIndex, count, flatSeriesOrderBy(orderBy), orderAscending, filters.sourceRefs, filters.seriesTypeIds, filters.seriesTagIds, queryProperties)
 
             sql"#$query".as[FlatSeries]
           }