micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9122:fixes

Browse source
This commit is contained in:
adel.ka 2025-04-23 21:19:41 +03:00
parent 9e2c1189bf
commit f077526b4b
3 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/src/main/java/ervu_business_metrics/model/AccountData.java
View file

@ -22,7 +22,7 @@ public class AccountData {
private String workMail; private String workMail;
private boolean esiaAccount; private boolean esiaAccount;
@JsonProperty("user-domain") @JsonProperty("user-domain")
private ReferenceEntity userDomain; private String userDomainId;
private List<String> roles; private List<String> roles;
public String getId() { public String getId() {
@ -113,12 +113,12 @@ public class AccountData {
this.esiaAccount = esiaAccount; this.esiaAccount = esiaAccount;
} }
public ReferenceEntity getUserDomain() { public String getUserDomainId() {
return userDomain; return userDomainId;
} }
public void setUserDomain(ReferenceEntity userDomain) { public void setUserDomainId(String userDomainId) {
this.userDomain = userDomain; this.userDomainId = userDomainId;
} }
public List<String> getRoles() { public List<String> getRoles() {

19
backend/src/main/java/ervu_business_metrics/model/ReferenceEntity.java
View file

@ -1,19 +0,0 @@
package ervu_business_metrics.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* @author Adel Kalimullin
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class ReferenceEntity {
private String id;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}

2
backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java
View file

@ -50,7 +50,7 @@ public class AccountDataProcessor implements DataProcessor<AccountData> {
record.setFio(data.getFio()); record.setFio(data.getFio());
record.setWorkMail(data.getWorkMail()); record.setWorkMail(data.getWorkMail());
record.setEsiaAccount(data.isEsiaAccount()); record.setEsiaAccount(data.isEsiaAccount());
record.setDomainId(data.getUserDomain().getId()); record.setDomainId(data.getUserDomainId());
if (existingIds.contains(data.getId())) { if (existingIds.contains(data.getId())) {
accountRecordsToUpdate.add(record); accountRecordsToUpdate.add(record);