Merge pull request #124 from intercom/update_user_companies

Update user companies

Author: mmartinic

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

@@ -1,9 +1,10 @@
 package io.intercom.api;
 
-
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import java.util.ArrayList;
 import java.util.List;
 
 class CompanyUpdateBuilder {
@@ -13,11 +14,13 @@ class CompanyUpdateBuilder {
      */
     static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection add, CompanyCollection remove) {
 
-        final ArrayList<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
+        final List<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
         if (add != null) {
             final List<Company> companies = add.getPage();
             for (Company company : companies) {
-                updatableCompanies.add(prepareUpdatableCompany(company));
+                if (!isCompanyInList(company, remove)) {
+                    updatableCompanies.add(prepareUpdatableCompany(company));
+                }
             }
         }
 
@@ -31,14 +34,29 @@ static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection ad
         return updatableCompanies;
     }
 
+    private static boolean isCompanyInList(final Company company, CompanyCollection companyCollection) {
+        if (companyCollection == null) {
+            return false;
+        }
+
+        return Iterables.any(companyCollection.getPage(), new Predicate<Company>() {
+            @Override
+            public boolean apply(Company e) {
+                return Objects.equal(company.getCompanyID(), e.getCompanyID())
+                        || Objects.equal(company.getId(), e.getId());
+            }
+        });
+    }
+
     private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
         final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
+        updatableCompany.setId(company.getId());
         updatableCompany.setCompanyID(company.getCompanyID());
         updatableCompany.setName(company.getName());
         updatableCompany.setSessionCount(company.getSessionCount());
         updatableCompany.setMonthlySpend(company.getMonthlySpend());
         updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
-        if(company.getCustomAttributes() != null) {
+        if (company.getCustomAttributes() != null) {
             updatableCompany.getCustomAttributes().putAll(company.getCustomAttributes());
         }
         if (company.getPlan() != null) {

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

@@ -19,17 +19,15 @@ public static void beforeClass() {
         mapper = MapperSupport.objectMapper();
     }
 
-
     @Test
     public void testRemove() throws Exception {
 
         final Company bacon = new Company().setCompanyID("bacon");
         final Company pancake = new Company().setCompanyID("pancake");
 
         final List<CompanyWithStringPlan> cos = CompanyUpdateBuilder.buildUserUpdateCompanies(
-            new CompanyCollection(Lists.newArrayList(pancake)),
-            new CompanyCollection(Lists.newArrayList(bacon))
-        );
+                new CompanyCollection(Lists.newArrayList(bacon, pancake)),
+                new CompanyCollection(Lists.newArrayList(bacon)));
 
         Boolean baconIsRemoved = null;
         Boolean pancakeIsRemoved = null;
@@ -59,6 +57,7 @@ public void testRemove() throws Exception {
         final String baconJson = mapper.writeValueAsString(baconCo);
         assertTrue(baconJson.contains("remove"));
         assertTrue(baconJson.contains("true"));
+
     }
 
     @Test