Repository navigation
Backport: Resolve project parent before other fields in updateProject - #7367
Merged
Merged
Conversation
…cyTrack#7262) * Resolve project parent before other fields in updateProject getObjectByUuid, used to resolve the new parent, triggers a query. Any JDO query flushes dirty state first, so if the parent block ran after setClassifier but before setCollectionLogic cleared it, converting a collection project back to a regular one while also changing its parent flushed a row with both fields set, violating PROJECT_COLLECTION_CLASSIFIER_check and surfacing as an uncaught 500. The same hazard is already handled a few lines below for the collection tag, which is resolved before collectionLogic is set for exactly this reason. Moving parent resolution to the top of the method, before any field is touched, applies the same fix: the query now runs while the object is still clean, so nothing is flushed early. Added a test reproducing the reported request shape: converting a collection project back to a regular one, with a classifier and a parent in the same request. Reverting the fix reproduces the original 500. hasActiveChild and getLatestProjectVersion also run queries between setClassifier and setCollectionLogic, for the isActive and isLatest branches respectively. Same hazard, not exercised by the reported case or by the added test, and not changed here to keep this fix scoped to what was reported and verified. Signed-off-by: adityaanikam <adityanikam9502@gmail.com> * Apply Spotless formatting to ProjectResourceTest The Lint Java check failed on the test added in the previous commit: one assertion was longer than palantir-java-format allows. This only rewraps that line. Signed-off-by: adityaanikam <adityanikam9502@gmail.com> --------- Signed-off-by: adityaanikam <adityanikam9502@gmail.com> (cherry picked from commit 8f399b6) Signed-off-by: nscuro <nscuro@protonmail.com>
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 0 |
🟢 Coverage 92.86% diff coverage · -0.02% coverage variation
Metric Results Coverage variation ✅ -0.02% coverage variation (-1.00%) Diff coverage ✅ 92.86% diff coverage (70.00%) Coverage variation details
Coverable lines Covered lines Coverage Common ancestor commit (5e621e9) 44339 38704 87.29% Head commit (9aad328) 44339 (+0) 38697 (-7) 87.28% (-0.02%) Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch:
<coverage of head commit> - <coverage of common ancestor commit>Diff coverage details
Coverable lines Covered lines Diff coverage Pull request (#7367) 14 13 92.86% Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified:
<covered lines added or modified>/<coverable lines added or modified> * 100%
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
This file contains hidden or 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
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.
Description
Resolves project parent before other fields in updateProject.
Addressed Issue
Fixes #7241
Backports #7262
Additional Details
N/A
Checklist
This PR implements an enhancement, and I have provided tests to verify that it works as intendedThis PR introduces changes to the database model, and I have updated the migration changelog accordinglyThis PR introduces new or alters existing behavior, and I have updated the documentation accordinglyThis PR is a substantial change (per the ADR criteria), and I have added an ADR underdocs/adr/