Merge pull request #61 from CallFire/develop

CF-20351 Added findMedia API operation to sdk

Author: asvirhun

CallfireApiClient.nuspec

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><package>
   <metadata>
     <id>CallfireApiClient</id>
-    <version>1.1.22</version>
+    <version>1.1.23</version>
     <title>CallFire API v2 client</title>
     <authors>
       Vladimir Mikhailov
@@ -15,6 +15,9 @@
     <description>C# client library for integration with Callfire REST API v2 services</description>
     <releaseNotes>Callfire API client Changelog
 =============================
+Version 1.1.23 - Sept 26 2018
+    - added findMedia API operation to sdk
+
 Version 1.1.22 - Sept 04 2018
     - updated version of RestSharp client to 106.3.0
     - downgraded version of .NET framework to 4.6
@@ -117,7 +120,7 @@ Version 1.0.0 - Dec 29 2015
     <tags>Callfire rest api client</tags>
     <dependencies>
       <dependency id="Newtonsoft.Json" version="10.0.2"/>
-      <dependency id="RestSharp" version="106.3.0"/>
+      <dependency id="RestSharp" version="106.4.2"/>
     </dependencies>
   </metadata>
   <files>

Changelog.txt

@@ -1,5 +1,8 @@
 Callfire API client Changelog
 =============================
+Version 1.1.23 - Sept 26 2018
+    - added findMedia API operation to sdk
+
 Version 1.1.22 - Sept 04 2018
     - updated version of RestSharp client to 106.3.0
     - downgraded version of .NET framework to 4.6

README.adoc

@@ -8,7 +8,7 @@ C# client for Callfire platform API version 2. See link:https://developers.callf
 
 .*Dependencies:*
 * Newtonsoft.Json >= 7.0.1
-* RestSharp >= 106.3.0
+* RestSharp >= 106.4.2
 
 .*Table of contents*
 * link:https://developers.callfire.com/callfire-api-client-csharp.html[Getting Started]

src/CallfireApiClient.IntegrationTests/Api/CallsTexts/MediaApiIntegrationTest.cs

@@ -3,6 +3,7 @@
 using CallfireApiClient.Api.Common.Model;
 using NUnit.Framework;
 using System.IO;
+using CallfireApiClient.Api.CallsTexts.Model.Request;
 
 namespace CallfireApiClient.IntegrationTests.Api.CallsTexts
 {
@@ -11,6 +12,27 @@ public class MediaApiIntegrationTest : AbstractIntegrationTest
     {
         private const string mp3FilePath = "Resources/File-examples/train1.mp3";
         private const string wavFilePath = "Resources/File-examples/train1.wav";
+        private const string cfLogoFilePath = "Resources/File-examples/cf.png";
+        private const string ezLogoFilePath = "Resources/File-examples/ez.png";
+        
+        [Test]
+        public void TestFind()
+        {
+            ResourceId cfLogoResourceId = Client.MediaApi.Upload(cfLogoFilePath);
+            ResourceId ezLogoResourceId = Client.MediaApi.Upload(ezLogoFilePath);
+            Assert.NotNull(cfLogoResourceId.Id);
+            Assert.NotNull(ezLogoResourceId.Id);
+            
+            var request = new FindMediaRequest
+            {
+                Filter = "cf.png"
+            };
+            
+            Page<Media> media = Client.MediaApi.Find(request);
+            
+            Console.WriteLine(media);
+            Assert.AreEqual(1, media.Items.Count);
+        }
 
         [Test]
         public void TestUpload()

src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj

@@ -85,6 +85,12 @@
     <EmbeddedResource Include="Resources\File-examples\train1.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\File-examples\cf.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\File-examples\ez.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>  
   </ItemGroup>
   <ItemGroup>
     <Content Include="callfire-api-client.dll.config">

src/CallfireApiClient.IntegrationTests/Resources/File-examples/cf.png

@@ -35,8 +35,9 @@
     <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745">
       <HintPath>..\..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=106.3.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75">
-      <HintPath>..\..\packages\RestSharp.106.3.0\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.4.2.0, Culture=neutral, PublicKeyToken=598062e77f915f75">
+      <HintPath>..\..\packages\RestSharp.106.4.2\lib\net452\RestSharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -45,6 +46,7 @@
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

src/CallfireApiClient.IntegrationTests/Resources/File-examples/ez.png

@@ -3,5 +3,5 @@
   <package id="DotNetZip" version="1.10.1" targetFramework="net46" />
   <package id="NUnit" version="2.6.4" targetFramework="net46" />
   <package id="NUnit.Runners.Net4" version="2.6.4" targetFramework="net46" />
-  <package id="RestSharp" version="106.3.0" targetFramework="net46" />
+  <package id="RestSharp" version="106.4.2" targetFramework="net46" />
 </packages>

src/CallfireApiClient.Tests/CallfireApiClient.Tests.csproj

@@ -1,6 +1,7 @@
 using CallfireApiClient.Api.Common.Model;
 using CallfireApiClient.Api.CallsTexts.Model;
 using System.IO;
+using CallfireApiClient.Api.CallsTexts.Model.Request;
 
 namespace CallfireApiClient.Api.CallsTexts
 {
@@ -18,6 +19,23 @@ internal MediaApi(RestApiClient client)
         {
             Client = client;
         }
+        
+        /// <summary>
+        /// Finds all media files which was uploaded by the user, filtered by file name.
+        /// </summary>
+        /// <param name="request">request object with different fields to filter</param>
+        /// <returns>paged list with media objects</returns>
+        /// <exception cref="BadRequestException">          in case HTTP response code is 400 - Bad request, the request was formatted improperly.</exception>
+        /// <exception cref="UnauthorizedException">        in case HTTP response code is 401 - Unauthorized, API Key missing or invalid.</exception>
+        /// <exception cref="AccessForbiddenException">     in case HTTP response code is 403 - Forbidden, insufficient permissions.</exception>
+        /// <exception cref="ResourceNotFoundException">    in case HTTP response code is 404 - NOT FOUND, the resource requested does not exist.</exception>
+        /// <exception cref="InternalServerErrorException"> in case HTTP response code is 500 - Internal Server Error.</exception>
+        /// <exception cref="CallfireApiException">         in case HTTP response code is something different from codes listed above.</exception>
+        /// <exception cref="CallfireClientException">      in case error has occurred in client.</exception>
+        public Page<Media> Find(FindMediaRequest request)
+        {
+            return Client.Get<Page<Media>>(MEDIA_PATH, request);
+        }
 
         /// <summary>
         /// Upload media file to account