Skip to content

Commit 4dcf91a

Browse files
vmalinovskiyvmalinovskiy
authored
Merge pull request #46 from CallFire/develop
Develop
2 parents bab0dd9 + 2c7aaf1 commit 4dcf91a

File tree

11 files changed

+73
-37
lines changed

11 files changed

+73
-37
lines changed

‎CallfireApiClient.nuspec‎

Lines changed: 4 additions & 1 deletion
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.15</version>
4+
<version>1.1.16</version>
55
<title>CallFire API v2 client</title>
66
<authors>
77
Vladimir Mikhailov
@@ -15,6 +15,9 @@
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.16 - Mar 28 2017
19+
- fixed DayOfWeek enum for scheduler
20+
1821
Version 1.1.15 - Jan 27 2017
1922
- added dnc apis
2023

‎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.16 - Mar 28 2017
4+
- fixed DayOfWeek enum for scheduler
5+
36
Version 1.1.15 - Jan 27 2017
47
- added dnc apis
58

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

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32
using CallfireApiClient.Api.Campaigns.Model;
43
using System.Collections.Generic;
54
using CallfireApiClient.Api.Campaigns.Model.Request;
@@ -30,10 +29,18 @@ public void VoiceBroadcastCrudOperations()
3029
new Recipient { PhoneNumber = "12132212384" },
3130
new Recipient { PhoneNumber = "12132212385" }
3231
},
32+
Schedules = new List<Schedule>
33+
{
34+
new Schedule {
35+
StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
36+
StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
37+
TimeZone = "America/New_York",
38+
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.MONDAY, DayOfWeek.FRIDAY } }
39+
},
3340
ResumeNextDay = true
3441
};
3542
var id = Client.CallBroadcastsApi.Create(broadcast, true);
36-
Console.WriteLine("broadcast id: " + id);
43+
System.Console.WriteLine("broadcast id: " + id);
3744
var savedBroadcast = Client.CallBroadcastsApi.Get(id.Id);
3845
Assert.AreEqual(broadcast.Name, savedBroadcast.Name);
3946
Assert.AreEqual(savedBroadcast.ResumeNextDay, true);
@@ -64,7 +71,7 @@ public void IvrsCrudOperations()
6471
}
6572
};
6673
var id = Client.CallBroadcastsApi.Create(broadcast, true);
67-
Console.WriteLine("ivr id: " + id);
74+
System.Console.WriteLine("ivr id: " + id);
6875
var savedBroadcast = Client.CallBroadcastsApi.Get(id.Id);
6976
Assert.AreEqual(broadcast.Name, savedBroadcast.Name);
7077

@@ -101,7 +108,7 @@ public void StartStopArchiveCampaign()
101108
var id = Client.CallBroadcastsApi.Create(broadcast, true);
102109

103110
CallBroadcast campaign = Client.CallBroadcastsApi.Get(id.Id);
104-
Console.WriteLine(campaign);
111+
System.Console.WriteLine(campaign);
105112
Assert.NotNull(campaign);
106113
// start
107114
Client.CallBroadcastsApi.Start((long)campaign.Id);
@@ -122,25 +129,25 @@ public void GetBroadcastCalls()
122129
{
123130
var getCallsRequest = new GetByIdRequest { Id = 1 };
124131
var calls = Client.CallBroadcastsApi.GetCalls(getCallsRequest);
125-
Console.WriteLine(calls);
132+
System.Console.WriteLine(calls);
126133
Assert.That(calls.Items, Is.Not.Empty);
127134

128135
long testBatchId = (long) calls.Items[0].BatchId;
129136

130137
getCallsRequest = new GetBroadcastCallsTextsRequest { Id = 1, batchId = testBatchId };
131138
calls = Client.CallBroadcastsApi.GetCalls(getCallsRequest);
132-
Console.WriteLine(calls);
139+
System.Console.WriteLine(calls);
133140
Assert.AreEqual(calls.Items[0].BatchId, testBatchId);
134141
}
135142

136143
[Test]
137144
public void GetBroadcastStats()
138145
{
139-
var begin = DateTime.Now.AddDays(-5d);
140-
var end = DateTime.Now;
146+
var begin = System.DateTime.Now.AddDays(-5d);
147+
var end = System.DateTime.Now;
141148
var fields = "callsAttempted,callsPlaced,callsDuration";
142149
var stats = Client.CallBroadcastsApi.GetStats(1, fields, begin, end);
143-
Console.WriteLine(stats);
150+
System.Console.WriteLine(stats);
144151
}
145152

