Skip to content

Commit 3ee910e

Browse files
vmalinovskiyvmalinovskiy
authored
Merge pull request #39 from CallFire/develop
Develop
2 parents b9aaa34 + f00a035 commit 3ee910e

File tree

24 files changed

+195
-97
lines changed

24 files changed

+195
-97
lines changed

‎CallfireApiClient.nuspec‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?><package>
22
<metadata>
33
<id>CallfireApiClient</id>
4-
<version>1.1.9</version>
4+
<version>1.1.10</version>
55
<title>CallFire API v2 client</title>
66
<authors>
77
Vladimir Mikhailov
@@ -15,8 +15,12 @@
1515
<description>C# client library for integration with Callfire REST API v2 services</description>
1616
<releaseNotes>Callfire API client Changelog
1717
=============================
18+
Version 1.1.10 - Oct 26 2016
19+
- added more parameters to call tracking config in Number Lease config object
20+
1821
Version 1.1.9 - Jul 11 2016
19-
- added loading labels parameter in Number Lease objects
22+
- added loading labels parameter in Number Lease objects
23+
2024
Version 1.1.8 - May 27 2016
2125
- defaultLiveMessage, defaultMachineMessage, defaultLiveMessageSoundId, defaultMachineMessageSoundId, defaultVoice params added to send calls api
2226
- added batch id filter parameter for get broadcast calls/texts

‎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.1.10 - Oct 26 2016
4+
- added more parameters to call tracking config in Number Lease config object
5+
36
Version 1.1.9 - Jul 11 2016
47
- added loading labels parameter in Number Lease objects
58

‎build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,10 @@ nugetPush {
200200

201201
def releaseDescription() {
202202
String releaseNotes = file("Changelog.txt").text
203-
Integer start = releaseNotes.indexOf("Version") + 28;
204-
Integer end = releaseNotes.indexOf("Version", start);
205-
String currentReleaseChanges = releaseNotes.substring(start, end).trim()
203+
String firstVersionEntry = releaseNotes.find(~/Version.*/)
204+
Integer start = releaseNotes.indexOf(firstVersionEntry) + firstVersionEntry.size()
205+
releaseNotes = releaseNotes.substring(start, releaseNotes.size())
206+
String secondVersionEntry = releaseNotes.find(~/Version.*/)
207+
String currentReleaseChanges = releaseNotes.substring(0, (secondVersionEntry == null ? releaseNotes.size() - 1 : releaseNotes.indexOf(secondVersionEntry))).trim()
206208
"$currentReleaseChanges"
207209
}

‎src/CallfireApiClient.IntegrationTests/Api/Campaigns/CallBroadcastsApiIntegrationTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Collections.Generic;
55
using CallfireApiClient.Api.Campaigns.Model.Request;
66
using CallfireApiClient.Api.Common.Model.Request;
7+
using CallfireApiClient.Api.Common.Model;
78

89
namespace CallfireApiClient.IntegrationTests.Api.Campaigns
910
{
@@ -175,15 +176,14 @@ public void AddRecipientsAndAddRemoveBatches()
175176
Name = "new_batch",
176177
Recipients = new List<Recipient>
177178
{
178-
new Recipient { PhoneNumber = "12132212384" },
179-
new Recipient { PhoneNumber = "12132212384" }
179+
new Recipient { PhoneNumber = "12132212386" },
180+
new Recipient { PhoneNumber = "12132212387" }
180181
}
181182
};
182-
Client.CallBroadcastsApi.AddBatch(addBatchRequest);
183+
ResourceId addedBatchId = Client.CallBroadcastsApi.AddBatch(addBatchRequest);
183184

184-
var updatedBatches = Client.CallBroadcastsApi.GetBatches(getBatchesRequest);
185-
Console.WriteLine(batches);
186-
Assert.AreEqual(batches.Items.Count + 1, updatedBatches.Items.Count);
185+
var addedBatch = Client.BatchesApi.Get(addedBatchId.Id);
186+
Assert.AreEqual(addedBatch.BroadcastId, id);
187187
}
188188
}
189189
}

