Fix total_doc synth population (#322)

* Fix total_doc synth population with other criteria * Update synthesis query op test
materialsproject · Jul 6, 2021 · a31b032 · a31b032
1 parent 1366950
commit a31b032
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 47 deletions.
diff --git a/src/mp_api/routes/synthesis/query_operators.py b/src/mp_api/routes/synthesis/query_operators.py
@@ -160,7 +160,10 @@ def query(
             }
 
         if crit:
-            pipeline[-1]["$facet"]["results"].append({"$match": crit})
+            if keywords:
+                pipeline.insert(1, {"$match": crit})
+            else:
+                pipeline.insert(0, {"$match": crit})
 
         pipeline[-1]["$facet"]["total_doc"].append({"$count": "count"})
         pipeline.extend(

diff --git a/tests/synthesis/test_query_operators.py b/tests/synthesis/test_query_operators.py
@@ -12,6 +12,19 @@ def test_synthesis_search_query():
     for keywords in keyword_lists:
         pipeline = (
             [
+                {
+                    "$match": {
+                        "synthesis_type": {"$in": ["solid-state"]},
+                        "targets_formula_s": "SiO2",
+                        "precursors_formula_s": "SiO2",
+                        "operations.type": {"$all": ["ShapingOperation"]},
+                        "operations.conditions.heating_temperature.values": {"$lte": 5},
+                        "operations.conditions.heating_time.values": {"$lte": 5},
+                        "operations.conditions.heating_atmosphere": {"$all": "air"},
+                        "operations.conditions.mixing_device": {"$all": "zirconia"},
+                        "operations.conditions.mixing_media": {"$all": "water"},
+                    }
+                },
                 {
                     "$facet": {
                         "results": [
@@ -33,29 +46,6 @@ def test_synthesis_search_query():
                                     "paragraph_string": 1,
                                 }
                             },
-                            {
-                                "$match": {
-                                    "synthesis_type": {"$in": ["solid-state"]},
-                                    "targets_formula_s": "SiO2",
-                                    "precursors_formula_s": "SiO2",
-                                    "operations.type": {"$all": ["ShapingOperation"]},
-                                    "operations.conditions.heating_temperature.values": {
-                                        "$lte": 5
-                                    },
-                                    "operations.conditions.heating_time.values": {
-                                        "$lte": 5
-                                    },
-                                    "operations.conditions.heating_atmosphere": {
-                                        "$all": "air"
-                                    },
-                                    "operations.conditions.mixing_device": {
-                                        "$all": "zirconia"
-                                    },
-                                    "operations.conditions.mixing_media": {
-                                        "$all": "water"
-                                    },
-                                }
-                            },
                         ],
                         "total_doc": [{"$count": "count"}],
                     }
@@ -85,6 +75,19 @@ def test_synthesis_search_query():
                         "highlight": {"path": "paragraph_string"},
                     }
                 },
+                {
+                    "$match": {
+                        "synthesis_type": {"$in": ["solid-state"]},
+                        "targets_formula_s": "SiO2",
+                        "precursors_formula_s": "SiO2",
+                        "operations.type": {"$all": ["ShapingOperation"]},
+                        "operations.conditions.heating_temperature.values": {"$lte": 5},
+                        "operations.conditions.heating_time.values": {"$lte": 5},
+                        "operations.conditions.heating_atmosphere": {"$all": "air"},
+                        "operations.conditions.mixing_device": {"$all": "zirconia"},
+                        "operations.conditions.mixing_media": {"$all": "water"},
+                    }
+                },
                 {
                     "$facet": {
                         "results": [
@@ -106,29 +109,6 @@ def test_synthesis_search_query():
                                     "highlights": {"$meta": "searchHighlights"},
                                 }
                             },
-                            {
-                                "$match": {
-                                    "synthesis_type": {"$in": ["solid-state"]},
-                                    "targets_formula_s": "SiO2",
-                                    "precursors_formula_s": "SiO2",
-                                    "operations.type": {"$all": ["ShapingOperation"]},
-                                    "operations.conditions.heating_temperature.values": {
-                                        "$lte": 5
-                                    },
-                                    "operations.conditions.heating_time.values": {
-                                        "$lte": 5
-                                    },
-                                    "operations.conditions.heating_atmosphere": {
-                                        "$all": "air"
-                                    },
-                                    "operations.conditions.mixing_device": {
-                                        "$all": "zirconia"
-                                    },
-                                    "operations.conditions.mixing_media": {
-                                        "$all": "water"
-                                    },
-                                }
-                            },
                         ],
                         "total_doc": [{"$count": "count"}],
                     }