fix: create/edit file

src/Pipedrive.net.Tests.Integration/Clients/FilesClientTests.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Pipedrive.Tests.Integration.Clients
@@ -64,18 +66,21 @@ public async Task ReturnsDistinctInfosBasedOnStartPage()
             }
         }
 
-        /*public class TheCreateMethod
+        public class TheCreateMethod
         {
             [IntegrationTest]
             public async Task CanCreate()
             {
                 var pipedrive = Helper.GetAuthenticatedClient();
                 var fixture = pipedrive.File;
 
-                var imageUrl = @"./Content/image.jpg";
-                FileStream reader = new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), imageUrl), FileMode.Open);
-
-                var newFile = new NewFile(reader);
+                var newFile = new NewFile(new RawFile(
+                    "image.jpg",
+                    ReadFile(GetFileFromPath(@"./Fixtures/image.jpg")),
+                    "image/jpg"))
+                {
+                    DealId = 1
+                };
 
                 var file = await fixture.Create(newFile);
                 Assert.NotNull(file);
@@ -93,8 +98,14 @@ public async Task CanEdit()
                 var pipedrive = Helper.GetAuthenticatedClient();
                 var fixture = pipedrive.File;
 
-                byte[] data = System.Convert.FromBase64String("R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==");
-                var newFile = new NewFile(new MemoryStream(data));
+                var newFile = new NewFile(new RawFile(
+                    "image.jpg",
+                    ReadFile(GetFileFromPath(@"./Fixtures/image.jpg")),
+                    "image/jpg"))
+                {
+                    DealId = 1
+                };
+
                 var file = await fixture.Create(newFile);
 
                 var editFile = file.ToUpdate();
@@ -116,8 +127,14 @@ public async Task CanDelete()
                 var pipedrive = Helper.GetAuthenticatedClient();
                 var fixture = pipedrive.File;
 
-                byte[] data = System.Convert.FromBase64String("R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==");
-                var newFile = new NewFile(new MemoryStream(data));
+                var newFile = new NewFile(new RawFile(
+                    "image.jpg",
+                    ReadFile(GetFileFromPath(@"./Fixtures/image.jpg")),
+                    "image/jpg"))
+                {
+                    DealId = 1
+                };
+
                 var file = await fixture.Create(newFile);
 
                 var createdFile = await fixture.Get(file.Id);
@@ -126,10 +143,24 @@ public async Task CanDelete()
 
                 await fixture.Delete(createdFile.Id);
 
-                var deletedFile =  await fixture.Get(createdFile.Id);
+                var deletedFile = await fixture.Get(createdFile.Id);
 
                 Assert.False(deletedFile.ActiveFlag);
             }
-        }*/
+        }
+
+        private static FileStream GetFileFromPath(string filePath)
+        {
+            return new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), filePath), FileMode.Open);
+        }
+
+        private static byte[] ReadFile(Stream fileStream)
+        {
+            using (var ms = new MemoryStream())
+            {
+                fileStream.CopyTo(ms);
+                return ms.ToArray();
+            }
+        }
     }
 }

src/Pipedrive.net.Tests.Integration/Pipedrive.Tests.Integration.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Fixtures\image.jpg" />
     <None Remove="Fixtures\webhook_activity_update.json" />
     <None Remove="Fixtures\webhook_deal_create.json" />
     <None Remove="Fixtures\webhook_deal_update.json" />
@@ -16,6 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Fixtures\image.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="Fixtures\webhook_activity_update.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>

src/Pipedrive.net.Tests/Clients/FilesClientTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using NSubstitute;
 using Xunit;
@@ -71,7 +72,7 @@ public async Task RequestsCorrectUrl()
             }
         }
 
-        /*public class TheCreateMethod
+        public class TheCreateMethod
         {
             [Fact]
             public async Task EnsuresNonNullArguments()
@@ -87,13 +88,16 @@ public async Task PostsToTheCorrectUrl()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new FilesClient(connection);
 
-                var newFile = new NewFile(new MemoryStream());
+                var newFile = new NewFile(new RawFile("abc.pdf", new byte[] { }, "application/pdf"));
                 await client.Create(newFile);
 
                 await connection.Received().Post<File>(Arg.Is<Uri>(u => u.ToString() == "files"),
-                    Arg.Is<NewFile>(nc => nc.File == new MemoryStream()));
+                    Arg.Is<MultipartFormDataContent>(
+                        nc => nc is MultipartFormDataContent),
+                    Arg.Is<string>(a => a == "application/json"),
+                    Arg.Is<string>(c => c == "multipart/form-data"));
             }
-        }*/
+        }
 
         public class TheEditMethod
         {

src/Pipedrive.net/Clients/FilesClient.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Pipedrive.Helpers;
 
@@ -39,41 +40,49 @@ public Task<File> Get(long id)
             return ApiConnection.Get<File>(ApiUrls.File(id));
         }
 
-        /*public async Task<File> Create(NewFile data)
+        public async Task<File> Create(NewFile data)
         {
             Ensure.ArgumentNotNull(data, nameof(data));
 
             var content = new MultipartFormDataContent();
-            content.Add(new StreamContent(data.File), "\"file\"");
+
+            var byteArrayContent = new ByteArrayContent(data.File.Content);
+            byteArrayContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(data.File.ContentType);
+
+            content.Add(byteArrayContent, "file", data.File.Name);
 
             if (data.DealId.HasValue)
             {
                 content.Add(new StringContent(data.DealId.ToString()), "deal_id");
             }
+
             if (data.PersonId.HasValue)
             {
                 content.Add(new StringContent(data.PersonId.ToString()), "person_id");
             }
+
             if (data.OrgId.HasValue)
             {
                 content.Add(new StringContent(data.OrgId.ToString()), "org_id");
             }
+
             if (data.ProductId.HasValue)
             {
                 content.Add(new StringContent(data.ProductId.ToString()), "product_id");
             }
+
             if (data.ActivityId.HasValue)
             {
                 content.Add(new StringContent(data.ActivityId.ToString()), "activity_id");
             }
+
             if (data.NoteId.HasValue)
             {
                 content.Add(new StringContent(data.NoteId.ToString()), "note_id");
             }
-            var contentString = content.ReadAsStringAsync();
 
             return await ApiConnection.Post<File>(ApiUrls.Files(), content, "application/json", "multipart/form-data");
-        }*/
+        }
 
         public Task<File> Edit(long id, FileUpdate data)
         {

src/Pipedrive.net/Clients/IFilesClient.cs

@@ -14,7 +14,7 @@ public interface IFilesClient
 
         Task<File> Get(long id);
 
-        /*Task<File> Create(NewFile data);*/
+        Task<File> Create(NewFile data);
 
         Task<File> Edit(long id, FileUpdate data);
 

src/Pipedrive.net/Models/Common/RawFile.cs

@@ -0,0 +1,18 @@
+namespace Pipedrive
+{
+    public class RawFile
+    {
+        public string Name { get; set; }
+
+        public byte[] Content { get; set; }
+
+        public string ContentType { get; set; }
+
+        public RawFile(string name, byte[] content, string contentType)
+        {
+            this.Name = name;
+            this.Content = content;
+            this.ContentType = contentType;
+        }
+    }
+}

src/Pipedrive.net/Models/Request/FileUpdate.cs

@@ -1,9 +1,13 @@
-namespace Pipedrive
+using Newtonsoft.Json;
+
+namespace Pipedrive
 {
     public class FileUpdate
     {
+        [JsonProperty("name")]
         public string Name { get; set; }
 
+        [JsonProperty("description")]
         public string Description { get; set; }
     }
 }

src/Pipedrive.net/Models/Request/NewFile.cs

@@ -1,12 +1,11 @@
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Pipedrive
 {
     public class NewFile
     {
         [JsonProperty("file")]
-        public Stream File { get; set; }
+        public RawFile File { get; set; }
 
         [JsonProperty("deal_id")]
         public long? DealId { get; set; }
@@ -26,7 +25,7 @@ public class NewFile
         [JsonProperty("note_id")]
         public long? NoteId { get; set; }
 
-        public NewFile(Stream file)
+        public NewFile(RawFile file)
         {
             this.File = file;
         }