‎src/CallfireApiClient.IntegrationTests/Api/Campaigns/TextBroadcastsApiIntegrationTest.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using CallfireApiClient.Api.CallsTexts.Model;
66
using CallfireApiClient.Api.Campaigns.Model.Request;
77
using CallfireApiClient.Api.Common.Model.Request;
8+
using CallfireApiClient.Api.Common.Model;
89

910
namespace CallfireApiClient.IntegrationTests.Api.Campaigns
1011
{
@@ -156,19 +157,17 @@ public void AddRecipientsAndAddRemoveBatches()
156157
new TextRecipient { PhoneNumber = "12132041238" }
157158
}
158159
};
159-
var resourceId = Client.TextBroadcastsApi.AddBatch(addBatchRequest);
160+
ResourceId addedBatchId = Client.TextBroadcastsApi.AddBatch(addBatchRequest);
160161

161-
var updatedBatches = Client.TextBroadcastsApi.GetBatches(getBatchesRequest);
162+
var addedBatch = Client.BatchesApi.Get(addedBatchId.Id);
162163
Console.WriteLine(batches);
163-
Assert.AreEqual(batches.Items.Count + 1, updatedBatches.Items.Count);
164+
Assert.AreEqual(addedBatch.BroadcastId, id);
165+
Assert.True((bool)addedBatch.Enabled);
166+
Assert.AreEqual(addBatchRequest.Name, addedBatch.Name);
164167

165-
Batch savedBatch = Client.BatchesApi.Get(resourceId.Id);
166-
Assert.True((bool)savedBatch.Enabled);
167-
Assert.AreEqual(addBatchRequest.Name, savedBatch.Name);
168-
169-
savedBatch.Enabled = false;
170-
Client.BatchesApi.Update(savedBatch);
171-
Batch updatedBatch = Client.BatchesApi.Get(resourceId.Id);
168+
addedBatch.Enabled = false;
169+
Client.BatchesApi.Update(addedBatch);
170+
Batch updatedBatch = Client.BatchesApi.Get(addedBatchId.Id);
172171
Assert.False((bool)updatedBatch.Enabled);
173172
}
174173
}

‎src/CallfireApiClient.IntegrationTests/Api/Numbers/NumberLeasesApiIntegrationTest.cs‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using NUnit.Framework;
33
using CallfireApiClient.Api.Numbers.Model;
44
using CallfireApiClient.Api.Numbers.Model.Request;
5+
using System.Collections.Generic;
6+
using CallfireApiClient.Api.Common.Model;
57

68
namespace CallfireApiClient.IntegrationTests.Api.Numbers
79
{
@@ -78,9 +80,35 @@ public void GetNumberLeaseConfig()
7880
public void UpdateNumberLeaseConfig()
7981
{
8082
const string number = "12132041238";
81-
var config = Client.NumberLeasesApi.GetConfig(number);
83+
var config = Client.NumberLeasesApi.GetConfig(number, "number,configType,callTrackingConfig");
8284
Assert.IsNull(config.IvrInboundConfig);
8385
Assert.AreEqual(NumberConfig.NumberConfigType.TRACKING, config.ConfigType);
86+
CallTrackingConfig callTrackingConfig = new CallTrackingConfig();
87+
callTrackingConfig.Recorded = true;
88+
callTrackingConfig.Screen = true;
89+
callTrackingConfig.TransferNumbers = new List<string> { "12132212384" };
90+
callTrackingConfig.Voicemail = true;
91+
callTrackingConfig.IntroSoundId = 1;
92+
callTrackingConfig.VoicemailSoundId = 1;
93+
callTrackingConfig.FailedTransferSoundId = 1;
94+
callTrackingConfig.WhisperSoundId = 1;
95+
96+
WeeklySchedule weeklySchedule = new WeeklySchedule
97+
{
98+
StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
99+
StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
100+
TimeZone = "America/New_York",
101+
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Friday }
102+
};
103+
callTrackingConfig.WeeklySchedule = weeklySchedule;
104+
105+
GoogleAnalytics googleAnalytics = new GoogleAnalytics
106+
{
107+
Category = "Sales",
108+
GoogleAccountId = "UA-12345-26",
109+
Domain = "testDomain"
110+
};
111+
callTrackingConfig.GoogleAnalytics = googleAnalytics;
84112

85113
Client.NumberLeasesApi.UpdateConfig(config);
86114
config = Client.NumberLeasesApi.GetConfig(number, "callTrackingConfig,configType");
@@ -91,5 +119,4 @@ public void UpdateNumberLeaseConfig()
91119
Assert.AreEqual(NumberConfig.NumberConfigType.TRACKING, config.ConfigType);
92120
}
93121
}
94-
}
95-
122+
}

