filter delete markers out in ES, not JS, for 'sample' and 'images' ac…

…tions
quiltdata · Jan 12, 2021 · cc910ef · cc910ef
1 parent 7e82dde
commit cc910ef
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lambdas/search/index.py b/lambdas/search/index.py
@@ -137,7 +137,12 @@ def lambda_handler(request):
         terminate_after = None
     elif action == 'images':
         body = {
-            'query': {'regexp': {'ext': IMG_EXTS}},
+            'query': {
+                'bool': {
+                    'must': [{'regexp': {'ext': IMG_EXTS}}],
+                    'must_not': [{'match': {'delete_marker': True}}],
+                }
+            },
             'collapse': {
                 'field': 'key',
                 'inner_hits': {
@@ -158,6 +163,7 @@ def lambda_handler(request):
                     'must_not': [
                         {'terms': {'key': README_KEYS + [SUMMARIZE_KEY]}},
                         {'wildcard': {'key': '*/' + SUMMARIZE_KEY}},
+                        {'match': {'delete_marker': True}},
                     ],
                 },
             },