146153
[Test]
@@ -152,7 +159,7 @@ public void AddRecipientsAndAddRemoveBatches()
152159
Limit = 1
153160
};
154161
var broadcasts = Client.CallBroadcastsApi.Find(findRequest);
155-
Console.WriteLine(broadcasts);
162+
System.Console.WriteLine(broadcasts);
156163
Assert.That(broadcasts.Items, Is.Not.Empty);
157164
var id = broadcasts.Items[0].Id;
158165

@@ -161,13 +168,13 @@ public void AddRecipientsAndAddRemoveBatches()
161168
new Recipient { PhoneNumber = "12132212384" },
162169
new Recipient { PhoneNumber = "12132212385" }
163170
});
164-
Console.WriteLine(calls);
171+
System.Console.WriteLine(calls);
165172
Assert.AreEqual(2, calls.Count);
166173

167174
// get batches
168175
var getBatchesRequest = new GetByIdRequest { Id = id };
169176
var batches = Client.CallBroadcastsApi.GetBatches(getBatchesRequest);
170-
Console.WriteLine(batches);
177+
System.Console.WriteLine(batches);
171178

172179
// add batch
173180
var addBatchRequest = new AddBatchRequest

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32
using CallfireApiClient.Api.Numbers.Model;
43
using CallfireApiClient.Api.Numbers.Model.Request;
54
using System.Collections.Generic;
@@ -15,7 +14,7 @@ public void FindNumberLeases()
1514
{
1615
var request = new FindNumberLeasesRequest { Limit = 2 };
1716
var leases = Client.NumberLeasesApi.Find(request);
18-
Console.WriteLine(leases);
17+
System.Console.WriteLine(leases);
1918

2019
Assert.True(leases.Items.Count > 0);
2120
Assert.True(leases.Items[0].Labels.Count > 0);
@@ -24,9 +23,9 @@ public void FindNumberLeases()
2423
[Test]
2524
public void GetNumberLease()
2625
{
27-
const String number = "12132041238";
26+
const System.String number = "12132041238";
2827
var lease = Client.NumberLeasesApi.Get(number);
29-
Console.WriteLine(lease);
28+
System.Console.WriteLine(lease);
3029

3130
Assert.IsNotNull(lease.Region);
3231
Assert.AreEqual(number, lease.PhoneNumber);
@@ -46,7 +45,7 @@ public void UpdateNumberLease()
4645

4746
Client.NumberLeasesApi.Update(lease);
4847
lease = Client.NumberLeasesApi.Get(number, "number,callFeatureStatus,textFeatureStatus");
49-
Console.WriteLine(lease);
48+
System.Console.WriteLine(lease);
5049
Assert.NotNull(lease.PhoneNumber);
5150
Assert.AreEqual(NumberLease.FeatureStatus.DISABLED, lease.TextFeatureStatus);
5251
Assert.AreEqual(NumberLease.FeatureStatus.DISABLED, lease.CallFeatureStatus);
@@ -61,7 +60,7 @@ public void FindNumberLeaseConfigs()
6160
{
6261
var request = new FindNumberLeaseConfigsRequest { Limit = 2 };
6362
var configs = Client.NumberLeasesApi.FindConfigs(request);
64-
Console.WriteLine(configs);
63+
System.Console.WriteLine(configs);
6564

6665
Assert.True(configs.Items.Count > 0);
6766
}
@@ -70,7 +69,7 @@ public void FindNumberLeaseConfigs()
7069
public void GetNumberLeaseConfig()
7170
{
7271
var config = Client.NumberLeasesApi.GetConfig("12132041238");
73-
Console.WriteLine(config);
72+
System.Console.WriteLine(config);
7473

7574
Assert.True(NumberConfig.NumberConfigType.TRACKING.Equals(config.ConfigType));
7675
Assert.True(config.CallTrackingConfig != null);
@@ -98,7 +97,7 @@ public void UpdateNumberLeaseConfig()
9897
StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
9998
StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
10099
TimeZone = "America/New_York",
101-
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Friday }
100+
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.MONDAY, DayOfWeek.FRIDAY, DayOfWeek.SATURDAY }
102101
};
103102
callTrackingConfig.WeeklySchedule = weeklySchedule;
104103

@@ -110,10 +109,17 @@ public void UpdateNumberLeaseConfig()
110109
};
111110
callTrackingConfig.GoogleAnalytics = googleAnalytics;
112111

