Merge pull request #159 from mwasson74/master

Issue 157 and 158

Author: matteobortolazzo

src/CouchDB.Driver/CouchDatabase.cs

@@ -89,9 +89,19 @@ internal CouchDatabase(IFlurlClient flurlClient, CouchOptions options, QueryCont
                 .GetAsync(cancellationToken)
                 .ConfigureAwait(false);
 
-            return response != null && response.StatusCode == (int)HttpStatusCode.OK
-                ? await response.GetJsonAsync<TSource>().ConfigureAwait(false)
-                : null;
+            TSource? document = null;
+            if (response is not { StatusCode: (int)HttpStatusCode.OK })
+            {
+                return document;
+            }
+
+            document = await response.GetJsonAsync<TSource>().ConfigureAwait(false);
+            if (document != null)
+            {
+                InitAttachments(document);
+            }
+
+            return document;
         }
 
         /// <inheritdoc />

src/CouchDB.Driver/Types/CouchAttachment.cs

@@ -26,6 +26,10 @@ public sealed class CouchAttachment
         [JsonIgnore]
         public Uri Uri { get; internal set; }
 
+        [DataMember]
+        [JsonProperty("stub")]
+        public bool Stub { get; set; }
+
         [DataMember]
         [JsonProperty("content_type")]
         public string ContentType { get; set; }
@@ -37,6 +41,10 @@ public sealed class CouchAttachment
         [DataMember]
         [JsonProperty("length")]
         public int? Length { get; private set; }
+
+        [DataMember]
+        [JsonProperty("revpos")]
+        public int? RevPos { get; private set; }
     }
 }
 #nullable restore

tests/CouchDB.Driver.UnitTests/Database_Tests.cs

@@ -31,10 +31,10 @@ public async Task Find()
             using var httpTest = new HttpTest();
             httpTest.RespondWithJson(new
             {
-                Attachments = new Dictionary<string, object>
-                    {
-                        { "luke.txt", new { ContentType = "text/plain" } }
-                    }
+                _attachments = new Dictionary<string, object>
+                {
+                    { "luke.txt", new { ContentType = "text/plain" } }
+                }
             });
 
             var a = new List<Rebel>();
@@ -43,6 +43,11 @@ public async Task Find()
                 .ShouldHaveCalled("http://localhost/rebels/1")
                 .WithoutQueryParam("conflicts")
                 .WithVerb(HttpMethod.Get);
+
+            Assert.NotNull(newR);
+            Assert.NotEmpty(newR.Attachments);
+            Assert.NotNull(newR.Attachments["luke.txt"].Uri);
+
         }
 
         [Fact]
@@ -51,10 +56,10 @@ public async Task FindWithConflicts()
             using var httpTest = new HttpTest();
             httpTest.RespondWithJson(new
             {
-                Attachments = new Dictionary<string, object>
-                    {
-                        { "luke.txt", new { ContentType = "text/plain" } }
-                    }
+                _attachments = new Dictionary<string, object>
+                {
+                    { "luke.txt", new { ContentType = "text/plain" } }
+                }
             });
 
             var newR = await _rebels.FindAsync("1", true);