From 3620b623bb2a1e02fce7593779f01dd16837d59c Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Mon, 27 Jan 2014 15:28:35 -0500
Subject: [PATCH 1/2] Fix Bug 919710 - Prevent unpublished makes from appearing
 in public searches

---
 lib/queryBuilder/generators/queries.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/queryBuilder/generators/queries.js b/lib/queryBuilder/generators/queries.js
index 603a37b..186c81d 100644
--- a/lib/queryBuilder/generators/queries.js
+++ b/lib/queryBuilder/generators/queries.js
@@ -24,10 +24,19 @@ module.exports = {
             match_all: {}
           },
           filter: {
-            missing: {
-              field: "deletedAt",
-              null_value: true
-            }
+            and: [
+              {
+                missing: {
+                  field: "deletedAt",
+                  null_value: true
+                }
+              },
+              {
+                term: {
+                  published: true
+                }
+              }
+            ]
           }
         }
       }

From a2d852aca291035f5b998bec2e9e8cd0e9fb5044 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 29 Jan 2014 11:26:53 -0500
Subject: [PATCH 2/2] fix tests

---
 test/queryBuilder/search/core.unit.js | 17 +++++++++++++----
 test/queryBuilder/search/sort.unit.js | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/test/queryBuilder/search/core.unit.js b/test/queryBuilder/search/core.unit.js
index 3e1a4f7..a71a94d 100644
--- a/test/queryBuilder/search/core.unit.js
+++ b/test/queryBuilder/search/core.unit.js
@@ -7,10 +7,19 @@ module.exports = function( qb ){
               match_all: {}
             },
             filter: {
-              missing: {
-                field: "deletedAt",
-                null_value: true
-              }
+              and: [
+                {
+                  missing: {
+                    field: "deletedAt",
+                    null_value: true
+                  }
+                },
+                {
+                  term: {
+                    published: true
+                  }
+                }
+              ]
             }
           }
         },
diff --git a/test/queryBuilder/search/sort.unit.js b/test/queryBuilder/search/sort.unit.js
index 2e69a0c..68189d9 100644
--- a/test/queryBuilder/search/sort.unit.js
+++ b/test/queryBuilder/search/sort.unit.js
@@ -7,10 +7,19 @@ module.exports = function( qb ) {
               match_all: {}
             },
             filter: {
-              missing: {
-                field: "deletedAt",
-                null_value: true
-              }
+              and: [
+                {
+                  missing: {
+                    field: "deletedAt",
+                    null_value: true
+                  }
+                },
+                {
+                  term: {
+                    published: true
+                  }
+                }
+              ]
             }
           }
         },