Fixed dropping of view records in the merge process.#1314
Merged
bashir2 merged 17 commits intoohs-foundation:masterfrom Mar 7, 2025
Merged
Fixed dropping of view records in the merge process.#1314bashir2 merged 17 commits intoohs-foundation:masterfrom
bashir2 merged 17 commits intoohs-foundation:masterfrom
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1314 +/- ##
============================================
+ Coverage 50.74% 50.78% +0.04%
- Complexity 691 693 +2
============================================
Files 90 90
Lines 5723 5726 +3
Branches 774 775 +1
============================================
+ Hits 2904 2908 +4
Misses 2533 2533
+ Partials 286 285 -1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
ce204c2 to
71076ce
Compare
Collaborator
chandrashekar-s
left a comment
There was a problem hiding this comment.
Thanks @bashir2 for catching this bug and fixing it. I have added few comments, can you please have a look at it.
bashir2
commented
Mar 7, 2025
Collaborator
Author
bashir2
left a comment
There was a problem hiding this comment.
Thanks @chandrashekar-s for the review. I addressed your comments and am going to merge this to make progress on the PR backlog; please let me know if you have any other comments.
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 of what I changed
Fixes #1313 by looking at old DWH when for a resources ID there is no records in the newer DWH.
Please note that only the last commit belongs to this PR as it is built on top of two other PRs.
E2E test
TESTED:
Built the controller docker image locally, reproduced the bug, fixed and tested it.
Checklist: I completed these to help reviewers :)
I have read and will follow the review process.
I am familiar with Google Style Guides for the language I have coded in.
No? Please take some time and review Java and Python style guides.
My IDE is configured to follow the Google code styles.
No? Unsure? -> configure your IDE.
I have added tests to cover my changes. (If you refactored existing code that was well tested you do not have to add tests)
I ran
mvn clean packageright before creating this pull request and added all formatting changes to my commit.All new and existing tests passed.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master