Merge pull request #58 from CallFire/develop

vmalinovskiy · web-flow · commit db91ced08448 · 2017-01-27T18:37:33.000+02:00
Develop
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,8 @@
 Callfire API client Changelog
 =============================
+Version 1.7.14 - Jan 27 2017
+- added dnc apis
+
 Version 1.7.13 - Dec 30 2016
 - minor fixes for get contacts history api
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group = com.callfire
 baseName = callfire-api-client
-version = 1.7.13
+version = 1.7.14
diff --git a/src/itest/java/com/callfire/api/client/integration/callstexts/CallsApiTest.java b/src/itest/java/com/callfire/api/client/integration/callstexts/CallsApiTest.java
@@ -17,7 +17,6 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -45,15 +44,14 @@ public void testGetCall() throws Exception {
     public void testFindCalls() throws Exception {
         CallfireClient callfireClient = getCallfireClient();
         FindCallsRequest request = FindCallsRequest.create()
-            .states(Arrays.asList(Call.State.FINISHED, Call.State.READY))
-            .intervalBegin(DateUtils.addMonths(new Date(), -2))
+            .intervalBegin(DateUtils.addMonths(new Date(), -10))
             .intervalEnd(new Date())
-            .limit(3L)
+            .limit(1L)
             .build();
         Page<Call> calls = callfireClient.callsApi().find(request);
         System.out.println(calls);
 
-        assertEquals(3, calls.getItems().size());
+        assertEquals(1, calls.getItems().size());
     }
 
     @Test
diff --git a/src/itest/java/com/callfire/api/client/integration/campaigns/CallBroadcastsApiTest.java b/src/itest/java/com/callfire/api/client/integration/campaigns/CallBroadcastsApiTest.java
@@ -22,6 +22,7 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * integration tests for /campaigns/voice-broadcasts api endpoint
@@ -131,24 +132,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
         System.out.println(calls);
         assertEquals(2, calls.size());
 
-        // get batches
-        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
-            .id(id)
-            .limit(10000L)
-            .build();
-        Page<Batch> batches = api.getBatches(getBatchesRequest);
-        System.out.println(batches);
-
         // add batch
         AddBatchRequest addBatchRequest = AddBatchRequest.create()
             .campaignId(id)
             .name("new_batch" + System.currentTimeMillis())
             .recipients(makeRecipients())
             .build();
         ResourceId newBatchId = api.addBatch(addBatchRequest);
+        assertNotNull(newBatchId.getId());
 
-        Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
+        // get batches
+        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
+            .id(id)
+            .limit(100L)
+            .build();
+        Page<Batch> batches = api.getBatches(getBatchesRequest);
         System.out.println(batches);
-        assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
+        assertTrue(batches.getItems().size() == 100);
     }
 }
diff --git a/src/itest/java/com/callfire/api/client/integration/campaigns/IvrBroadcastsApiTest.java b/src/itest/java/com/callfire/api/client/integration/campaigns/IvrBroadcastsApiTest.java
@@ -20,6 +20,7 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * integration tests for /campaigns/ivrs api endpoint
@@ -115,23 +116,21 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
         System.out.println(calls);
         assertEquals(2, calls.size());
 
-        // get batches
-        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
-            .id(id)
-            .build();
-        Page<Batch> batches = api.getBatches(getBatchesRequest);
-        System.out.println(batches);
-
         // add batch
         AddBatchRequest addBatchRequest = AddBatchRequest.create()
             .campaignId(id)
             .name("new_batch")
             .recipients(makeRecipients())
             .build();
-        api.addBatch(addBatchRequest);
+        ResourceId addedBatchId = api.addBatch(addBatchRequest);
+        assertNotNull(addedBatchId.getId());
 
-        Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
+        // get batches
+        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
+            .id(id)
+            .build();
+        Page<Batch> batches = api.getBatches(getBatchesRequest);
         System.out.println(batches);
-        assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
+        assertTrue(batches.getItems().size() == 100);
     }
 }
