#4739: Fix product drive delete (updated) #4918
Open
+80
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into 4739-fix-product-drive-delete
…into 4739-fix-product-drive-delete
dorner
requested changes
Jan 7, 2025
| @@ -69,6 +71,10 @@ def self.search_date_range(dates) | |||
| @search_date_range = { start_date: dates[0], end_date: dates[1] } | |||
| end | |||
|
|
|||
| def destroy_product_drive | |||
There was a problem hiding this comment.
Not sure this method is really worth defining when it's a one-liner.
| @@ -0,0 +1,23 @@ | |||
| class ProductDriveDestroyService | |||
| def initialize(product_drive) | |||
There was a problem hiding this comment.
Can we change call to a class method? It's easier to work with in terms of stubbing tests.
| @@ -90,7 +90,10 @@ | |||
| </p> | |||
| <div class="card-footer clearfix"> | |||
| <%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %> | |||
| <%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> | |||
| confirm: "Are you sure you want to permanently remove this product drive?", | |||
There was a problem hiding this comment.
I think this was a mistake?
| expect(response.body).to include('Product drive was successfully destroyed.') | ||
| end | ||
|
|
||
| it "does not delete the product drive if it has donations" do |
There was a problem hiding this comment.
This test probably should be moved to the destroy service.
| @@ -85,6 +94,13 @@ def destroy | |||
|
|
|||
| private | |||
|
|
|||
| def verify_role | |||
There was a problem hiding this comment.
Can we move this verification to the destroy service? You can pass the user into it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #4739
Builds of the suggested changes from PR: #4763