Asdfleury

hms-dbmi · Feb 8, 2024 · 8605718 · 8605718
1 parent dd5a34c
commit 8605718
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...ure-api-data/src/main/java/edu/harvard/dbmi/avillach/data/repository/QueryRepository.java b/...ure-api-data/src/main/java/edu/harvard/dbmi/avillach/data/repository/QueryRepository.java
@@ -3,7 +3,7 @@
 import edu.harvard.dbmi.avillach.data.entity.Query;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.PersistenceException;
 import javax.transaction.Transactional;
 import java.util.UUID;
 
@@ -15,11 +15,13 @@ protected QueryRepository() {
         super(Query.class);
     }
 
-    public UUID getQueryUUIDFromCommonAreaUUID(UUID caID) {
+    public Query getQueryUUIDFromCommonAreaUUID(UUID caID) {
         String caIDRegex = "%" + caID + "%";
-        String query = "SELECT uuid FROM query WHERE CONVERT(metadata using utf8) LIKE ?;";
-        // em().getCriteriaBuilder().like(em())
-        em().createQuery(query).setParameter(0, caIDRegex).getSingleResult();
-        return null;
+        String query = "SELECT * FROM query WHERE CONVERT(metadata USING utf8) LIKE ?";
+        try {
+            return (Query) em().createNativeQuery(query, Query.class).setParameter(1, caIDRegex).getSingleResult();
+        } catch (PersistenceException ignored) {
+            return null;
+        }
     }
 }
diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/PicsureQueryService.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/PicsureQueryService.java
@@ -246,6 +246,7 @@ public QueryStatus queryCommonAreaMetaData(UUID commonAreaQueryId, HttpHeaders h
      */
     public QueryStatus queryMetadata(UUID queryId, HttpHeaders headers) {
         Query query = queryRepo.getById(queryId);
+        query = query == null ? queryRepo.getQueryUUIDFromCommonAreaUUID(queryId) : query;
         if (query == null) {
             throw new ProtocolException(ProtocolException.QUERY_NOT_FOUND + queryId.toString());
         }