OBPIH-5237 Validate if merged products have pending stock movements #3875
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
and do not allow to make a merge before finishing the pending stock movements
jmiranda
requested changes
Mar 2, 2023
|
|
||
| flash.message = "${obsoleteProduct.productCode} Product merge to ${primaryProduct.productCode} has succeeded. " + | ||
| flash.message = "${params.obsoleteProduct} Product merge to ${params.primaryProduct} has succeeded. " + |
There was a problem hiding this comment.
Probably needs to be localized. We should use the same pattern as with saved, created, deleted, updated, etc just in case we eventually want to merge other domain objects.
default.created.message={0} {1} created
So ...
default.merged.message = "{0} {1} was successfully merged into {0} {2}"
and then flash.message would look like this
flash.message=${g:message(code: "default.merged.label" args="[g.message(code: "product.label"), params.obsoleteProduct, params.primaryProduct]")}"
| @@ -77,6 +78,9 @@ class ProductMergeService { | |||
| * | |||
| * */ | |||
|
|
|||
| Product primary = Product.get(primaryId) | |||
| Product obsolete = Product.get(obsoleteId) | |||
|
|
|||
There was a problem hiding this comment.
Do we need to validate the existence of these products again? What happens if someone deletes between the validation and merge process?
Also can we add a tech debt ticket to refactor the mergeProduct method to separate each operation into a separate method.
def mergeProduct(String primaryId, String obsoleteId) {
mergeProductSuppliers(primary, obsolete)
mergeProductComponents(...)
...
mergeTransaction()
}
We should be able to independently test each of these merge operations.
| throw new IllegalArgumentException("Cannot merge the product with itself") | ||
| } | ||
|
|
||
| def primaryRequisitionItems = requisitionService.getPendingRequisitionItems(primary) |
There was a problem hiding this comment.
Same with validation
validateProducts(String primaryId, String obsoleteId) {
validateProducts([primaryId, obsoleteId])
validateOutboundStockMovementItems([primary, obsoleteId])
...
added localized message and moved validation check
awalkowiak
added a commit
that referenced
this pull request
Mar 31, 2023
…3875) * OBPIH-5237 Validate if merged products have pending stock movements and do not allow to make a merge before finishing the pending stock movements * OBPIH-5237 Minor improvements after review added localized message and moved validation check
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.
and do not allow to make a merge before finishing the pending stock movements