Skip to content

Fix replace non working deleteByRetrievedFrom function with working delete function #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 23, 2021
Merged

Fix replace non working deleteByRetrievedFrom function with working delete function #321

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9b801c
Fix replace non working deleteByRetrievedFrom function with working d…
obasekiosa Apr 13, 2021
b99c75c
Merge branch 'main' into fix-queued-workflow-delete
mr-c Apr 15, 2021
d1c8fee
Remove Query annotation from QueuedWorkflowRepository's deleteByTempR…
obasekiosa Apr 19, 2021
b30a0d5
Implement unit test for QueuedWorkflow delete by git details function…
obasekiosa Apr 19, 2021
fc4f972
Merge branch 'fix-queued-workflow-delete' of https://github.com/obase…
obasekiosa Apr 19, 2021
b95835e
Change repository field to private
obasekiosa Apr 19, 2021
e940aa9
Merge branch 'main' of https://github.com/common-workflow-language/cw…
obasekiosa Apr 30, 2021
04cf240
Merge branch 'main' into fix-queued-workflow-delete
tetron Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/commonwl/view/workflow/QueuedWorkflowRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ public interface QueuedWorkflowRepository extends PagingAndSortingRepository<Que
* @param retrievedFrom Details of where the queued workflow is from
*/
@Query("{tempRepresentation.retrievedFrom: ?0}")
void deleteByRetrievedFrom(GitDetails retrievedFrom);
void deleteByTempRepresentation_RetrievedFrom(GitDetails retrievedFrom);

}
2 changes: 1 addition & 1 deletion src/main/java/org/commonwl/view/workflow/WorkflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand Down