Merge complex institutions with overlapping users #3331
Merged
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
jorg-vr
requested review from
bmesuere and
chvp
and removed request for
a team
…mplex_institutions
bmesuere
requested changes
Feb 1, 2022
There was a problem hiding this comment.
Right now, we already offer an institution merge on the website but this sometimes fails due to overlapping users. Since this PR provides a way to merge these institutions semi-automatically, it would be nice if the command that is needed for this is printed along with the error message that is shown when the automatic merge fails.
I'm thinking about a way on how to test this with actual data without risking data loss. The only way I can think of is copying some problematic data from the production environment to naos but this might be a lot of work (this is why #2866 would be nice).
The code itself looks ok.
chvp
requested changes
Feb 2, 2022
chvp
approved these changes
Feb 3, 2022
niknetniko
approved these changes
Feb 3, 2022
bmesuere
approved these changes
Feb 3, 2022
1 task
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.
This pull request builds upon #3327 but is split off to keep the individual pull request manageable.
It introduces an interactive script to merge two institution who potentially have overlapping users. It uses the merge_users interactive script to merge the overlapping users first.
This all happens in a single transaction, as both the merge of users and that of institutions depend on each other.
Because of this transactional nature I had to introduce a new gem after_commit_everywhere
This gem makes sure certain side effects are only applied after the full transaction is successfully committed.
See the test
The script should also rollback filesystem changesfor a test case that was broken without this gem.The relevant command is printed in the error message when merging institutions using the web interface has failed