‎src/CallfireApiClient.Tests/Api/CallsTexts/CallRecording.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/CallfireApiClient.Tests/Api/Numbers/NumberLeasesApiTest.cs‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using CallfireApiClient.Api.Numbers.Model.Request;
66
using CallfireApiClient.Api.Numbers.Model;
77
using System.Collections.Generic;
8+
using CallfireApiClient.Api.Common.Model;
89

910
namespace CallfireApiClient.Tests.Api.Numbers
1011
{
@@ -127,16 +128,34 @@ public void UpdateConfig()
127128
{
128129
Screen = false,
129130
Recorded = true,
130-
TransferNumbers = new List<string>{ "12135551122", "12135551189" }
131+
TransferNumbers = new List<string>{ "12135551122", "12135551189" },
132+
Voicemail = true,
133+
IntroSoundId = 1234,
134+
VoicemailSoundId = 1234,
135+
FailedTransferSoundId = 1234,
136+
WhisperSoundId = 1234,
137+
WeeklySchedule = new WeeklySchedule
138+
{
139+
StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
140+
StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
141+
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Friday },
142+
TimeZone = "America/Los_Angeles"
143+
},
144+
GoogleAnalytics = new GoogleAnalytics
145+
{
146+
Category = "Sales",
147+
GoogleAccountId = "UA-12345-26",
148+
Domain = "testDomain"
149+
}
131150
}
132151
};
133152
Client.NumberLeasesApi.UpdateConfig(config);
153+
Console.WriteLine(config);
134154

135155
Assert.AreEqual(Method.PUT, restRequest.Value.Method);
136156
var requestBodyParam = restRequest.Value.Parameters.FirstOrDefault(p => p.Type == ParameterType.RequestBody);
137157
Assert.That(requestBodyParam.Value, Is.EqualTo(expectedJson));
138158
Assert.That(restRequest.Value.Resource, Is.StringEnding("/numbers/leases/configs/12345678901"));
139159
}
140160
}
141-
}
142-
161+
}

‎src/CallfireApiClient.Tests/CallfireApiClient.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<Compile Include="Api\Account\OrdersApiTest.cs" />
5252
<Compile Include="Api\Account\MeApiTest.cs" />
5353
<Compile Include="Api\AbstractApiTest.cs" />
54-
<Compile Include="Api\CallsTexts\CallRecording.cs" />
5554
<Compile Include="Api\CallsTexts\MediaApiTest.cs" />
5655
<Compile Include="Api\CallsTexts\TextsApiTest.cs" />
5756
<Compile Include="Api\CallsTexts\CallsApiTest.cs" />

‎src/CallfireApiClient.Tests/JsonMocks/callstexts/callsApi/response/findCalls.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"id": 10306,
2020
"billedAmount": 1.1667,
2121
"finishTime": 1443373425000,
22+
"toNumber": "12135551101",
23+
"labels": ["12135551102"],
2224
"result": "AM"
2325
}
2426
],
@@ -44,6 +46,8 @@
4446
"id": 10305,
4547
"billedAmount": 0.0,
4648
"finishTime": 1443373408000,
49+
"toNumber": "12135551101",
50+
"labels": ["12135551102"],
4751
"result": "CARRIER_ERROR"
4852
}
4953
],

0 commit comments

Comments
 (0)