Merge pull request #321 from obasekiosa/fix-queued-workflow-delete

Fix replace non working deleteByRetrievedFrom function with working delete function

Author: tetron

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

@@ -24,8 +24,7 @@ public interface QueuedWorkflowRepository extends PagingAndSortingRepository<Que
      * Deletes a queued workflow based on where it was retrieved from
      * @param retrievedFrom Details of where the queued workflow is from
      */
-    @Query("{tempRepresentation.retrievedFrom: ?0}")
-    void deleteByRetrievedFrom(GitDetails retrievedFrom);
+    void deleteByTempRepresentation_RetrievedFrom(GitDetails retrievedFrom);
 
     /**
      * Deletes all queued workflows with date retrieved on older or equal to the Date argument passed.

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

@@ -509,7 +509,7 @@ private void removeWorkflow(Workflow workflow) {
         workflowRepository.delete(workflow);
 
         // Remove any queued repositories pointing to the workflow
-        queuedWorkflowRepository.deleteByRetrievedFrom(workflow.getRetrievedFrom());
+        queuedWorkflowRepository.deleteByTempRepresentation_RetrievedFrom(workflow.getRetrievedFrom());
     }
 
     /**

src/test/java/org/commonwl/view/workflow/QueuedWorkflowRepositoryTest.java

@@ -0,0 +1,57 @@
+package org.commonwl.view.workflow;
+
+import org.apache.jena.base.Sys;
+import org.commonwl.view.git.GitDetails;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.*;
+
+@DataMongoTest
+@RunWith(SpringRunner.class)
+public class QueuedWorkflowRepositoryTest {
+
+    @Autowired
+    QueuedWorkflowRepository repository;
+
+    @Test
+    public void deleteQueuedWorkflowByRetrievedFromTest() {
+
+        assertNotNull(repository);
+
+        // create stub queued workflow
+        GitDetails gitDetails = new GitDetails("test_repo_url", "test_branch", "test_path");
+        gitDetails.setPackedId("test_packedId");
+
+        Workflow workflow = new Workflow();
+        workflow.setRetrievedFrom(gitDetails);
+
+        QueuedWorkflow queuedWorkflow = new QueuedWorkflow();
+        queuedWorkflow.setTempRepresentation(workflow);
+
+        // save queued workflow
+        repository.save(queuedWorkflow);
+
+        // retrieve saved queued workflow by workflow git details
+        QueuedWorkflow retrievedQueuedWorkflowAfterSave = repository
+                .findByRetrievedFrom(queuedWorkflow.getTempRepresentation().getRetrievedFrom());
+        assertNotNull(retrievedQueuedWorkflowAfterSave);
+
+
+        // delete saved queued workflow by workflow git details
+        repository.deleteByTempRepresentation_RetrievedFrom(queuedWorkflow.getTempRepresentation().getRetrievedFrom());
+
+        // retrieve deleted queued workflow by workflow git details
+        QueuedWorkflow retrievedQueuedWorkflowAfterDelete = repository
+                .findByRetrievedFrom(queuedWorkflow.getTempRepresentation().getRetrievedFrom());
+        assertNull(retrievedQueuedWorkflowAfterDelete);
+
+    }
+
+}