From e3abe9c9c36d94065413e0268012175b26437b36 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@yahoo.com>
Date: Wed, 5 Dec 2018 16:42:12 -0800
Subject: [PATCH] DRYD-548: Added code to have the 'contacts_common' part added
 to a GET request for a Person and Org term.

---
 .../common/vocabulary/AuthorityResourceWithContacts.java    | 6 +++---
 .../org/collectionspace/services/client/ContactClient.java  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResourceWithContacts.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResourceWithContacts.java
index 9f0d93018..7a3aaadaa 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResourceWithContacts.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResourceWithContacts.java
@@ -260,17 +260,17 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthItemHandler>
             //
             
             //FIXME: Need to support paging
-            AbstractCommonList contactObjectList = getContactList(null, parentIdentifier, itemIdentifier, uriInfo);
+            AbstractCommonList contactObjectList = getContactList(ctx, parentIdentifier, itemIdentifier, uriInfo);
             if (contactObjectList.getTotalItems() > 1) {
             		String errMsg = String.format("Can't get complete list of contacts for authority term '%s' in authority '%s'.", parentIdentifier, itemIdentifier);
             		logger.warn(errMsg);
             }
             
-            if (contactObjectList.getTotalItems() > 1) {
+            if (contactObjectList.getTotalItems() > 0) {
             		ListItem item = contactObjectList.getListItem().get(0);
             		String csid = this.getCsid(item);
             		PoxPayloadOut contactPayloadOut = getContactPayload(parentIdentifier, itemIdentifier, csid);
-            		PayloadOutputPart contactCommonPart = contactPayloadOut.getPart(ContactClient.PART_COMMON_LABEL);
+            		PayloadOutputPart contactCommonPart = contactPayloadOut.getPart(ContactClient.SERVICE_COMMON_PART_NAME);
             		result.addPart(contactCommonPart);
             }
             
diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java
index f976fa29f..ee8e1a30a 100644
--- a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java
+++ b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java
@@ -32,6 +32,8 @@ public class ContactClient extends AbstractCommonListPoxServiceClientImpl<Contac
     public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
     public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/";
     public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
+    public static final String SERVICE_COMMON_PART_NAME = SERVICE_NAME + PART_LABEL_SEPARATOR + PART_COMMON_LABEL;
+
 
     public ContactClient() throws Exception {
 		super();
-- 
2.47.3