diff --git a/src/itest/java/com/callfire/api/client/integration/campaigns/TextAutoRepliesApiTest.java b/src/itest/java/com/callfire/api/client/integration/campaigns/TextAutoRepliesApiTest.java
@@ -38,16 +38,10 @@ public void testCrudOperations() throws Exception {
             .build();
         Page<TextAutoReply> textAutoReplies = api.find(request);
         System.out.println(textAutoReplies);
-
         assertTrue(textAutoReplies.getTotalCount() > 0);
         assertTrue(textAutoReplies.getItems().size() > 0);
-        TextAutoReply savedTextAutoReply = textAutoReplies.getItems().get(textAutoReplies.getItems().size() - 1);
-        assertEquals(resourceId.getId(), savedTextAutoReply.getId());
-        assertEquals(textAutoReply.getNumber(), savedTextAutoReply.getNumber());
-        assertEquals(textAutoReply.getMessage(), savedTextAutoReply.getMessage());
-        assertEquals(textAutoReply.getMatch(), savedTextAutoReply.getMatch());
 
-        savedTextAutoReply = api.get(resourceId.getId(), "number,message");
+        TextAutoReply savedTextAutoReply = api.get(resourceId.getId(), "number,message");
         System.out.println(savedTextAutoReply);
 
         assertNull(savedTextAutoReply.getId());
diff --git a/src/itest/java/com/callfire/api/client/integration/campaigns/TextBroadcastsApiTest.java b/src/itest/java/com/callfire/api/client/integration/campaigns/TextBroadcastsApiTest.java
@@ -149,25 +149,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
         assertEquals(2, texts.size());
         assertThat(texts.get(0).getMessage(), startsWith("msg"));
 
-        // get batches
-        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
-            .id(id)
-            .limit(10000L)
-            .build();
-        Page<Batch> batches = api.getBatches(getBatchesRequest);
-        System.out.println(batches);
-
         // add batch
         AddBatchRequest addBatchRequest = AddBatchRequest.create()
             .campaignId(id)
             .name("new_batch" + System.currentTimeMillis())
             .recipients(makeRecipients())
             .build();
         ResourceId resourceId = api.addBatch(addBatchRequest);
-
-        Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
+        assertNotNull(resourceId.getId());
+        // get batches
+        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
+            .id(id)
+            .limit(100L)
+            .build();
+        Page<Batch> batches = api.getBatches(getBatchesRequest);
         System.out.println(batches);
-        assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
+        assertEquals(batches.getItems().size(), 100);
 
         Batch savedBatch = getCallfireClient().batchesApi().get(resourceId.getId());
         assertTrue(savedBatch.getEnabled());
diff --git a/src/itest/java/com/callfire/api/client/integration/campaigns/VoiceBroadcastsApiTest.java b/src/itest/java/com/callfire/api/client/integration/campaigns/VoiceBroadcastsApiTest.java
@@ -121,24 +121,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
         System.out.println(calls);
         assertEquals(2, calls.size());
 
-        // get batches
-        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
-            .id(id)
-            .limit(10000L)
-            .build();
-        Page<Batch> batches = api.getBatches(getBatchesRequest);
-        System.out.println(batches);
-
         // add batch
         AddBatchRequest addBatchRequest = AddBatchRequest.create()
             .campaignId(id)
             .name("new_batch" + System.currentTimeMillis())
             .recipients(makeRecipients())
             .build();
-        api.addBatch(addBatchRequest);
+        ResourceId batch = api.addBatch(addBatchRequest);
+        assertNotNull(batch.getId());
 
-        Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
+        // get batches
+        GetByIdRequest getBatchesRequest = GetByIdRequest.create()
+            .id(id)
+            .limit(100L)
+            .build();
+        Page<Batch> batches = api.getBatches(getBatchesRequest);
         System.out.println(batches);
-        assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
+        assertEquals(batches.getItems().size(), 100);
     }
 }
