Allow users to be removed from companies

Author: dehora

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

@@ -11,23 +11,36 @@ class CompanyUpdateBuilder {
     /**
      * Provide restrictions on the company data that can be sent via a user update
      */
-    static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection c) {
+    static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection add, CompanyCollection remove) {
+
         final ArrayList<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
-        if (c != null) {
-            final List<Company> companies = c.getPage();
+        if (add != null) {
+            final List<Company> companies = add.getPage();
+            for (Company company : companies) {
+                updatableCompanies.add(prepareUpdatableCompany(company));
+            }
+        }
+
+        if (remove != null) {
+            final List<Company> companies = remove.getPage();
             for (Company company : companies) {
-                final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
-                updatableCompany.setCompanyID(company.getCompanyID());
-                updatableCompany.setName(company.getName());
-                updatableCompany.setSessionCount(company.getSessionCount());
-                updatableCompany.setMonthlySpend(company.getMonthlySpend());
-                updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
-                if (company.getPlan() != null) {
-                    updatableCompany.setPlan(company.getPlan().getName());
-                }
-                updatableCompanies.add(updatableCompany);
+                updatableCompanies.add(prepareUpdatableCompany(company).setRemove(Boolean.TRUE));
             }
         }
+
         return updatableCompanies;
     }
+
+    private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
+        final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
+        updatableCompany.setCompanyID(company.getCompanyID());
+        updatableCompany.setName(company.getName());
+        updatableCompany.setSessionCount(company.getSessionCount());
+        updatableCompany.setMonthlySpend(company.getMonthlySpend());
+        updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
+        if (company.getPlan() != null) {
+            updatableCompany.setPlan(company.getPlan().getName());
+        }
+        return updatableCompany;
+    }
 }

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

@@ -37,6 +37,10 @@ class CompanyWithStringPlan extends TypedData {
     @JsonProperty("custom_attributes")
     private Map<String, CustomAttribute> customAttributes = Maps.newHashMap();
 
+    @JsonProperty("remove")
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    private Boolean remove;
+
     public CompanyWithStringPlan() {
     }
 
@@ -108,4 +112,12 @@ public void setCustomAttributes(Map<String, CustomAttribute> customAttributes) {
         this.customAttributes = customAttributes;
     }
 
+    public Boolean getRemove() {
+        return remove;
+    }
+
+    public CompanyWithStringPlan setRemove(Boolean remove) {
+        this.remove = remove;
+        return this;
+    }
 }

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

@@ -27,7 +27,7 @@ public class User extends TypedData implements Replier {
     }
 
     private static List<CompanyWithStringPlan> buildUserUpdateCompanies(User user) {
-        return CompanyUpdateBuilder.buildUserUpdateCompanies(user.getCompanyCollection());
+        return CompanyUpdateBuilder.buildUserUpdateCompanies(user.getCompanyCollection(), user.getRemoveCompanyCollection());
     }
 
     public static User find(String id)
@@ -333,6 +333,8 @@ public Boolean isNewSession() {
 
     private Boolean untag;
 
+    private CompanyCollection removeCompanyCollection = new CompanyCollection();
+
     public User() {
     }
 
@@ -497,6 +499,11 @@ public User addCompany(Company company) {
         return this;
     }
 
+    public User removeCompany(Company company) {
+        this.removeCompanyCollection.addCompany(company);
+        return this;
+    }
+
     public SocialProfileCollection getSocialProfileCollection() {
         return socialProfileCollection;
     }
@@ -527,6 +534,14 @@ public User setNewSession(boolean newSession) {
         return this;
     }
 
+    CompanyCollection getRemoveCompanyCollection() {
+        return removeCompanyCollection;
+    }
+
+    void setRemoveCompanyCollection(CompanyCollection removeCompanyCollection) {
+        this.removeCompanyCollection = removeCompanyCollection;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

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

@@ -0,0 +1,63 @@
+package io.intercom.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class CompanyUpdateBuilderTest {
+
+    private static ObjectMapper mapper;
+
+    @BeforeClass
+    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))
+        );
+
+        Boolean baconIsRemoved = null;
+        Boolean pancakeIsRemoved = null;
+
+        CompanyWithStringPlan baconCo = null;
+        CompanyWithStringPlan pancakeCo = null;
+
+        for (CompanyWithStringPlan co : cos) {
+            if (co.getCompanyID().equals("pancake")) {
+                pancakeIsRemoved = co.getRemove();
+                pancakeCo = co;
+            }
+
+            if (co.getCompanyID().equals("bacon")) {
+                baconIsRemoved = co.getRemove();
+                baconCo = co;
+            }
+
+        }
+        assertNull(pancakeIsRemoved);
+        assertTrue(baconIsRemoved);
+
+        final String pancakeJson = mapper.writeValueAsString(pancakeCo);
+        assertFalse(pancakeJson.contains("remove"));
+        assertFalse(pancakeJson.contains("true"));
+
+        final String baconJson = mapper.writeValueAsString(baconCo);
+        assertTrue(baconJson.contains("remove"));
+        assertTrue(baconJson.contains("true"));
+    }
+
+}