Add new query to the database for partial retrievedFrom match

Author: Mark Robinson

src/main/java/org/commonwl/viewer/services/WorkflowRepository.java

@@ -30,9 +30,27 @@
  */
 public interface WorkflowRepository extends PagingAndSortingRepository<Workflow, String> {
 
-    // Finds a workflow model in the database based on where it was retrieved from
+    /**
+     * 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
+     */
     Workflow findByRetrievedFrom(GithubDetails retrievedFrom);
 
+    /**
+     * Finds a workflow model in the database based on which repository it is from
+     * @param owner The owner of the repository
+     * @param repoName The name of the repository
+     * @param branch The branch or commit ID of the repository
+     * @return The workflow model
+     */
+    Workflow findByRetrievedFromOwnerAndRetrievedFromRepoNameAndRetrievedFromBranch(String owner, String repoName, String branch);
+
+    /**
+     * Paged request to get all workflows
+     * @param pageable The details of the page to be retrieved
+     * @return The requested page of workflows
+     */
     Page<Workflow> findAllByOrderByRetrievedOnDesc(Pageable pageable);
 
 }

src/main/java/org/commonwl/viewer/services/WorkflowService.java

@@ -89,10 +89,10 @@ public Workflow getWorkflow(String id) {
      * @return The workflow model associated with githubInfo
      */
     public Workflow getWorkflow(GithubDetails githubInfo) {
-        // Check database for existing workflow
+        // Check database for existing workflows from this repository
         Workflow workflow = workflowRepository.findByRetrievedFrom(githubInfo);
 
-        // Create a new workflow if we do not have one already
+        // Cache update
         if (workflow != null) {
             // Delete the existing workflow if the cache has expired
             if (cacheExpired(workflow)) {
@@ -256,4 +256,14 @@ private boolean cacheExpired(Workflow workflow) {
             return false;
         }
     }
+
+    /**
+     * Check for the repository already being parsed
+     * @param details The details of the repository on Github
+     * @return Whether the workflows from the repository have already been added
+     */
+    private boolean repoAlreadyParsed(GithubDetails details) {
+        return (workflowRepository.findByRetrievedFromOwnerAndRetrievedFromRepoNameAndRetrievedFromBranch(
+                details.getOwner(), details.getRepoName(), details.getBranch()) != null);
+    }
 }