Working!

Author: kinow

src/main/java/org/commonwl/view/workflow/QueuedWorkflowRepositoryImpl.java

@@ -3,6 +3,7 @@
 import io.hypersistence.utils.hibernate.type.json.JsonType;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
 import org.commonwl.view.git.GitDetails;
 import org.hibernate.query.Query;
 
@@ -14,7 +15,8 @@ public class QueuedWorkflowRepositoryImpl implements QueuedWorkflowRepositoryCus
   private static final String QUERY_DELETE_BY_RETRIEVED_FROM =
       "DELETE FROM queued_workflow q WHERE q.temp_representation -> 'retrievedFrom' = :retrievedFrom";
 
-  @PersistenceContext EntityManager entityManager;
+  @PersistenceContext(type = PersistenceContextType.EXTENDED)
+  EntityManager entityManager;
 
   @Override
   public QueuedWorkflow findByRetrievedFrom(GitDetails retrievedFrom) {
@@ -26,20 +28,27 @@ public QueuedWorkflow findByRetrievedFrom(GitDetails retrievedFrom) {
     //      out of ideas, so started testing everything found online):
     //      Use `new JsonType(GitDetails.class)`. That finally solved it.
     //      Ref: https://github.com/common-workflow-language/cwlviewer/pull/568
-    return (QueuedWorkflow)
-        entityManager
+    final Query<?> query = entityManager
             .createNativeQuery(QUERY_FIND_BY_RETRIEVED_FROM, QueuedWorkflow.class)
-            .unwrap(Query.class)
-            .setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class))
-            .getSingleResultOrNull();
+            .unwrap(Query.class);
+
+    if (query == null) {
+      return null;
+    }
+
+    query.setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class));
+    return (QueuedWorkflow) query.uniqueResult();
   }
 
   @Override
   public void deleteByTempRepresentation_RetrievedFrom(GitDetails retrievedFrom) {
-    entityManager
-        .createNativeQuery(QUERY_DELETE_BY_RETRIEVED_FROM, QueuedWorkflow.class)
-        .unwrap(Query.class)
-        .setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class))
-        .executeUpdate();
+    final Query<?> query = entityManager
+            .createNativeQuery(QUERY_DELETE_BY_RETRIEVED_FROM, QueuedWorkflow.class)
+            .unwrap(Query.class);
+
+    if (query != null) {
+      query.setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class));
+      query.executeUpdate();
+    }
   }
 }

src/main/java/org/commonwl/view/workflow/WorkflowRepositoryImpl.java

@@ -22,23 +22,29 @@
 import io.hypersistence.utils.hibernate.type.json.JsonType;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
 import org.commonwl.view.git.GitDetails;
 import org.hibernate.query.Query;
 
 public class WorkflowRepositoryImpl implements WorkflowRepositoryCustom {
 
   private static final String QUERY_FIND_BY_RETRIEVED_FROM =
-      "SELECT w.* FROM workflow w WHERE w.retrieved_from = to_jsonb(encode(:retrievedFrom, 'escape'))";
+      "SELECT w.* FROM workflow w WHERE w.retrieved_from = :retrievedFrom";
 
-  @PersistenceContext EntityManager entityManager;
+  @PersistenceContext(type = PersistenceContextType.EXTENDED)
+  EntityManager entityManager;
 
   @Override
   public Workflow findByRetrievedFrom(GitDetails retrievedFrom) {
-    return (Workflow)
-        entityManager
+    final Query<?> query = entityManager
             .createNativeQuery(QUERY_FIND_BY_RETRIEVED_FROM, Workflow.class)
-            .unwrap(Query.class)
-            .setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class))
-            .getSingleResultOrNull();
+            .unwrap(Query.class);
+
+    if (query == null) {
+      return null;
+    }
+
+    query.setParameter("retrievedFrom", retrievedFrom, new JsonType(GitDetails.class));
+    return (Workflow) query.uniqueResult();
   }
 }