diff --git a/src/itest/java/com/callfire/api/client/integration/contacts/ContactsApiTest.java b/src/itest/java/com/callfire/api/client/integration/contacts/ContactsApiTest.java
@@ -29,15 +29,32 @@ public class ContactsApiTest extends AbstractIntegrationTest {
     @Test
     public void testFindContacts() throws Exception {
         FindContactsRequest request = FindContactsRequest.create()
-            .number(asList("16506190257", "18778973473"))
-            .id(asList(1L, 2L))
             .build();
         CallfireClient client = getCallfireClient();
         Page<Contact> contacts = client.contactsApi().find(request);
         System.out.println(contacts);
-
-        assertEquals(1, contacts.getItems().size());
-        assertEquals("18088395900", contacts.getItems().get(0).getWorkPhone());
+        assertEquals(100, contacts.getItems().size());
+
+        Contact cnt = contacts.getItems().get(0);
+        String numberForSearching = null;
+
+        if (cnt.getHomePhone() != null)
+            numberForSearching = cnt.getHomePhone();
+        else if (cnt.getMobilePhone() != null)
+            numberForSearching = cnt.getMobilePhone();
+        else if (cnt.getWorkPhone() != null)
+            numberForSearching = cnt.getMobilePhone();
+
+        if (numberForSearching != null) {
+            request = FindContactsRequest.create()
+                    .number(asList(numberForSearching))
+                    .build();
+            contacts = client.contactsApi().find(request);
+            assertTrue(numberForSearching.equals(contacts.getItems().get(0).getWorkPhone()) ||
+                       numberForSearching.equals(contacts.getItems().get(0).getHomePhone()) ||
+                       numberForSearching.equals(contacts.getItems().get(0).getMobilePhone()));
+            assertEquals(1, contacts.getItems().size());
+        }
     }
 
     @Test
diff --git a/src/itest/java/com/callfire/api/client/integration/contacts/DncApiTest.java b/src/itest/java/com/callfire/api/client/integration/contacts/DncApiTest.java
@@ -1,14 +1,26 @@
 package com.callfire.api.client.integration.contacts;
 
+import com.callfire.api.client.CallfireClient;
+import com.callfire.api.client.api.common.model.Page;
+import com.callfire.api.client.api.contacts.model.DoNotContact;
+import com.callfire.api.client.api.contacts.model.UniversalDnc;
+import com.callfire.api.client.api.contacts.model.request.CreateDncsRequest;
+import com.callfire.api.client.api.contacts.model.request.FindDncNumbersRequest;
+import com.callfire.api.client.api.contacts.model.request.FindUniversalDncsRequest;
+import com.callfire.api.client.api.contacts.model.request.UpdateDncRequest;
 import com.callfire.api.client.integration.AbstractIntegrationTest;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * integration tests for /contacts/dncs api endpoint
  */
 public class DncApiTest extends AbstractIntegrationTest {
 
-    // TODO vmalinovskiy: uncomment when dnc apis will be tested and available on docs site
-    /*@Test
+    @Test
     public void testFind() throws Exception {
         CallfireClient client = getCallfireClient();
         FindDncNumbersRequest request = FindDncNumbersRequest.create()
@@ -98,6 +110,6 @@ public void testFindUniversalDncs() throws Exception {
         Assert.assertNotNull(uDncs.get(0).isOutboundCall());
         Assert.assertNotNull(uDncs.get(0).isInboundText());
         Assert.assertNotNull(uDncs.get(0).isOutboundText());
-    }*/
+    }
 
 }
diff --git a/src/itest/java/com/callfire/api/client/integration/numbers/NumberLeasesApiTest.java b/src/itest/java/com/callfire/api/client/integration/numbers/NumberLeasesApiTest.java
@@ -47,7 +47,7 @@ public void testGetNumberLease() throws Exception {
         NumberLease lease = callfireClient.numberLeasesApi().get(number);
         assertNotNull(lease.getRegion());
         assertEquals(number, lease.getNumber());
-        assertEquals(2, lease.getLabels().size());
+        assertTrue(lease.getLabels().size() > 0);
         assertThat(lease.getRegion().getCity(), containsString("LOS ANGELES"));
 
         System.out.println(lease);
diff --git a/src/main/java/com/callfire/api/client/CallfireClient.java b/src/main/java/com/callfire/api/client/CallfireClient.java
@@ -93,10 +93,7 @@ public class CallfireClient {
     // contacts
     private ContactsApi contactsApi;
     private ContactListsApi contactListsApi;
-
-    // TODO vmalinovskiy: uncomment when dnc apis will be tested and available on docs site
     private DncApi dncApi;
-
     // webhooks
     private SubscriptionsApi subscriptionsApi;
     private WebhooksApi webhooksApi;
@@ -401,18 +398,17 @@ public BatchesApi batchesApi() {
         return batchesApi;
     }
 
-    // TODO vmalinovskiy: uncomment when dnc apis will be tested and available on docs site
     /**
      * Get /contacts/do-not-calls api endpoint
      *
      * @return endpoint object
-     *//*
+     */
     public DncApi dncApi() {
         if (dncApi == null) {
             dncApi = new DncApi(restApiClient);
         }
         return dncApi;
-    }*/
+    }
 
     /**
      * Get /contacts/lists api endpoint
diff --git a/src/main/java/com/callfire/api/client/api/contacts/DncApi.java b/src/main/java/com/callfire/api/client/api/contacts/DncApi.java
diff --git a/src/main/java/com/callfire/api/client/api/contacts/model/DoNotContact.java b/src/main/java/com/callfire/api/client/api/contacts/model/DoNotContact.java
diff --git a/src/test/java/com/callfire/api/client/api/contacts/DncApiTest.java b/src/test/java/com/callfire/api/client/api/contacts/DncApiTest.java
