From 58044875bd57cdb3d4e7e3230858c74d70970383 Mon Sep 17 00:00:00 2001 From: Dragomir Todorov Date: Tue, 30 Oct 2018 10:37:45 +0200 Subject: [PATCH] NY-4602: Add access status and removed account status to avoid confusion --- .../biz/nynja/account/models/Account.java | 45 +++++++++--------- .../AccountByAuthenticationProvider.java | 47 ++++++++++--------- .../account/models/AccountByProfileId.java | 45 +++++++++--------- .../account/models/AccountByUsername.java | 38 +++++++-------- .../AccountRepositoryAdditionalImpl.java | 6 ++- .../java/biz/nynja/account/utils/Util.java | 10 ++-- 6 files changed, 98 insertions(+), 93 deletions(-) diff --git a/src/main/java/biz/nynja/account/models/Account.java b/src/main/java/biz/nynja/account/models/Account.java index 93c3f70..1446b91 100644 --- a/src/main/java/biz/nynja/account/models/Account.java +++ b/src/main/java/biz/nynja/account/models/Account.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.springframework.data.cassandra.core.mapping.PrimaryKey; import org.springframework.data.cassandra.core.mapping.Table; +import biz.nynja.account.grpc.AccessStatus; import biz.nynja.account.grpc.AccountDetails; import biz.nynja.account.grpc.AccountDetails.Builder; import biz.nynja.account.grpc.CreatePendingAccountRequest; @@ -30,11 +31,11 @@ public class Account { private String accountName; private String username; private String qrCode; - private String accountStatus; private Long creationTimestamp; private Long lastUpdateTimestamp; private Set contactsInfo; private Set roles; + private String accessStatus; public UUID getAccountId() { return accountId; @@ -132,14 +133,6 @@ public class Account { this.qrCode = qrCode; } - public String getAccountStatus() { - return accountStatus; - } - - public void setAccountStatus(String accountStatus) { - this.accountStatus = accountStatus; - } - public Long getCreationTimestamp() { return creationTimestamp; } @@ -164,14 +157,22 @@ public class Account { this.roles = roles; } + public String getAccessStatus() { + return accessStatus; + } + + public void setAccessStatus(String accessStatus) { + this.accessStatus = accessStatus; + } + @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((accessStatus == null) ? 0 : accessStatus.hashCode()); result = prime * result + ((accountId == null) ? 0 : accountId.hashCode()); result = prime * result + ((accountMark == null) ? 0 : accountMark.hashCode()); result = prime * result + ((accountName == null) ? 0 : accountName.hashCode()); - result = prime * result + ((accountStatus == null) ? 0 : accountStatus.hashCode()); result = prime * result + ((authenticationProvider == null) ? 0 : authenticationProvider.hashCode()); result = prime * result + ((authenticationProviderType == null) ? 0 : authenticationProviderType.hashCode()); result = prime * result + ((avatar == null) ? 0 : avatar.hashCode()); @@ -196,6 +197,11 @@ public class Account { if (getClass() != obj.getClass()) return false; Account other = (Account) obj; + if (accessStatus == null) { + if (other.accessStatus != null) + return false; + } else if (!accessStatus.equals(other.accessStatus)) + return false; if (accountId == null) { if (other.accountId != null) return false; @@ -211,11 +217,6 @@ public class Account { return false; } else if (!accountName.equals(other.accountName)) return false; - if (accountStatus == null) { - if (other.accountStatus != null) - return false; - } else if (!accountStatus.equals(other.accountStatus)) - return false; if (authenticationProvider == null) { if (other.authenticationProvider != null) return false; @@ -287,10 +288,10 @@ public class Account { .append(authenticationProvider).append(", authenticationProviderType=") .append(authenticationProviderType).append(", firstName=").append(firstName).append(", lastName=") .append(lastName).append(", avatar=").append(avatar).append(", accountName=").append(accountName) - .append(", username=").append(username).append(", qrCode=").append(qrCode).append(", accountStatus=") - .append(accountStatus).append(", creationTimestamp=").append(creationTimestamp) - .append(", lastUpdateTimestamp=").append(lastUpdateTimestamp).append(", contactsInfo=") - .append(contactsInfo).append(", roles=").append(roles).append("]"); + .append(", username=").append(username).append(", qrCode=").append(qrCode) + .append(", creationTimestamp=").append(creationTimestamp).append(", lastUpdateTimestamp=") + .append(lastUpdateTimestamp).append(", contactsInfo=").append(contactsInfo).append(", roles=") + .append(roles).append(", accessStatus=").append(accessStatus).append("]"); return builder.toString(); } @@ -332,9 +333,6 @@ public class Account { if (getUsername() != null) { builder.setUsername(getUsername()); } - if (getAccountStatus() != null) { - builder.setAccountStatus(getAccountStatus()); - } if (getQrCode() != null) { builder.setQrCode(getQrCode()); } @@ -346,6 +344,9 @@ public class Account { builder.addRoles(Role.valueOf(role)); } } + if (getAccessStatus() != null) { + builder.setAccessStatus(AccessStatus.valueOf(getAccessStatus())); + } if (getContactsInfo() != null) { for (ContactInfo c : contactsInfo) { builder.addContactsInfo(c.toProto()); diff --git a/src/main/java/biz/nynja/account/models/AccountByAuthenticationProvider.java b/src/main/java/biz/nynja/account/models/AccountByAuthenticationProvider.java index 9c72576..f6a58fc 100644 --- a/src/main/java/biz/nynja/account/models/AccountByAuthenticationProvider.java +++ b/src/main/java/biz/nynja/account/models/AccountByAuthenticationProvider.java @@ -7,6 +7,7 @@ import java.nio.ByteBuffer; import java.util.Set; import java.util.UUID; +import biz.nynja.account.grpc.AccessStatus; import biz.nynja.account.grpc.AccountDetails.Builder; import biz.nynja.account.grpc.Role; @@ -22,12 +23,12 @@ public class AccountByAuthenticationProvider { private ByteBuffer avatar; private String accountName; private String username; - private String accountStatus; private Long creationTimestamp; private Long lastUpdateTimestamp; private Set contactsInfo; private String qrCode; private Set roles; + private String accessStatus; public UUID getAccountId() { return accountId; @@ -109,14 +110,6 @@ public class AccountByAuthenticationProvider { this.username = username; } - public String getAccountStatus() { - return accountStatus; - } - - public void setAccountStatus(String accountStatus) { - this.accountStatus = accountStatus; - } - public Long getCreationTimestamp() { return creationTimestamp; } @@ -157,14 +150,22 @@ public class AccountByAuthenticationProvider { this.roles = roles; } + public String getAccessStatus() { + return accessStatus; + } + + public void setAccessStatus(String accessStatus) { + this.accessStatus = accessStatus; + } + @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((accessStatus == null) ? 0 : accessStatus.hashCode()); result = prime * result + ((accountId == null) ? 0 : accountId.hashCode()); result = prime * result + ((accountMark == null) ? 0 : accountMark.hashCode()); result = prime * result + ((accountName == null) ? 0 : accountName.hashCode()); - result = prime * result + ((accountStatus == null) ? 0 : accountStatus.hashCode()); result = prime * result + ((authenticationProvider == null) ? 0 : authenticationProvider.hashCode()); result = prime * result + ((authenticationProviderType == null) ? 0 : authenticationProviderType.hashCode()); result = prime * result + ((avatar == null) ? 0 : avatar.hashCode()); @@ -189,6 +190,11 @@ public class AccountByAuthenticationProvider { if (getClass() != obj.getClass()) return false; AccountByAuthenticationProvider other = (AccountByAuthenticationProvider) obj; + if (accessStatus == null) { + if (other.accessStatus != null) + return false; + } else if (!accessStatus.equals(other.accessStatus)) + return false; if (accountId == null) { if (other.accountId != null) return false; @@ -204,11 +210,6 @@ public class AccountByAuthenticationProvider { return false; } else if (!accountName.equals(other.accountName)) return false; - if (accountStatus == null) { - if (other.accountStatus != null) - return false; - } else if (!accountStatus.equals(other.accountStatus)) - return false; if (authenticationProvider == null) { if (other.authenticationProvider != null) return false; @@ -280,10 +281,10 @@ public class AccountByAuthenticationProvider { .append(authenticationProvider).append(", authenticationProviderType=") .append(authenticationProviderType).append(", firstName=").append(firstName).append(", lastName=") .append(lastName).append(", avatar=").append(avatar).append(", accountName=").append(accountName) - .append(", username=").append(username).append(", accountStatus=").append(accountStatus) - .append(", creationTimestamp=").append(creationTimestamp).append(", lastUpdateTimestamp=") - .append(lastUpdateTimestamp).append(", contactsInfo=").append(contactsInfo).append(", qrCode=") - .append(qrCode).append(", roles=").append(roles).append("]"); + .append(", username=").append(username).append(", creationTimestamp=").append(creationTimestamp) + .append(", lastUpdateTimestamp=").append(lastUpdateTimestamp).append(", contactsInfo=") + .append(contactsInfo).append(", qrCode=").append(qrCode).append(", roles=").append(roles) + .append(", accessStatus=").append(accessStatus).append("]"); return builder.toString(); } @@ -317,9 +318,6 @@ public class AccountByAuthenticationProvider { if (getUsername() != null) { builder.setUsername(getUsername()); } - if (getAccountStatus() != null) { - builder.setAccountStatus(getAccountStatus()); - } if (getQrCode() != null) { builder.setQrCode(getQrCode()); } @@ -336,6 +334,9 @@ public class AccountByAuthenticationProvider { builder.addRoles(Role.valueOf(role)); } } + if (getAccessStatus() != null) { + builder.setAccessStatus(AccessStatus.valueOf(getAccessStatus())); + } return builder.build(); @@ -353,12 +354,12 @@ public class AccountByAuthenticationProvider { account.setAvatar(this.avatar); account.setAccountName(this.accountName); account.setUsername(this.username); - account.setAccountStatus(this.accountStatus); account.setCreationTimestamp(this.creationTimestamp); account.setLastUpdateTimestamp(this.lastUpdateTimestamp); account.setContactsInfo(this.contactsInfo); account.setQrCode(this.qrCode); account.setRoles(this.roles); + account.setAccessStatus(this.accessStatus); return account; } } diff --git a/src/main/java/biz/nynja/account/models/AccountByProfileId.java b/src/main/java/biz/nynja/account/models/AccountByProfileId.java index dea5c75..d0da520 100644 --- a/src/main/java/biz/nynja/account/models/AccountByProfileId.java +++ b/src/main/java/biz/nynja/account/models/AccountByProfileId.java @@ -7,6 +7,7 @@ import java.nio.ByteBuffer; import java.util.Set; import java.util.UUID; +import biz.nynja.account.grpc.AccessStatus; import biz.nynja.account.grpc.AccountDetails; import biz.nynja.account.grpc.AccountDetails.Builder; import biz.nynja.account.grpc.Role; @@ -23,12 +24,12 @@ public class AccountByProfileId { private ByteBuffer avatar; private String accountName; private String username; - private String accountStatus; private Long creationTimestamp; private Long lastUpdateTimestamp; private Set contactsInfo; private String qrCode; private Set roles; + private String accessStatus; public UUID getAccountId() { return accountId; @@ -110,14 +111,6 @@ public class AccountByProfileId { this.username = username; } - public String getAccountStatus() { - return accountStatus; - } - - public void setAccountStatus(String accountStatus) { - this.accountStatus = accountStatus; - } - public Long getCreationTimestamp() { return creationTimestamp; } @@ -158,14 +151,22 @@ public class AccountByProfileId { this.roles = roles; } + public String getAccessStatus() { + return accessStatus; + } + + public void setAccessStatus(String accessStatus) { + this.accessStatus = accessStatus; + } + @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((accessStatus == null) ? 0 : accessStatus.hashCode()); result = prime * result + ((accountId == null) ? 0 : accountId.hashCode()); result = prime * result + ((accountMark == null) ? 0 : accountMark.hashCode()); result = prime * result + ((accountName == null) ? 0 : accountName.hashCode()); - result = prime * result + ((accountStatus == null) ? 0 : accountStatus.hashCode()); result = prime * result + ((authenticationProvider == null) ? 0 : authenticationProvider.hashCode()); result = prime * result + ((authenticationProviderType == null) ? 0 : authenticationProviderType.hashCode()); result = prime * result + ((avatar == null) ? 0 : avatar.hashCode()); @@ -190,6 +191,11 @@ public class AccountByProfileId { if (getClass() != obj.getClass()) return false; AccountByProfileId other = (AccountByProfileId) obj; + if (accessStatus == null) { + if (other.accessStatus != null) + return false; + } else if (!accessStatus.equals(other.accessStatus)) + return false; if (accountId == null) { if (other.accountId != null) return false; @@ -205,11 +211,6 @@ public class AccountByProfileId { return false; } else if (!accountName.equals(other.accountName)) return false; - if (accountStatus == null) { - if (other.accountStatus != null) - return false; - } else if (!accountStatus.equals(other.accountStatus)) - return false; if (authenticationProvider == null) { if (other.authenticationProvider != null) return false; @@ -281,10 +282,10 @@ public class AccountByProfileId { .append(authenticationProvider).append(", authenticationProviderType=") .append(authenticationProviderType).append(", firstName=").append(firstName).append(", lastName=") .append(lastName).append(", avatar=").append(avatar).append(", accountName=").append(accountName) - .append(", username=").append(username).append(", accountStatus=").append(accountStatus) - .append(", creationTimestamp=").append(creationTimestamp).append(", lastUpdateTimestamp=") - .append(lastUpdateTimestamp).append(", contactsInfo=").append(contactsInfo).append(", qrCode=") - .append(qrCode).append(", roles=").append(roles).append("]"); + .append(", username=").append(username).append(", creationTimestamp=").append(creationTimestamp) + .append(", lastUpdateTimestamp=").append(lastUpdateTimestamp).append(", contactsInfo=") + .append(contactsInfo).append(", qrCode=").append(qrCode).append(", roles=").append(roles) + .append(", accessStatus=").append(accessStatus).append("]"); return builder.toString(); } @@ -319,9 +320,6 @@ public class AccountByProfileId { if (getUsername() != null) { builder.setUsername(getUsername()); } - if (getAccountStatus() != null) { - builder.setAccountStatus(getAccountStatus()); - } if (getQrCode() != null) { builder.setQrCode(getQrCode()); } @@ -338,6 +336,9 @@ public class AccountByProfileId { builder.addRoles(Role.valueOf(role)); } } + if (getAccessStatus() != null) { + builder.setAccessStatus(AccessStatus.valueOf(getAccessStatus())); + } return builder.build(); diff --git a/src/main/java/biz/nynja/account/models/AccountByUsername.java b/src/main/java/biz/nynja/account/models/AccountByUsername.java index 9c12b6b..ccc616b 100644 --- a/src/main/java/biz/nynja/account/models/AccountByUsername.java +++ b/src/main/java/biz/nynja/account/models/AccountByUsername.java @@ -19,12 +19,12 @@ public class AccountByUsername { private ByteBuffer avatar; private String accountName; private String username; - private String accountStatus; private Long creationTimestamp; private Long lastUpdateTimestamp; private Set contactsInfo; private String qrCode; private Set roles; + private String accessStatus; public UUID getProfileId() { return profileId; @@ -106,14 +106,6 @@ public class AccountByUsername { this.username = username; } - public String getAccountStatus() { - return accountStatus; - } - - public void setAccountStatus(String accountStatus) { - this.accountStatus = accountStatus; - } - public Long getCreationTimestamp() { return creationTimestamp; } @@ -154,14 +146,22 @@ public class AccountByUsername { this.roles = roles; } + public String getAccessStatus() { + return accessStatus; + } + + public void setAccessStatus(String accessStatus) { + this.accessStatus = accessStatus; + } + @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((accessStatus == null) ? 0 : accessStatus.hashCode()); result = prime * result + ((accountId == null) ? 0 : accountId.hashCode()); result = prime * result + ((accountMark == null) ? 0 : accountMark.hashCode()); result = prime * result + ((accountName == null) ? 0 : accountName.hashCode()); - result = prime * result + ((accountStatus == null) ? 0 : accountStatus.hashCode()); result = prime * result + ((authenticationProvider == null) ? 0 : authenticationProvider.hashCode()); result = prime * result + ((authenticationProviderType == null) ? 0 : authenticationProviderType.hashCode()); result = prime * result + ((avatar == null) ? 0 : avatar.hashCode()); @@ -186,6 +186,11 @@ public class AccountByUsername { if (getClass() != obj.getClass()) return false; AccountByUsername other = (AccountByUsername) obj; + if (accessStatus == null) { + if (other.accessStatus != null) + return false; + } else if (!accessStatus.equals(other.accessStatus)) + return false; if (accountId == null) { if (other.accountId != null) return false; @@ -201,11 +206,6 @@ public class AccountByUsername { return false; } else if (!accountName.equals(other.accountName)) return false; - if (accountStatus == null) { - if (other.accountStatus != null) - return false; - } else if (!accountStatus.equals(other.accountStatus)) - return false; if (authenticationProvider == null) { if (other.authenticationProvider != null) return false; @@ -277,10 +277,10 @@ public class AccountByUsername { .append(authenticationProvider).append(", authenticationProviderType=") .append(authenticationProviderType).append(", firstName=").append(firstName).append(", lastName=") .append(lastName).append(", avatar=").append(avatar).append(", accountName=").append(accountName) - .append(", username=").append(username).append(", accountStatus=").append(accountStatus) - .append(", creationTimestamp=").append(creationTimestamp).append(", lastUpdateTimestamp=") - .append(lastUpdateTimestamp).append(", contactsInfo=").append(contactsInfo).append(", qrCode=") - .append(qrCode).append(", roles=").append(roles).append("]"); + .append(", username=").append(username).append(", creationTimestamp=").append(creationTimestamp) + .append(", lastUpdateTimestamp=").append(lastUpdateTimestamp).append(", contactsInfo=") + .append(contactsInfo).append(", qrCode=").append(qrCode).append(", roles=").append(roles) + .append(", accessStatus=").append(accessStatus).append("]"); return builder.toString(); } diff --git a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java index 7a867ec..87349e0 100644 --- a/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java @@ -28,6 +28,7 @@ import com.datastax.driver.core.Session; import biz.nynja.account.components.AccountServiceHelper; import biz.nynja.account.components.StatementsPool; +import biz.nynja.account.grpc.AccessStatus; import biz.nynja.account.grpc.CompletePendingAccountCreationRequest; import biz.nynja.account.grpc.Role; import biz.nynja.account.grpc.UpdateAccountRequest; @@ -137,13 +138,14 @@ public class AccountRepositoryAdditionalImpl implements AccountRepositoryAdditio newAccount.setLastName(request.getLastName()); newAccount.setAvatar(request.getAvatar().asReadOnlyByteBuffer()); newAccount.setAccountName(request.getAccountName()); - newAccount.setAccountStatus(request.getAccountStatus()); newAccount.setUsername(request.getUsername()); newAccount.setCreationTimestamp(creationTimestamp); newAccount.setQrCode(request.getQrCode()); newAccount.setRoles((request.getRolesList() == null || request.getRolesList().isEmpty()) ? new HashSet(Arrays.asList(Role.USER.toString())) : request.getRolesList().stream().map(n -> n.toString()).collect(Collectors.toSet())); + newAccount.setAccessStatus(request.getAccessStatus() == null ? AccessStatus.ENABLED.toString() + : request.getAccessStatus().toString()); batchOps.insert(newAccount); } @@ -320,8 +322,8 @@ public class AccountRepositoryAdditionalImpl implements AccountRepositoryAdditio updatedAccount.setFirstName(request.getFirstName()); updatedAccount.setLastName(request.getLastName()); updatedAccount.setUsername(request.getUsername()); - updatedAccount.setAccountStatus(request.getAccountStatus()); updatedAccount.setLastUpdateTimestamp(lastUpdateTimestamp); + updatedAccount.setAccessStatus(request.getAccessStatus().toString()); batchOps.update(updatedAccount); } diff --git a/src/test/java/biz/nynja/account/utils/Util.java b/src/test/java/biz/nynja/account/utils/Util.java index fe26e10..17d0eca 100644 --- a/src/test/java/biz/nynja/account/utils/Util.java +++ b/src/test/java/biz/nynja/account/utils/Util.java @@ -12,16 +12,16 @@ import java.util.UUID; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; -import biz.nynja.account.grpc.Status; +import biz.nynja.account.grpc.AccessStatus; import biz.nynja.account.models.Account; import biz.nynja.account.models.AccountByAuthenticationProvider; import biz.nynja.account.models.AccountByProfileId; import biz.nynja.account.models.AuthenticationProvider; import biz.nynja.account.models.ContactInfo; -import biz.nynja.account.models.Profile; -import biz.nynja.account.models.ProfileByAuthenticationProvider; import biz.nynja.account.models.PendingAccount; import biz.nynja.account.models.PendingAccountByAuthenticationProvider; +import biz.nynja.account.models.Profile; +import biz.nynja.account.models.ProfileByAuthenticationProvider; /** * Unit tests variables, beans and help methods. @@ -125,7 +125,7 @@ public class Util { account.setLastName(LAST_NAME); account.setAuthenticationProvider(EMAIL); account.setAuthenticationProviderType(EMAIL_TYPE); - account.setAccountStatus(Status.SUSPENDED.name()); + account.setAccessStatus(AccessStatus.ENABLED.toString()); return account; } @@ -141,12 +141,12 @@ public class Util { account.setLastName(LAST_NAME); account.setAvatar(AVATAR); account.setAccountName(ACCOUNT_NAME); - account.setAccountStatus(ACCOUNT_STATUS); account.setUsername(USERNAME); account.setCreationTimestamp(CREATION_TIMESTAMP); account.setLastUpdateTimestamp(LAST_UPDATE_TIMESTAMP); account.setContactsInfo(CONTACTS_INFO); account.setQrCode(QR_CODE); + account.setAccessStatus(AccessStatus.ENABLED.toString()); return account; } -- GitLab