diff --git a/backend/src/main/java/ervu_business_metrics/model/AccountData.java b/backend/src/main/java/ervu_business_metrics/model/AccountData.java index e05f44b..b0d6dca 100644 --- a/backend/src/main/java/ervu_business_metrics/model/AccountData.java +++ b/backend/src/main/java/ervu_business_metrics/model/AccountData.java @@ -22,7 +22,7 @@ public class AccountData { private String workMail; private boolean esiaAccount; @JsonProperty("user-domain") - private ReferenceEntity userDomain; + private String userDomainId; private List 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 getRoles() { diff --git a/backend/src/main/java/ervu_business_metrics/model/ReferenceEntity.java b/backend/src/main/java/ervu_business_metrics/model/ReferenceEntity.java deleted file mode 100644 index 5296d75..0000000 --- a/backend/src/main/java/ervu_business_metrics/model/ReferenceEntity.java +++ /dev/null @@ -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; - } -} diff --git a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java index 31183f6..463bcae 100644 --- a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java +++ b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java @@ -50,7 +50,7 @@ public class AccountDataProcessor implements DataProcessor { 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);