SUPPORT-9122:fixes
This commit is contained in:
parent
9e2c1189bf
commit
f077526b4b
3 changed files with 6 additions and 25 deletions
|
|
@ -22,7 +22,7 @@ public class AccountData {
|
|||
private String workMail;
|
||||
private boolean esiaAccount;
|
||||
@JsonProperty("user-domain")
|
||||
private ReferenceEntity userDomain;
|
||||
private String userDomainId;
|
||||
private List<String> roles;
|
||||
|
||||
public String getId() {
|
||||
|
|
@ -113,12 +113,12 @@ public class AccountData {
|
|||
this.esiaAccount = esiaAccount;
|
||||
}
|
||||
|
||||
public ReferenceEntity getUserDomain() {
|
||||
return userDomain;
|
||||
public String getUserDomainId() {
|
||||
return userDomainId;
|
||||
}
|
||||
|
||||
public void setUserDomain(ReferenceEntity userDomain) {
|
||||
this.userDomain = userDomain;
|
||||
public void setUserDomainId(String userDomainId) {
|
||||
this.userDomainId = userDomainId;
|
||||
}
|
||||
|
||||
public List<String> getRoles() {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -50,7 +50,7 @@ public class AccountDataProcessor implements DataProcessor<AccountData> {
|
|||
record.setFio(data.getFio());
|
||||
record.setWorkMail(data.getWorkMail());
|
||||
record.setEsiaAccount(data.isEsiaAccount());
|
||||
record.setDomainId(data.getUserDomain().getId());
|
||||
record.setDomainId(data.getUserDomainId());
|
||||
|
||||
if (existingIds.contains(data.getId())) {
|
||||
accountRecordsToUpdate.add(record);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue