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.

Sign up for GitHub

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

Jump to bottom

fix: Remove the user from the old group synchronized profile property groups - EXO-64814 - Meeds-io/meeds#1052 #2702

Merged
merged 10 commits into from
Aug 8, 2023
Merged

fix: Remove the user from the old group synchronized profile property groups - EXO-64814 - Meeds-io/meeds#1052 #2702

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
923f838
TASK-62301: Create FB maintenance and update projects versions/depend…
aycherif Feb 7, 2023
c6ffab8
fix: Hidden 'promote as publisher' option in a space member's card op…
akhanfir May 30, 2023
9a7f8bf
Update PeopleCardFront.vue
akhanfir Jun 5, 2023
f8265fb
fix: broken links in all notifications page - EXO-64278 - Meeds-io/me…
ahamdi Jul 13, 2023
de96894
Fix :The full name isn't updated after updating multiple profile prop…
sofyenne Aug 3, 2023
9d16a77
fix: Remove the user from the old synchronized property profile group…
sofyenne Aug 3, 2023
b9c4786
fix: [Notifications] Notification drawer : close a notification issu…
akhanfir Aug 7, 2023
da04fa6
Merge pull request #2706 from Meeds-io/TASK-65724
akhanfir Aug 7, 2023
b578174
Merge branch 'feature/maintenance' into Task/64814
sofyenne Aug 7, 2023
9e903f1
Merge branch 'feature/maintenance' into Task/64814
sofyenne Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...java/org/exoplatform/social/core/listeners/GroupSynchronizationSocialProfileListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package org.exoplatform.social.core.listeners;

import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -126,6 +127,7 @@ private void synchronizeProperty(Map.Entry<String, Object> property, Group profi
Group newPropertyNameGroup = getOrCreateGroup(propertyName, profileGroup);
try {
Group newPropertyValueGroup = getOrCreateGroup(propertyValue, newPropertyNameGroup);
removeUserFromExistingPropertyGroup(newPropertyNameGroup, user);
Copy link
Member

Choose a reason for hiding this comment

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

aren't you removing then adding the user to the same group here ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We are removing the user from the existing child group, and then adding them to the newly created child group within the same larger (parent) group!

addUserToGroup(newPropertyValueGroup, user);
} catch (Exception e) {
LOG.error("Error while adding property value group {} under property Group {}",
Expand Down Expand Up @@ -173,6 +175,20 @@ private void addUserToGroup(Group group, User user) throws Exception {
}
}

private void removeUserFromExistingPropertyGroup(Group group, User user) throws Exception {
Collection<Group> groups = organizationService.getGroupHandler().findGroups(group);
if (!groups.isEmpty()) {
MembershipHandler memberShipHandler = organizationService.getMembershipHandler();
for (Group gr : groups){
Membership memberShip = memberShipHandler.findMembershipByUserGroupAndType(user.getUserName(),
gr.getId(),
MEMBER);
if (memberShip != null) {
memberShipHandler.removeMembership(memberShip.getId(), true);
}
}
}
}
private String buildGroupId(Group parentGroup, String groupName) {
if (parentGroup == null) {
return "/" + groupName.toLowerCase();
Expand Down