Skip to content

Commit db91ced

Browse files
vmalinovskiyvmalinovskiy
authored
Merge pull request #58 from CallFire/develop
Develop
2 parents a790836 + 5c8b935 commit db91ced

15 files changed

Lines changed: 150 additions & 98 deletions

File tree

‎Changelog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Callfire API client Changelog
22
=============================
3+
Version 1.7.14 - Jan 27 2017
4+
- added dnc apis
5+
36
Version 1.7.13 - Dec 30 2016
47
- minor fixes for get contacts history api
58

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group = com.callfire
22
baseName = callfire-api-client
3-
version = 1.7.13
3+
version = 1.7.14

‎src/itest/java/com/callfire/api/client/integration/callstexts/CallsApiTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.io.File;
1818
import java.io.FileOutputStream;
1919
import java.io.InputStream;
20-
import java.util.Arrays;
2120
import java.util.Date;
2221
import java.util.List;
2322

@@ -45,15 +44,14 @@ public void testGetCall() throws Exception {
4544
public void testFindCalls() throws Exception {
4645
CallfireClient callfireClient = getCallfireClient();
4746
FindCallsRequest request = FindCallsRequest.create()
48-
.states(Arrays.asList(Call.State.FINISHED, Call.State.READY))
49-
.intervalBegin(DateUtils.addMonths(new Date(), -2))
47+
.intervalBegin(DateUtils.addMonths(new Date(), -10))
5048
.intervalEnd(new Date())
51-
.limit(3L)
49+
.limit(1L)
5250
.build();
5351
Page<Call> calls = callfireClient.callsApi().find(request);
5452
System.out.println(calls);
5553

56-
assertEquals(3, calls.getItems().size());
54+
assertEquals(1, calls.getItems().size());
5755
}
5856

5957
@Test

‎src/itest/java/com/callfire/api/client/integration/campaigns/CallBroadcastsApiTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static org.hamcrest.Matchers.empty;
2323
import static org.hamcrest.Matchers.not;
2424
import static org.junit.Assert.*;
25+
import static org.junit.Assert.assertEquals;
2526

2627
/**
2728
* integration tests for /campaigns/voice-broadcasts api endpoint
@@ -131,24 +132,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
131132
System.out.println(calls);
132133
assertEquals(2, calls.size());
133134

134-
// get batches
135-
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
136-
.id(id)
137-
.limit(10000L)
138-
.build();
139-
Page<Batch> batches = api.getBatches(getBatchesRequest);
140-
System.out.println(batches);
141-
142135
// add batch
143136
AddBatchRequest addBatchRequest = AddBatchRequest.create()
144137
.campaignId(id)
145138
.name("new_batch" + System.currentTimeMillis())
146139
.recipients(makeRecipients())
147140
.build();
148141
ResourceId newBatchId = api.addBatch(addBatchRequest);
142+
assertNotNull(newBatchId.getId());
149143

150-
Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
144+
// get batches
145+
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
146+
.id(id)
147+
.limit(100L)
148+
.build();
149+
Page<Batch> batches = api.getBatches(getBatchesRequest);
151150
System.out.println(batches);
152-
assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
151+
assertTrue(batches.getItems().size() == 100);
153152
}
154153
}

‎src/itest/java/com/callfire/api/client/integration/campaigns/IvrBroadcastsApiTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.hamcrest.Matchers.empty;
2121
import static org.hamcrest.Matchers.not;
2222
import static org.junit.Assert.*;
23+
import static org.junit.Assert.assertNotNull;
2324

2425
/**
2526
* integration tests for /campaigns/ivrs api endpoint
@@ -115,23 +116,21 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
115116
System.out.println(calls);
116117
assertEquals(2, calls.size());
117118

118-
// get batches
119-
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
120-
.id(id)
121-
.build();
122-
Page<Batch> batches = api.getBatches(getBatchesRequest);
123-
System.out.println(batches);
124-
125119
// add batch
126120
AddBatchRequest addBatchRequest = AddBatchRequest.create()
127121
.campaignId(id)
128122
.name("new_batch")
129123
.recipients(makeRecipients())
130124
.build();
131-
api.addBatch(addBatchRequest);
125+
ResourceId addedBatchId = api.addBatch(addBatchRequest);
126+
assertNotNull(addedBatchId.getId());
132127

133-
Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
128+
// get batches
129+
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
130+
.id(id)
131+
.build();
132+
Page<Batch> batches = api.getBatches(getBatchesRequest);
134133
System.out.println(batches);
135-
assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
134+
assertTrue(batches.getItems().size() == 100);
136135
}
137136
}

‎src/itest/java/com/callfire/api/client/integration/campaigns/TextAutoRepliesApiTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,10 @@ public void testCrudOperations() throws Exception {
3838
.build();
3939
Page<TextAutoReply> textAutoReplies = api.find(request);
4040
System.out.println(textAutoReplies);
41-
4241
assertTrue(textAutoReplies.getTotalCount() > 0);
4342
assertTrue(textAutoReplies.getItems().size() > 0);
44-
TextAutoReply savedTextAutoReply = textAutoReplies.getItems().get(textAutoReplies.getItems().size() - 1);
45-
assertEquals(resourceId.getId(), savedTextAutoReply.getId());
46-
assertEquals(textAutoReply.getNumber(), savedTextAutoReply.getNumber());
47-
assertEquals(textAutoReply.getMessage(), savedTextAutoReply.getMessage());
48-
assertEquals(textAutoReply.getMatch(), savedTextAutoReply.getMatch());
4943

50-
savedTextAutoReply = api.get(resourceId.getId(), "number,message");
44+
TextAutoReply savedTextAutoReply = api.get(resourceId.getId(), "number,message");
5145
System.out.println(savedTextAutoReply);
5246

5347
assertNull(savedTextAutoReply.getId());

‎src/itest/java/com/callfire/api/client/integration/campaigns/TextBroadcastsApiTest.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,25 +149,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
149149
assertEquals(2, texts.size());
150150
assertThat(texts.get(0).getMessage(), startsWith("msg"));
151151

152-
// get batches
153-
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
154-
.id(id)
155-
.limit(10000L)
156-
.build();
157-
Page<Batch> batches = api.getBatches(getBatchesRequest);
158-
System.out.println(batches);
159-
160152
// add batch
161153
AddBatchRequest addBatchRequest = AddBatchRequest.create()
162154
.campaignId(id)
163155
.name("new_batch" + System.currentTimeMillis())
164156
.recipients(makeRecipients())
165157
.build();
166158
ResourceId resourceId = api.addBatch(addBatchRequest);
167-
168-
Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
159+
assertNotNull(resourceId.getId());
160+
// get batches
161+
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
162+
.id(id)
163+
.limit(100L)
164+
.build();
165+
Page<Batch> batches = api.getBatches(getBatchesRequest);
169166
System.out.println(batches);
170-
assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
167+
assertEquals(batches.getItems().size(), 100);
171168

172169
Batch savedBatch = getCallfireClient().batchesApi().get(resourceId.getId());
173170
assertTrue(savedBatch.getEnabled());

‎src/itest/java/com/callfire/api/client/integration/campaigns/VoiceBroadcastsApiTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,22 @@ public void testAddRecipientsAndAddRemoveBatches() throws Exception {
121121
System.out.println(calls);
122122
assertEquals(2, calls.size());
123123

124-
// get batches
125-
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
126-
.id(id)
127-
.limit(10000L)
128-
.build();
129-
Page<Batch> batches = api.getBatches(getBatchesRequest);
130-
System.out.println(batches);
131-
132124
// add batch
133125
AddBatchRequest addBatchRequest = AddBatchRequest.create()
134126
.campaignId(id)
135127
.name("new_batch" + System.currentTimeMillis())
136128
.recipients(makeRecipients())
137129
.build();
138-
api.addBatch(addBatchRequest);
130+
ResourceId batch = api.addBatch(addBatchRequest);
131+
assertNotNull(batch.getId());
139132

140-
Page<Batch> updatedBatches = api.getBatches(getBatchesRequest);
133+
// get batches
134+
GetByIdRequest getBatchesRequest = GetByIdRequest.create()
135+
.id(id)
136+
.limit(100L)
137+
.build();
138+
Page<Batch> batches = api.getBatches(getBatchesRequest);
141139
System.out.println(batches);
142-
assertEquals(batches.getItems().size() + 1, updatedBatches.getItems().size());
140+
assertEquals(batches.getItems().size(), 100);
143141
}
144142
}

‎src/itest/java/com/callfire/api/client/integration/contacts/ContactsApiTest.java‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,32 @@ public class ContactsApiTest extends AbstractIntegrationTest {
2929
@Test
3030
public void testFindContacts() throws Exception {
3131
FindContactsRequest request = FindContactsRequest.create()
32-
.number(asList("16506190257", "18778973473"))
33-
.id(asList(1L, 2L))
3432
.build();
3533
CallfireClient client = getCallfireClient();
3634
Page<Contact> contacts = client.contactsApi().find(request);
3735
System.out.println(contacts);
38-
39-
assertEquals(1, contacts.getItems().size());
40-
assertEquals("18088395900", contacts.getItems().get(0).getWorkPhone());
36+
assertEquals(100, contacts.getItems().size());
37+
38+
Contact cnt = contacts.getItems().get(0);
39+
String numberForSearching = null;
40+
41+
if (cnt.getHomePhone() != null)
42+
numberForSearching = cnt.getHomePhone();
43+
else if (cnt.getMobilePhone() != null)
44+
numberForSearching = cnt.getMobilePhone();
45+
else if (cnt.getWorkPhone() != null)
46+
numberForSearching = cnt.getMobilePhone();
47+
48+
if (numberForSearching != null) {
49+
request = FindContactsRequest.create()
50+
.number(asList(numberForSearching))
51+
.build();
52+
contacts = client.contactsApi().find(request);
53+
assertTrue(numberForSearching.equals(contacts.getItems().get(0).getWorkPhone()) ||
54+
numberForSearching.equals(contacts.getItems().get(0).getHomePhone()) ||
55+
numberForSearching.equals(contacts.getItems().get(0).getMobilePhone()));
56+
assertEquals(1, contacts.getItems().size());
57+
}
4158
}
4259

4360
@Test

‎src/itest/java/com/callfire/api/client/integration/contacts/DncApiTest.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
package com.callfire.api.client.integration.contacts;
22

3+
import com.callfire.api.client.CallfireClient;
4+
import com.callfire.api.client.api.common.model.Page;
5+
import com.callfire.api.client.api.contacts.model.DoNotContact;
6+
import com.callfire.api.client.api.contacts.model.UniversalDnc;
7+
import com.callfire.api.client.api.contacts.model.request.CreateDncsRequest;
8+
import com.callfire.api.client.api.contacts.model.request.FindDncNumbersRequest;
9+
import com.callfire.api.client.api.contacts.model.request.FindUniversalDncsRequest;
10+
import com.callfire.api.client.api.contacts.model.request.UpdateDncRequest;
311
import com.callfire.api.client.integration.AbstractIntegrationTest;
12+
import org.junit.Assert;
13+
import org.junit.Test;
14+
15+
import java.util.Arrays;
16+
import java.util.List;
417

518
/**
619
* integration tests for /contacts/dncs api endpoint
720
*/
821
public class DncApiTest extends AbstractIntegrationTest {
922

10-
// TODO vmalinovskiy: uncomment when dnc apis will be tested and available on docs site
11-
/*@Test
23+
@Test
1224
public void testFind() throws Exception {
1325
CallfireClient client = getCallfireClient();
1426
FindDncNumbersRequest request = FindDncNumbersRequest.create()
@@ -98,6 +110,6 @@ public void testFindUniversalDncs() throws Exception {
98110
Assert.assertNotNull(uDncs.get(0).isOutboundCall());
99111
Assert.assertNotNull(uDncs.get(0).isInboundText());
100112
Assert.assertNotNull(uDncs.get(0).isOutboundText());
101-
}*/
113+
}
102114

103115
}

0 commit comments

Comments
 (0)