112+
config.CallTrackingConfig = callTrackingConfig;
113+
config.ConfigType = NumberConfig.NumberConfigType.TRACKING;
114+
113115
Client.NumberLeasesApi.UpdateConfig(config);
114-
config = Client.NumberLeasesApi.GetConfig(number, "callTrackingConfig,configType");
115-
Console.WriteLine(config);
116+
config = Client.NumberLeasesApi.GetConfig(number);
117+
Assert.AreEqual(config.ConfigType, NumberConfig.NumberConfigType.TRACKING);
118+
Assert.AreEqual(config.Number, number);
119+
Assert.NotNull(config.CallTrackingConfig);
120+
System.Console.WriteLine(config);
116121

122+
config = Client.NumberLeasesApi.GetConfig(number, "callTrackingConfig,configType");
117123
Assert.IsNotNull(config.CallTrackingConfig);
118124
Assert.IsNull(config.Number);
119125
Assert.AreEqual(NumberConfig.NumberConfigType.TRACKING, config.ConfigType);

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ public void FindTollfreeNumbers()
3939
[Test]
4040
public void FindNumbersLocal()
4141
{
42-
var request = new FindNumbersLocalRequest { Limit = 2, State = "LA" };
42+
var request = new FindNumbersLocalRequest { Limit = 1, State = "LA" };
4343
var numbers = Client.NumbersApi.FindNumbersLocal(request);
44-
Assert.AreEqual(2, numbers.Count);
45-
Assert.That(numbers[0].NationalFormat, Is.StringStarting("(225)"));
46-
44+
Assert.AreEqual(1, numbers.Count);
45+
Assert.NotNull(numbers[0].NationalFormat);
46+
Assert.NotNull(numbers[0].PhoneNumber);
47+
Assert.NotNull(numbers[0].Region);
48+
Assert.NotNull(numbers[0].TollFree);
4749
Console.WriteLine(numbers);
4850
}
4951

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32
using RestSharp;
43
using System.Linq;
54
using CallfireApiClient.Api.Numbers.Model.Request;
@@ -138,7 +137,7 @@ public void UpdateConfig()
138137
{
139138
StartTimeOfDay = new LocalTime { Hour = 1, Minute = 1, Second = 1 },
140139
StopTimeOfDay = new LocalTime { Hour = 2, Minute = 2, Second = 2 },
141-
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.Friday },
140+
DaysOfWeek = new HashSet<DayOfWeek> { DayOfWeek.FRIDAY },
142141
TimeZone = "America/Los_Angeles"
143142
},
144143
GoogleAnalytics = new GoogleAnalytics
@@ -150,7 +149,7 @@ public void UpdateConfig()
150149
}
151150
};
152151
Client.NumberLeasesApi.UpdateConfig(config);
153-
Console.WriteLine(config);
152+
System.Console.WriteLine(config);
154153

155154
Assert.AreEqual(Method.PUT, restRequest.Value.Method);
156155
var requestBodyParam = restRequest.Value.Parameters.FirstOrDefault(p => p.Type == ParameterType.RequestBody);

‎src/CallfireApiClient.Tests/JsonMocks/numbers/numberLeasesApi/request/updateNumberLeaseConfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"second": 2
2626
},
2727
"daysOfWeek": [
28-
"Friday"
28+
"FRIDAY"
2929
],
3030
"timeZone": "America/Los_Angeles"
3131
},

‎src/CallfireApiClient/Api/Common/Model/DayOfWeek.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+

2+
3+
namespace CallfireApiClient.Api.Common.Model
4+
{
5+
public enum DayOfWeek
6+
{
7+
SUNDAY = 0,
8+
MONDAY = 1,
9+
TUESDAY = 2,
10+
WEDNESDAY = 3,
11+
THURSDAY = 4,
12+
FRIDAY = 5,
13+
SATURDAY = 6
14+
}
15+
}
16+

‎src/CallfireApiClient/Api/Common/Model/WeeklySchedule.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32

43
namespace CallfireApiClient.Api.Common.Model
54
{

‎src/CallfireApiClient/CallfireApiClient.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<Compile Include="Api\Campaigns\Model\CallRecording.cs" />
9595
<Compile Include="Api\Campaigns\Model\CampaignSound.cs" />
9696
<Compile Include="Api\Common\Model\LocalDate.cs" />
97+
<Compile Include="Api\Common\Model\DayOfWeek.cs" />
9798
<Compile Include="Api\Common\Model\LocalTime.cs" />
9899
<Compile Include="Api\Common\Model\LocalTimeRestriction.cs" />
99100
<Compile Include="Api\Campaigns\Model\Recipient.cs" />

0 commit comments

Comments
 (0)