Merge pull request #2 from dhirensham/feature/submit-attachments-inline-with-document-body

dhirensham · web-flow · commit 56536424c232 · 2024-06-06T17:06:29.000+02:00
Submit attachments inline in the document body, instead of adding sep…
diff --git a/src/CouchDB.Driver/CouchDatabase.cs b/src/CouchDB.Driver/CouchDatabase.cs
@@ -295,6 +295,21 @@ public async Task<TSource> AddOrUpdateAsync(TSource document, AddOrUpdateOptions
             if (options.Rev != null)
                 request = request.SetQueryParam("rev", options.Rev);
 
+            if (document.Attachments != null && document.Attachments.Any())
+            {
+                document.AttachmentsParsed = document.Attachments.ToDictionary(x => x.Name, x =>
+                {
+                    var data = new byte[x.Stream.Length];
+                    x.Stream.Read(data, 0, data.Length);
+
+                    return new CouchAttachment()
+                    {
+                        ContentType = x.ContentType,
+                        Data = Convert.ToBase64String(data)
+                    };
+                });
+            }
+
             document.SplitDiscriminator = _discriminator;
             DocumentSaveResponse response = await request
                 .PutJsonAsync(document, cancellationToken)
@@ -303,8 +318,8 @@ public async Task<TSource> AddOrUpdateAsync(TSource document, AddOrUpdateOptions
                 .ConfigureAwait(false);
             document.ProcessSaveResponse(response);
 
-            await UpdateAttachments(document, cancellationToken)
-                .ConfigureAwait(false);
+            //await UpdateAttachments(document, cancellationToken)
+            //    .ConfigureAwait(false);
 
             return document;
         }
diff --git a/src/CouchDB.Driver/Types/CouchAttachment.cs b/src/CouchDB.Driver/Types/CouchAttachment.cs
@@ -100,7 +100,7 @@ public sealed class CouchAttachment
         /// </remarks>
         [DataMember]
         [JsonProperty("data")]
-        public string Data { get; private set; }
+        public string Data { get; internal set; }
     }
 }
 #nullable restore
diff --git a/src/CouchDB.Driver/Types/CouchDocument.cs b/src/CouchDB.Driver/Types/CouchDocument.cs
@@ -105,7 +105,7 @@ protected CouchDocument()
 
         [DataMember, JsonProperty("_attachments", NullValueHandling = NullValueHandling.Ignore)]
         [JsonConverter(typeof(AttachmentsParsedConverter))]
-        private Dictionary<string, CouchAttachment> AttachmentsParsed { get; set; }
+        internal Dictionary<string, CouchAttachment> AttachmentsParsed { get; set; }
 
         /// <summary>
         /// Used for database splitting

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public sealed class CouchAttachment`
`100`	`100`	`/// </remarks>`
`101`	`101`	`[DataMember]`
`102`	`102`	`[JsonProperty("data")]`
`103`		`- public string Data { get; private set; }`
	`103`	`+ public string Data { get; internal set; }`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`#nullable restore`