Skip to content

FINERACT-2480: Remove AppUserClientMapping entity (Phase 1 of self-service removal) #5498

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

Open
AshharAhmadKhan wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FINERACT-2480: Remove AppUserClientMapping entity (Phase 1 of self-service removal) #5498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 0 additions & 28 deletions fineract-core/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ public class AppUser extends AbstractPersistableCustom<Long> implements Platform

@Getter
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, mappedBy = "appUser")
private Set<AppUserClientMapping> appUserClientMappings = new HashSet<>();

@Column(name = "cannot_change_password", nullable = true)
private Boolean cannotChangePassword;
Expand Down Expand Up @@ -194,8 +193,6 @@ public AppUser(final Office office, final User user, final Set<Role> roles, fina
this.lastTimePasswordUpdated = DateUtils.getLocalDateOfTenant();
this.staff = staff;
this.passwordNeverExpires = passwordNeverExpire;
this.isSelfServiceUser = isSelfServiceUser;
this.appUserClientMappings = createAppUserClientMappings(clients);
this.cannotChangePassword = cannotChangePassword;
}

Expand Down Expand Up @@ -326,21 +323,6 @@ public Map<String, Object> update(final JsonCommand command, final PlatformPassw
this.isSelfServiceUser = newValue;
}

if (this.isSelfServiceUser && command.hasParameter(AppUserConstants.CLIENTS)) {
actualChanges.put(AppUserConstants.CLIENTS, command.arrayValueOfParameterNamed(AppUserConstants.CLIENTS));
Set<AppUserClientMapping> newClients = createAppUserClientMappings(clients);
if (this.appUserClientMappings == null) {
this.appUserClientMappings = new HashSet<>();
} else {
this.appUserClientMappings.retainAll(newClients);
}
this.appUserClientMappings.addAll(newClients);
} else if (!this.isSelfServiceUser && actualChanges.containsKey(AppUserConstants.IS_SELF_SERVICE_USER)) {
actualChanges.put(AppUserConstants.CLIENTS, new ArrayList<>());
if (this.appUserClientMappings != null) {
this.appUserClientMappings.clear();
}
}

return actualChanges;
}
Expand Down Expand Up @@ -673,16 +655,6 @@ public boolean isNotEnabled() {
return !isEnabled();
}

private Set<AppUserClientMapping> createAppUserClientMappings(Collection<Client> clients) {
Set<AppUserClientMapping> newAppUserClientMappings = null;
if (clients != null && !clients.isEmpty()) {
newAppUserClientMappings = new HashSet<>();
for (Client client : clients) {
newAppUserClientMappings.add(new AppUserClientMapping(this, client));
}
}
return newAppUserClientMappings;
}

@Override
public String toString() {
Expand Down
88 changes: 0 additions & 88 deletions ...ore/src/main/java/org/apache/fineract/useradministration/domain/AppUserClientMapping.java
View file
Open in desktop

This file was deleted.

Loading