From 9e98efc7dd7f989bd4042612eee5bd6c75d56cc1 Mon Sep 17 00:00:00 2001
From: remillet <remillet@yahoo.com>
Date: Wed, 24 Jan 2018 12:52:04 -0800
Subject: [PATCH] DRYD-235: Added showRoles query param to /accounts/${csid}
 endpoint.

---
 .../services/client/AccountClient.java        |  1 +
 .../storage/AccountDocumentHandler.java       | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java
index aa0aa2793..6f9f6d9c0 100644
--- a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java
+++ b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java
@@ -48,6 +48,7 @@ public class AccountClient extends AbstractServiceClientImpl<AccountsCommonList,
     public final static String EMAIL_QUERY_PARAM = "email";
 	public static final String PASSWORD_RESET_TOKEN_QP = "token";
 	public static final String PASSWORD_RESET_PASSWORD_QP = "password";
+	public static final String INCLUDE_ROLES_QP = "showRoles";
 
 	public AccountClient() throws Exception {
 		super();
diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
index ed4fc0a9b..5049b6503 100644
--- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
+++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java
@@ -35,12 +35,16 @@ import org.collectionspace.services.account.AccountListItem;
 import org.collectionspace.services.account.AccountRoleSubResource;
 import org.collectionspace.services.account.Status;
 import org.collectionspace.services.authorization.AccountRole;
+import org.collectionspace.services.authorization.PermissionRole;
+import org.collectionspace.services.authorization.PermissionRoleSubResource;
 import org.collectionspace.services.authorization.SubjectType;
 import org.collectionspace.services.account.RoleValue;
 import org.collectionspace.services.client.AccountClient;
 import org.collectionspace.services.client.AccountRoleFactory;
+import org.collectionspace.services.client.RoleClient;
 import org.collectionspace.services.common.storage.TransactionContext;
 import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler;
+import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentWrapper;
@@ -185,12 +189,23 @@ public class AccountDocumentHandler
         getServiceContext().setOutput(getCommonPartList());
     }
 
-    @Override
-    public AccountsCommon extractCommonPart(
-            DocumentWrapper<AccountsCommon> wrapDoc)
-            throws Exception {
-        return wrapDoc.getWrappedObject();
-    }
+	@SuppressWarnings("unchecked")
+	@Override
+	public AccountsCommon extractCommonPart(DocumentWrapper<AccountsCommon> wrapDoc) throws Exception {
+		AccountsCommon account = wrapDoc.getWrappedObject();
+		
+		String includeRolesQueryParamValue = (String) getServiceContext().getQueryParams().getFirst(AccountClient.INCLUDE_ROLES_QP);
+		boolean includeRoles = Tools.isTrue(includeRolesQueryParamValue);
+		if (includeRoles) {
+			AccountRoleSubResource accountRoleResource = new AccountRoleSubResource(
+					AccountRoleSubResource.ACCOUNT_ACCOUNTROLE_SERVICE);
+			AccountRole accountRole = accountRoleResource.getAccountRole(getServiceContext(), account.getCsid(),
+					SubjectType.ROLE);
+			account.setRole(AccountRoleFactory.convert(accountRole.getRole()));
+		}
+		
+		return wrapDoc.getWrappedObject();
+	}
 
     @Override
     public void fillCommonPart(AccountsCommon obj, DocumentWrapper<AccountsCommon> wrapDoc)
-- 
2.47.3