Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow merging of accounts that are members of the same group #9909

Conversation

stevenferey
Copy link
Contributor

@stevenferey stevenferey commented Sep 13, 2023

What this PR does / why we need it:

Which issue(s) this PR closes:

Special notes for your reviewer:

Suggestions on how to test this:

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Is there a release notes update needed for this change?:

Additional documentation:

@pdurbin pdurbin added Type: Bug a defect Feature: Account & User Info Size: 3 A percentage of a sprint. 2.1 hours. labels Sep 13, 2023
Response createGroup = UtilIT.createGroup(dataverseAlias, aliasInOwner, displayName, superuserApiToken);
createGroup.prettyPrint();
createGroup.then().assertThat()
.statusCode(CREATED.getStatusCode());

String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
// String groupIdentifier = JsonPath.from(createGroup.asString()).getString("data.identifier");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest to remove code that is no longer needed, instead of leaving it commented out. The codebase has lots of commented code already, which is very rarely removed.

@coveralls
Copy link

coveralls commented Sep 14, 2023

Coverage Status

coverage: 20.042% (-0.001%) from 20.043% when pulling de231ff on Recherche-Data-Gouv:9284-merge-accounts-with-same-group into 92404af on IQSS:develop.

@pdurbin pdurbin changed the title 9284 merge accounts with same group Allow merging of accounts that are members of the same group Feb 28, 2024
@sekmiller sekmiller self-assigned this May 8, 2024

List<String> roleAssigneesToAdd = new ArrayList<>();
roleAssigneesToAdd.add(user2identifier);
List<String> roleAssigneesToAdd = Arrays.asList(user2identifier, target2identifier);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stevenferey does it make sense to leave in the original test (that is, create another group and only add the "consumed" user) - just so we don't lose the original test?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original test have been remove because if the test is valid for merged accounts in the same group, I think it's difficult to not to be valid with accounts not in the same group. However, I don't think the reverse is true.

But I can keep the original test and add a specific test for accounts in the same group.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's OK - thanks. Just wanted to make sure it was considered.

@stevenwinship stevenwinship self-assigned this Jun 3, 2024
@stevenwinship stevenwinship merged commit 26be8e1 into IQSS:develop Jun 3, 2024
8 of 9 checks passed
@stevenwinship stevenwinship removed their assignment Jun 3, 2024
@pdurbin pdurbin added this to the 6.3 milestone Jun 3, 2024
@jeromeroucou jeromeroucou deleted the 9284-merge-accounts-with-same-group branch September 9, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature: Account & User Info Size: 3 A percentage of a sprint. 2.1 hours. Type: Bug a defect
Projects
Status: 🚀 Done (Recherche Data Gouv)
Development

Successfully merging this pull request may close these issues.

Error when merging two accounts with same group
9 participants