Merge pull request #147 from matteobortolazzo/dev

v3.1.1

Author: matteobortolazzo

CHANGELOG.md

@@ -1,4 +1,15 @@
-# 3.1.0 (2020-03-200)
+# 3.1.1 (2021-10-14)
+
+## Bug Fixes
+
+* **Query**: Fix First/Last with conditions fail. ([#142](https://github.com/matteobortolazzo/couchdb-net/issues/142))
+* **Query**: Fix First/Last on splitted database. ([#136](https://github.com/matteobortolazzo/couchdb-net/issues/136))
+* **Query**: Throws exception on List.Count instead of wrong query. ([#138](https://github.com/matteobortolazzo/couchdb-net/issues/138))
+* **Query**: Fix multi thread call issues. ([#133](https://github.com/matteobortolazzo/couchdb-net/issues/133))
+* **FindManyAsync**: Filters out null results. ([#141](https://github.com/matteobortolazzo/couchdb-net/issues/141)) Thanks [AlexandrSHad](https://github.com/AlexandrSHad)
+* **Continuous Changes**: Fix multi thread issues. ([#140](https://github.com/matteobortolazzo/couchdb-net/issues/140))
+
+# 3.1.0 (2020-03-20)
 
 ## Features
 

LATEST_CHANGE.md

@@ -1,9 +1,8 @@
-## Features
+## Bug Fixes
 
-* **Views**: Possibility to query multiple views at once. ([#126](https://github.com/matteobortolazzo/couchdb-net/issues/126)) Thanks [Panos](https://github.com/panoukos41)
-* **Partitioned database**: It's possible to create partitioned databases. ([#122](https://github.com/matteobortolazzo/couchdb-net/issues/122))
-
-## Bug Fixes
-
-* **Views**: `CouchViewOptions` are serialized correctly when overriding the serializer. ([#125](https://github.com/matteobortolazzo/couchdb-net/issues/125)) Thanks [Panos](https://github.com/panoukos41)
-* **PropertyCaseType**: `PropertyCaseType` is not applied on internal properties anymore. ([#127](https://github.com/matteobortolazzo/couchdb-net/issues/127))
+* **Query**: Fix First/Last with conditions fail. ([#142](https://github.com/matteobortolazzo/couchdb-net/issues/142))
+* **Query**: Fix First/Last on splitted database. ([#136](https://github.com/matteobortolazzo/couchdb-net/issues/136))
+* **Query**: Throws exception on List.Count instead of wrong query. ([#138](https://github.com/matteobortolazzo/couchdb-net/issues/138))
+* **Query**: Fix multi thread call issues. ([#133](https://github.com/matteobortolazzo/couchdb-net/issues/133))
+* **FindManyAsync**: Filters out null results. ([#141](https://github.com/matteobortolazzo/couchdb-net/issues/141)) Thanks [AlexandrSHad](https://github.com/AlexandrSHad)
+* **Continuous Changes**: Fix multi thread issues. ([#140](https://github.com/matteobortolazzo/couchdb-net/issues/140))

README.md

@@ -636,7 +636,10 @@ luke = await users.ChangeUserPassword(luke, "r2d2");
 
 ## Dependency Injection
 
-* Install the DI package from NuGet: [https://www.nuget.org/packages/CouchDB.NET.DependencyInjection](https://www.nuget.org/packages/CouchDB.NET.DependencyInjection)
+As always you can leverage all the benefits of Dependency Injection.
+
+**Info:** The context will be registered as a `singleton`.
+
 * Create a `CouchContext` with a constructor like the following:
 
 ```csharp
@@ -649,14 +652,7 @@ public class MyDeathStarContext : CouchContext
 }
 ```
 
-* In the `Startup` class register the context:
-
-```csharp
-// ConfigureServices
-services.AddCouchContext<MyDeathStarContext>(builder => builder
-    .UseEndpoint("http://localhost:5984")
-    .UseBasicAuthentication(username: "admin", password: "admin"));
-```
+* Register the context via any of supported containers (see appropriate section section below)
 
 * Inject the context:
 
@@ -673,7 +669,30 @@ public class RebelsController : Controller
 }
 ```
 
-**Info:** The context is registered as a `singleton`.
+### Microsoft container
+* Install the DI package from NuGet: [https://www.nuget.org/packages/CouchDB.NET.DependencyInjection](https://www.nuget.org/packages/CouchDB.NET.DependencyInjection)
+
+* In the `Startup` class register the context:
+
+```csharp
+// ConfigureServices
+services.AddCouchContext<MyDeathStarContext>(builder => builder
+    .UseEndpoint("http://localhost:5984")
+    .UseBasicAuthentication(username: "admin", password: "admin"));
+```
+
+### Autofac container
+* Install the DI package from NuGet: [https://www.nuget.org/packages/CouchDB.NET.DependencyInjection.Autofac](https://www.nuget.org/packages/CouchDB.NET.DependencyInjection.Autofac)
+
+* In the `Startup` class register the context:
+
+```csharp
+// ConfigureServices
+var containerBuilder = new ContainerBuilder();
+containerBuilder.AddCouchContext<MyDeathStarContext>(optionsBuilder => optionsBuilder
+    .UseEndpoint("http://localhost:5984")
+    .UseBasicAuthentication(username: "admin", password: "admin"));
+```
 
 ## Advanced
 

src/CouchDB.Driver.DependencyInjection.Autofac/AutofacRegistrationExtensions.cs

@@ -0,0 +1,31 @@
+using Autofac;
+using CouchDB.Driver.Options;
+using System;
+using CouchDB.Driver.Helpers;
+
+namespace CouchDB.Driver.DependencyInjection.Autofac
+{
+    public static class AutofacRegistrationExtensions
+    {
+        public static ContainerBuilder AddCouchContext<TContext>(this ContainerBuilder builder,
+            Action<CouchOptionsBuilder<TContext>> optionBuilderAction)
+            where TContext : CouchContext
+        {
+            Check.NotNull(builder, nameof(builder));
+            Check.NotNull(optionBuilderAction, nameof(optionBuilderAction));
+
+            var optionsBuilder = new CouchOptionsBuilder<TContext>();
+            optionBuilderAction?.Invoke(optionsBuilder);
+
+            builder
+                .RegisterInstance(optionsBuilder.Options)
+                .AsSelf();
+
+            builder
+                .RegisterType<TContext>()
+                .SingleInstance();
+
+            return builder;
+        }
+    }
+}

src/CouchDB.Driver.DependencyInjection.Autofac/CouchDB.Driver.DependencyInjection.Autofac.csproj

@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyName>CouchDB.NET.DependencyInjection.Autofac</AssemblyName>
+    <Authors>Matteo Bortolazzo</Authors>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Description>Dependency injection utilities for CouchDB.NET with Autofac container support.</Description>
+    <PackageProjectUrl>https://github.com/matteobortolazzo/couchdb-net</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/matteobortolazzo/couchdb-net</RepositoryUrl>
+    <PackageTags>couchdb,driver,nosql,netstandard,pouchdb,xamarin</PackageTags>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <ApplicationIcon />
+    <OutputType>Library</OutputType>
+    <StartupObject />
+    <NeutralLanguage>en</NeutralLanguage>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <Version>3.0.0</Version>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <None Include="Images\icon.png" Pack="true" PackagePath="\" />
+    <None Include="License\LICENSE.txt" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" Version="3.3.1" />
+    <PackageReference Include="Autofac" Version="5.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CouchDB.Driver\CouchDB.Driver.csproj" />
+  </ItemGroup>
+
+</Project>

src/CouchDB.Driver.DependencyInjection.Autofac/Images/icon.png

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Matteo Bortolazzo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/CouchDB.Driver.DependencyInjection.Autofac/License/LICENSE.txt

@@ -5,7 +5,7 @@
 
 namespace CouchDB.Driver.DependencyInjection
 {
-    public static  class ServiceCollectionExtensions
+    public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddCouchContext<TContext>(this IServiceCollection services,
             Action<CouchOptionsBuilder<TContext>> optionBuilderAction)

src/CouchDB.Driver.DependencyInjection/ServiceCollectionExtensions.cs

@@ -2,3 +2,4 @@
 
 [assembly: InternalsVisibleTo("CouchDB.Driver.UnitTests")]
 [assembly: InternalsVisibleTo("CouchDB.NET.DependencyInjection")]
+[assembly: InternalsVisibleTo("CouchDB.NET.DependencyInjection.Autofac")]

src/CouchDB.Driver/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using System;
 using System.Collections.Generic;
 using CouchDB.Driver.Types;
 using Newtonsoft.Json;
@@ -7,19 +8,28 @@ namespace CouchDB.Driver.ChangesFeed.Responses
 {
     public class ChangesFeedResponseResult<TSource> where TSource: CouchDocument
     {
-        [JsonProperty("changes")]
-        public IList<ChangesFeedResponseResultChange> Changes { get; internal set; }
+        [JsonProperty("seq")]
+        public string Seq { get; set; }
 
         [JsonProperty("id")]
         public string Id { get; set; }
 
-        [JsonProperty("seq")]
-        public string Seq { get; set; }
-
         [JsonProperty("deleted")]
         public bool Deleted { get; set; }
 
-        [JsonProperty("doc")]
+        [JsonProperty("changes")]
+        public IList<ChangesFeedResponseResultChange> Changes { get; internal set; }
+
+        [JsonProperty("roleIds")]
+        public IList<string> RoleIds { get; internal set; }
+
+        [JsonProperty("createdAt")]
+        public DateTime CreatedAt { get; set; }
+
+        [JsonProperty("createdBy")]
+        public string CreatedBy { get; set; }
+
+        [JsonProperty("doc", NullValueHandling = NullValueHandling.Ignore)]
         public TSource Document { get; set; }
     }
 }

src/CouchDB.Driver/ChangesFeed/Responses/ChangesFeedResponseResult.cs

@@ -204,7 +204,7 @@ private static bool AreFieldsEqual(Dictionary<string, IndexFieldDirection> curre
             return true;
         }
 
-        private IEnumerable<PropertyInfo> GetDatabaseProperties() =>
+        protected virtual IEnumerable<PropertyInfo> GetDatabaseProperties() =>
             GetType()
                 .GetProperties(BindingFlags.Public | BindingFlags.Instance)
                 .Where(p => p.PropertyType.IsGenericType &&

src/CouchDB.Driver/CouchContext.cs

@@ -24,6 +24,7 @@
 using CouchDB.Driver.Query;
 using Newtonsoft.Json;
 using System.Net;
+using System.Text.RegularExpressions;
 using CouchDB.Driver.Views;
 
 namespace CouchDB.Driver
@@ -35,6 +36,7 @@ namespace CouchDB.Driver
     public class CouchDatabase<TSource> : ICouchDatabase<TSource>
         where TSource : CouchDocument
     {
+        private readonly Regex _feedChangeLineStartPattern;
         private readonly IAsyncQueryProvider _queryProvider;
         private readonly IFlurlClient _flurlClient;
         private readonly CouchOptions _options;
@@ -52,6 +54,7 @@ public class CouchDatabase<TSource> : ICouchDatabase<TSource>
 
         internal CouchDatabase(IFlurlClient flurlClient, CouchOptions options, QueryContext queryContext, string? discriminator)
         {
+            _feedChangeLineStartPattern = new Regex(@"{""seq");
             _flurlClient = flurlClient;
             _options = options;
             _queryContext = queryContext;
@@ -122,6 +125,7 @@ public async Task<List<TSource>> FindManyAsync(IReadOnlyCollection<string> docId
             var documents = bulkGetResult.Results
                 .SelectMany(r => r.Docs)
                 .Select(d => d.Item)
+                .Where(i => i != null)
                 .ToList();
 
             foreach (TSource document in documents)
@@ -411,9 +415,16 @@ public async IAsyncEnumerable<ChangesFeedResponseResult<TSource>> GetContinuousC
                 {
                     continue;
                 }
-
-                ChangesFeedResponseResult<TSource> result = JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(line);
-                yield return result;
+                
+                MatchCollection matches = _feedChangeLineStartPattern.Matches(line);
+                for (var i = 0; i < matches.Count; i++)
+                {
+                    var startIndex = matches[i].Index;
+                    var endIndex = i < matches.Count - 1 ? matches[i + 1].Index : line.Length;
+                    var lineLength = endIndex - startIndex;
+                    var substring = line.Substring(startIndex, lineLength);
+                    yield return JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(substring);
+                }
             }
         }
 
@@ -526,7 +537,7 @@ public Task<CouchViewList<TKey, TValue, TSource>> GetDetailedViewAsync<TKey, TVa
 
             IFlurlRequest request = NewRequest()
                 .AppendPathSegments("_design", design, "_view", view);
-            
+
             Task<CouchViewList<TKey, TValue, TSource>>? requestTask = options == null
                 ? request.GetJsonAsync<CouchViewList<TKey, TValue, TSource>>(cancellationToken)
                 : request
@@ -558,7 +569,7 @@ public async Task<CouchViewList<TKey, TValue, TSource>[]> GetDetailedViewQueryAs
             IFlurlRequest request = NewRequest()
                 .AppendPathSegments("_design", design, "_view", view, "queries");
 
-            CouchViewQueryResult<TKey, TValue, TSource> result = 
+            CouchViewQueryResult<TKey, TValue, TSource> result =
                 await request
                 .PostJsonAsync(new { queries }, cancellationToken)
                 .ReceiveJson<CouchViewQueryResult<TKey, TValue, TSource>>()

src/CouchDB.Driver/CouchDatabase.cs

@@ -26,6 +26,11 @@ public static string GetPropertyName(this MemberExpression m, CouchOptions optio
 
             Expression currentExpression = m.Expression;
 
+            if (currentExpression is MemberExpression rootMemberExpression && rootMemberExpression.Type.IsEnumerable())
+            {
+                throw new NotSupportedException();
+            }
+
             while (currentExpression is MemberExpression cm)
             {
                 members.Add(cm.Member.GetCouchPropertyName(caseType));

src/CouchDB.Driver/Extensions/ExpressionExtensions.cs

@@ -1,6 +1,7 @@
 using Humanizer;
 using Newtonsoft.Json;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -96,6 +97,11 @@ public static IEnumerable<Type> GetGenericTypeImplementations(this Type type, Ty
             }
         }
 
+        public static bool IsEnumerable(this Type type)
+        {
+            return type.IsArray || typeof(IEnumerable).IsAssignableFrom(type);
+        }
+
         private static IEnumerable<Type> GetBaseTypes(this Type? type)
         {
             type = type?.BaseType;

src/CouchDB.Driver/Extensions/TypeExtensions.cs

@@ -39,7 +39,7 @@ public static MethodCallExpression SubstituteWithSelect(this MethodCallExpressio
             return Expression.Call(typeof(Queryable), nameof(Queryable.Select), genericArgumentTypes, node.Arguments[0], selectorNode.Arguments[1]);
         }
 
-        public static MethodCallExpression SubstituteWithWhere(this MethodCallExpression node, bool negate = false)
+        public static MethodCallExpression SubstituteWithWhere(this MethodCallExpression node, ExpressionVisitor optimizer, bool negate = false)
         {
             Check.NotNull(node, nameof(node));
 
@@ -52,7 +52,8 @@ public static MethodCallExpression SubstituteWithWhere(this MethodCallExpression
                 predicate = body.WrapInLambda(lambdaExpression.Parameters);
             }
 
-            return Expression.Call(typeof(Queryable), nameof(Queryable.Where), node.Method.GetGenericArguments(), node.Arguments[0], predicate);
+            MethodCallExpression e = Expression.Call(typeof(Queryable), nameof(Queryable.Where), node.Method.GetGenericArguments(), node.Arguments[0], predicate);
+            return (MethodCallExpression)optimizer.Visit(e);
         }
 
         #endregion