Bug fixes for URL and cache logic

Author: Mark Robinson

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

@@ -131,14 +131,14 @@ public boolean cacheExpired(Workflow workflow) {
                 logger.debug("Current: " + workflow.getLastCommit() + ", HEAD: " + currentHead);
 
                 // Reset date in database if there are still no changes
-                boolean changes = workflow.getLastCommit().equals(currentHead);
-                if (changes) {
+                boolean expired = !workflow.getLastCommit().equals(currentHead);
+                if (!expired) {
                     workflow.setRetrievedOn(new Date());
                     workflowRepository.save(workflow);
                 }
 
                 // Return whether the cache has expired
-                return !changes;
+                return expired;
             } else {
                 // Cache expiry time has not elapsed yet
                 return false;

src/main/java/org/commonwl/viewer/web/WorkflowController.java

@@ -159,8 +159,20 @@ public ModelAndView getWorkflowByGithubDetails(@PathVariable("owner") String own
         if (workflowModel != null) {
             boolean cacheExpired = workflowService.cacheExpired(workflowModel);
             if (cacheExpired) {
-                workflowService.removeWorkflow(workflowModel);
-                workflowModel = null;
+                // Update by trying to add a new workflow
+                Workflow newWorkflow = workflowService.newWorkflowFromGithub(workflowModel.getRetrievedFrom());
+
+                // Only replace workflow if it could be successfully parsed
+                if (newWorkflow == null) {
+                    logger.error("Could not parse updated workflow " + workflowModel.id);
+                } else {
+                    // Delete the existing workflow
+                    workflowService.removeWorkflow(workflowModel);
+
+                    // Save new workflow
+                    workflowRepository.save(newWorkflow);
+                    workflowModel = newWorkflow;
+                }
             }
         }
 

src/main/resources/templates/workflow.html

@@ -98,7 +98,7 @@ <h4 class="modal-title" id="dotGraphLabel">Workflow DOT Graph</h4>
 
 <div class="container">
     <div class="row">
-        <div class="col-md-12" role="main" id="main" th:with="workflowURL=@{'github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.retrievedFrom.lastCommit} + '/' + ${workflow.retrievedFrom.path}}">
+        <div class="col-md-12" role="main" id="main" th:with="workflowURL=@{'github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.lastCommit} + '/' + ${workflow.retrievedFrom.path}}">
             <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
             <p>
                 <a th:href="@{'https://' + ${workflowURL}}" href="#" rel="noopener" target="_blank">