From c254f3e35ef1010052b86e86ba3a63935b543856 Mon Sep 17 00:00:00 2001 From: Dragomir Todorov Date: Mon, 21 Jan 2019 15:26:00 +0200 Subject: [PATCH 1/2] NY-6771: Fixed issues with update account --- .../biz/nynja/account/models/ContactInfo.java | 16 +++++++++++++++- .../AccountRepositoryAdditionalImpl.java | 12 ++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/biz/nynja/account/models/ContactInfo.java b/src/main/java/biz/nynja/account/models/ContactInfo.java index 6acc182..05ffe13 100644 --- a/src/main/java/biz/nynja/account/models/ContactInfo.java +++ b/src/main/java/biz/nynja/account/models/ContactInfo.java @@ -3,6 +3,8 @@ */ package biz.nynja.account.models; +import java.io.Serializable; + import org.springframework.data.cassandra.core.mapping.UserDefinedType; import biz.nynja.account.grpc.ContactDetails; @@ -11,11 +13,14 @@ import biz.nynja.account.grpc.ContactType; import biz.nynja.account.phone.PhoneNumberUtils; @UserDefinedType -public class ContactInfo { +public class ContactInfo implements Serializable { + private static final long serialVersionUID = -5910187338057785293L; + private String type; private String value; private String label; + private String countrySelector; public String getType() { return type; @@ -41,6 +46,14 @@ public class ContactInfo { this.label = label; } + public String getCountrySelector() { + return countrySelector; + } + + public void setCountrySelector(String countrySelector) { + this.countrySelector = countrySelector; + } + @Override public int hashCode() { final int prime = 31; @@ -89,6 +102,7 @@ public class ContactInfo { contactInfo.setType(contactDetails.getType().toString()); contactInfo.setValue(contactDetails.getValue()); contactInfo.setLabel(contactDetails.getLabel()); + contactInfo.setCountrySelector(contactDetails.getCountrySelector()); return contactInfo; } diff --git a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java index a30e94f..c419fce 100644 --- a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java @@ -200,18 +200,18 @@ public class AccountRepositoryAdditionalImpl implements AccountRepositoryAdditio Transaction sagaTransaction = new SagaTransaction(cassandraTemplate); Account existingAccount = accountRepository.findByAccountId(UUID.fromString(request.getAccountId())); + if (existingAccount == null) { + logger.error("Existing account with the provided id {} was not found.", request.getAccountId()); + logger.debug("Existing account with the provided id {} was not found.", request.getAccountId()); + return null; + } + if (!permissionsValidator.isAdminToken()) { // No permission to update roles, load old ones Set roles = existingAccount.getRoles().stream().map(Role::valueOf).collect(Collectors.toSet()); request = UpdateAccountRequest.newBuilder(request).clearRoles().addAllRoles(roles).build(); } - - if (existingAccount == null) { - logger.error("Existing account with the provided id {} was not found.", request.getAccountId()); - logger.debug("Existing account with the provided id {} was not found.", request.getAccountId()); - return null; - } Long timeUpdated = Instant.now().toEpochMilli(); WriteResult wr = null; try { -- GitLab From e0653b430590db4268a6b6704fb1af659e095916 Mon Sep 17 00:00:00 2001 From: Dragomir Todorov Date: Mon, 21 Jan 2019 15:36:39 +0200 Subject: [PATCH 2/2] NY-6771: Removed serialVersion --- src/main/java/biz/nynja/account/models/ContactInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/biz/nynja/account/models/ContactInfo.java b/src/main/java/biz/nynja/account/models/ContactInfo.java index 05ffe13..a6c96b4 100644 --- a/src/main/java/biz/nynja/account/models/ContactInfo.java +++ b/src/main/java/biz/nynja/account/models/ContactInfo.java @@ -15,8 +15,6 @@ import biz.nynja.account.phone.PhoneNumberUtils; @UserDefinedType public class ContactInfo implements Serializable { - private static final long serialVersionUID = -5910187338057785293L; - private String type; private String value; private String label; -- GitLab