Merge pull request #108 from intercom/Ed-embeddedCompanyCustomAttributes

Ed - when embedding a company in the user update, we should also incl…

Author: Ed Fricker

intercom-java/src/main/java/io/intercom/api/CompanyUpdateBuilder.java

@@ -38,6 +38,9 @@ private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
         updatableCompany.setSessionCount(company.getSessionCount());
         updatableCompany.setMonthlySpend(company.getMonthlySpend());
         updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
+        if(company.getCustomAttributes() != null) {
+            updatableCompany.getCustomAttributes().putAll(company.getCustomAttributes());
+        }
         if (company.getPlan() != null) {
             updatableCompany.setPlan(company.getPlan().getName());
         }

intercom-java/src/test/java/io/intercom/api/CompanyUpdateBuilderTest.java

@@ -6,6 +6,7 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.*;
 
@@ -60,4 +61,34 @@ public void testRemove() throws Exception {
         assertTrue(baconJson.contains("true"));
     }
 
+    @Test
+    public void shouldIncludeCustomAttributes() throws Exception {
+
+        final Company withCustomAttributes = new Company().setName("Weyland Corp").setCompanyID("2093");
+
+        withCustomAttributes.addCustomAttribute(CustomAttribute.newIntegerAttribute("foodstuff-items", 246));
+        withCustomAttributes.addCustomAttribute(CustomAttribute.newStringAttribute("bestseller", "fruity oaty bar"));
+
+        final List<CompanyWithStringPlan> updatedCompanies = CompanyUpdateBuilder.buildUserUpdateCompanies(new CompanyCollection(Lists.newArrayList(withCustomAttributes)), null);
+
+        CompanyWithStringPlan weylandCorp = null;
+
+        for (CompanyWithStringPlan updatedCompany : updatedCompanies) {
+            if (updatedCompany.getCompanyID().equals("2093")) {
+                weylandCorp = updatedCompany;
+            }
+        }
+
+        assertNotNull(weylandCorp);
+        assertNotNull(weylandCorp.getCustomAttributes());
+        Map<String, CustomAttribute> retrievedAttributes = weylandCorp.getCustomAttributes();
+
+        assertNotNull(retrievedAttributes.get("foodstuff-items"));
+        assertTrue(retrievedAttributes.get("foodstuff-items").getValue().equals(246));
+        assertNotNull(retrievedAttributes.get("bestseller"));
+        assertTrue(retrievedAttributes.get("bestseller").getValue().equals("fruity oaty bar"));
+
+
+    }
+
 }