Added test to illustrate #579 how to combine queries.

Author: Mpdreamz

src/Tests/Nest.Tests.Integration/IntegrationTests.cs

@@ -13,42 +13,43 @@ namespace Nest.Tests.Integration
 {
 	public class IntegrationTests
 	{
+
 		protected readonly IElasticClient _client = ElasticsearchConfiguration.Client;
 		protected readonly IElasticClient _clientNoRawResponse = ElasticsearchConfiguration.ClientNoRawResponse;
 		protected readonly ElasticClient _thriftClient = ElasticsearchConfiguration.ThriftClient;
 		protected readonly IConnectionSettingsValues _settings = ElasticsearchConfiguration.Settings();
-	
+
 		protected virtual void ResetIndexes()
 		{
-			
+
 		}
 
 		protected IQueryResponse<T> SearchRaw<T>(string query) where T : class
 		{
 			var index = this._client.Infer.IndexName<T>();
 			var typeName = this._client.Infer.TypeName<T>();
 			var connectionStatus = this._client.Raw.Search<QueryResponse<T>>(index, typeName, query);
-			var serializer = connectionStatus.Serializer as INestSerializer; 
+			var serializer = connectionStatus.Serializer as INestSerializer;
 			return connectionStatus.Response;
-		} 
+		}
 
 		public void DoFilterTest(Func<FilterDescriptor<ElasticsearchProject>, Nest.BaseFilter> filter, ElasticsearchProject project, bool queryMustHaveResults)
 		{
 			var filterId = Filter<ElasticsearchProject>.Term(e => e.Id, project.Id);
 
 			var results = this._client.Search<ElasticsearchProject>(
-				s => s.Filter(ff => ff.And(
-						f => f.Term(e => e.Id, project.Id),
-						filter
-					))
-				);
+			  s => s.Filter(ff => ff.And(
+				  f => f.Term(e => e.Id, project.Id),
+				  filter
+				))
+			  );
 
 			var rawResponse = results.ConnectionStatus.ResponseRaw.Utf8String();
 
 			Assert.True(results.IsValid, rawResponse);
 			Assert.True(results.ConnectionStatus.Success, rawResponse);
 			Assert.AreEqual(queryMustHaveResults ? 1 : 0, results.Total);
 		}
-	
+
 	}
 }

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -162,6 +162,7 @@
     <Compile Include="Internals\Inferno\HostNameWithPathTests.cs" />
     <Compile Include="Internals\Inferno\MapTypeNamesTests.cs" />
     <Compile Include="Internals\Serialize\OptOutTests.cs" />
+    <Compile Include="Reproduce\Reproduce579Tests.cs" />
     <Compile Include="Search\Fields\FieldsTests.cs" />
     <Compile Include="Search\Filter\Modes\ConditionlessFilterJson.cs" />
     <Compile Include="Search\Filter\Modes\FilterModesTests.cs" />
@@ -427,6 +428,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="Reproduce\Issue579.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Search\Fields\FixedCovariantSearchResult.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/Tests/Nest.Tests.Unit/Reproduce/Issue579.json

@@ -0,0 +1,60 @@
+{
+  "query": {
+    "bool": {
+      "must": [
+        {
+          "bool": {
+            "must": [
+              {
+                "bool": {
+                  "should": [
+                    {
+                      "terms": {
+                        "assignedUsers": [
+                          [
+                            "6625c0bf-5414-4985-880c-3b34152e9453",
+                            "7ff7bc06-c75e-4ed1-9732-f3c6c9743670",
+                            "e4c48ebf-7602-43a3-b82f-1a83e2ae1c0b"
+                          ]
+                        ]
+                      }
+                    },
+                    {
+                      "term": {
+                        "overrideUsers": {
+                          "value": "8f836113-3392-4dad-9971-02ac915fd64a"
+                        }
+                      }
+                    },
+                    {
+                      "term": {
+                        "unassigned": {
+                          "value": "true"
+                        }
+                      }
+                    },
+                    {
+                      "term": {
+                        "global": {
+                          "value": "true"
+                        }
+                      }
+                    }
+                  ],
+                  "minimum_number_should_match": 1
+                }
+              },
+              {
+                "term": {
+                  "locationId": {
+                    "value": "my-location"
+                  }
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}

src/Tests/Nest.Tests.Unit/Reproduce/Reproduce579Tests.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace Nest.Tests.Unit.Reproduce
+{
+	/// <summary>
+	/// tests to reproduce reported errors
+	/// </summary>
+	[TestFixture]
+	public class Reproduce579Tests : BaseJsonTests
+	{
+		public class ParentRecord
+		{
+			public int Id { get; set; }
+			public string Name { get; set; }
+			public string LocationId { get; set; }
+
+			public List<Guid> AssignedUsers { get; set;  }
+			public List<Guid> OverrideUsers { get; set;  }
+			public bool Unassigned { get; set;  }
+			public bool Global { get; set;  }
+		}
+
+		public class ChildRecord
+		{
+
+		}
+
+		private static BaseQuery CreatePermissionsFilter(
+			Guid CurrentUserId, 
+			List<Guid> usersToSearch, 
+			bool searchUnassigned, 
+			QueryDescriptor<ParentRecord> filter
+		)
+		{
+			return filter.Bool(c => c
+				.Should(
+					s => s.Terms(p => p.AssignedUsers, usersToSearch),
+					s => s.Term(p => p.OverrideUsers, CurrentUserId),	
+					s => s.Term(p => p.Unassigned, "true"),
+					s => s.Term(p => p.Global, "true")
+				)
+				.MinimumNumberShouldMatch(1)
+			);
+		}
+
+		/// <summary>
+		/// https://github.com/Mpdreamz/NEST/issues/579
+		/// </summary>
+		[Test]
+		public void Issue579()
+		{
+			var currentUserId = Guid.Parse("8f836113-3392-4dad-9971-02ac915fd64a");
+			var usersToSearch = new[]
+			{
+				Guid.Parse("6625c0bf-5414-4985-880c-3b34152e9453"), 
+				Guid.Parse("7ff7bc06-c75e-4ed1-9732-f3c6c9743670"), 
+				Guid.Parse("e4c48ebf-7602-43a3-b82f-1a83e2ae1c0b")
+			}.ToList();
+
+			var searchUnassigned = false;
+			var search = new SearchDescriptor<ParentRecord>()
+				.Query(qd => qd
+					.Bool(b => b
+						.Must(
+							q => q.Term(p => p.LocationId, "my-location")
+							&& CreatePermissionsFilter(currentUserId, usersToSearch, searchUnassigned, q)
+					)
+				)
+			);
+			this.JsonEquals(search, MethodInfo.GetCurrentMethod());
+		}
+
+	}
+}