Remove custom implementations with native queries, now Hibernate + JPA works!

Author: kinow

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

@@ -3,9 +3,11 @@
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import org.commonwl.view.git.GitDetails;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -16,8 +18,7 @@
  * issues with serialization.
  */
 @Repository
-public interface QueuedWorkflowRepository
-    extends JpaRepository<QueuedWorkflow, UUID>, QueuedWorkflowRepositoryCustom {
+public interface QueuedWorkflowRepository extends JpaRepository<QueuedWorkflow, UUID> {
 
   /**
    * Deletes all queued workflows with date retrieved on older or equal to the Date argument passed.
@@ -28,7 +29,8 @@ public interface QueuedWorkflowRepository
   @Transactional
   @Modifying
   @Query(
-      value = "DELETE FROM queued_workflow q WHERE q.temp_representation ->> 'retrievedOn' <= ?1",
+      value =
+          "DELETE FROM queued_workflow q WHERE (q.temp_representation ->> 'retrievedOn')::timestamp <= ?1",
       nativeQuery = true)
   Integer deleteByTempRepresentation_RetrievedOnLessThanEqual(Date retrievedOn);
 
@@ -41,7 +43,30 @@ public interface QueuedWorkflowRepository
    */
   @Query(
       value =
-          "SELECT q.* FROM queued_workflow q WHERE q.temp_representation ->> 'retrievedOn' <= ?1",
+          "SELECT q.* FROM queued_workflow q WHERE (q.temp_representation ->> 'retrievedOn')::timestamp <= ?1",
       nativeQuery = true)
   List<QueuedWorkflow> findByTempRepresentation_RetrievedOnLessThanEqual(Date retrievedOn);
+
+  /**
+   * Finds a queued workflow based on where it was retrieved from.
+   *
+   * @param retrievedFrom Details of where the queued workflow is from
+   * @return The queued workflow
+   */
+  @Query(
+      """
+          SELECT q
+          FROM QueuedWorkflow q
+          WHERE q.tempRepresentation.retrievedFrom = :retrievedFrom
+      """)
+  QueuedWorkflow findByRetrievedFrom(@Param("retrievedFrom") GitDetails retrievedFrom);
+
+  /**
+   * Deletes a queued workflow based on where it was retrieved from.
+   *
+   * @param retrievedFrom Details of where the queued workflow is from
+   */
+  @Transactional
+  @Modifying
+  void deleteByTempRepresentation_RetrievedFrom(GitDetails retrievedFrom);
 }

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

@@ -21,10 +21,12 @@
 
 import java.util.List;
 import java.util.UUID;
+import org.commonwl.view.git.GitDetails;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -34,8 +36,7 @@
  * href="https://docs.spring.io/spring-data/jpa/docs/current/reference/html/">...</a>
  */
 @Repository
-public interface WorkflowRepository
-    extends JpaRepository<Workflow, UUID>, WorkflowRepositoryCustom {
+public interface WorkflowRepository extends JpaRepository<Workflow, UUID> {
 
   /**
    * Finds a workflow model in the database based on a commit ID and path
@@ -59,6 +60,15 @@ public interface WorkflowRepository
   @Query("SELECT w FROM Workflow w WHERE w.lastCommit = ?1")
   List<Workflow> findByCommit(String commitId);
 
+  /**
+   * Finds a workflow model in the database based on where it was retrieved from
+   *
+   * @param retrievedFrom Details of where the workflow is from
+   * @return The workflow model
+   */
+  @Query("SELECT w FROM Workflow w WHERE w.retrievedFrom = :retrievedFrom")
+  Workflow findByRetrievedFrom(@Param("retrievedFrom") GitDetails retrievedFrom);
+
   /**
    * Paged request to get workflows of a specific status
    *