[core][fix] History search with sort and fulltext terms (#2146)

Author: aquamatthias

fixcore/fixcore/db/arango_query.py

@@ -130,7 +130,9 @@ def history_query(db: Any, query_model: QueryModel) -> Tuple[str, Json]:
     ctx = ArangoQueryContext()
     query = rewrite_query(query_model)
     start = f"`{db.name}_node_history`"
-    cursor, query_str = query_string(db, query, query_model, start, False, ctx, id_column="id")
+    cursor, query_str = query_string(
+        db, query, query_model, start, False, ctx, id_column="id", use_fulltext_index=False
+    )
     last_limit = f" LIMIT {ll.offset}, {ll.length}" if (ll := query.current_part.limit) else ""
     return f"""{query_str} FOR result in {cursor}{last_limit} RETURN UNSET(result, {unset_props})""", ctx.bind_vars
 
@@ -302,7 +304,7 @@ def view_term(term: Term) -> Tuple[Optional[str], Term]:
     else:
         ctx.bind_vars.clear()
 
-    cursor, query_str = query_string(db, query, query_model, start_cursor, with_edges, ctx)
+    cursor, query_str = query_string(db, query, query_model, start_cursor, with_edges, ctx, use_fulltext_index=False)
     return cursor, qs + query_str
 
 
@@ -340,6 +342,7 @@ def query_string(
     *,
     outer_merge: Optional[str] = None,
     id_column: str = "_key",
+    use_fulltext_index: bool = True,
 ) -> Tuple[str, str]:
     # Note: the parts are maintained in reverse order
     query_parts = query.parts[::-1]
@@ -646,6 +649,7 @@ def add_merge_query(mq: MergeQuery, part_result: str) -> None:
                 ctx,
                 outer_merge=merge_crsr,
                 id_column=id_column,
+                use_fulltext_index=use_fulltext_index,
             )
             if mq.only_first:
                 merge_result += (
@@ -960,7 +964,7 @@ def ft_term(cursor: str, ab_term: Term) -> str:
         return q, crs
 
     parts = []
-    ft, remaining = fulltext_term_combine(query_parts[0].term)
+    ft, remaining = fulltext_term_combine(query_parts[0].term) if use_fulltext_index else (None, query_parts[0].term)
     fulltext_part, crsr = fulltext(ft, remaining) if ft else ("", start_cursor)
     for idx, p in enumerate(query_parts):
         part_tuple = part(p, crsr, idx)

fixcore/fixcore/db/arango_query_rewrite.py

@@ -14,7 +14,6 @@
     CombinedTerm,
     IsTerm,
     NotTerm,
-    IdTerm,
 )
 
 
@@ -76,12 +75,6 @@ def change_term(term: Term) -> Term:
 def rewrite_query(
     query_model: QueryModel,
 ) -> Query:
-    q = query_model.query
-
-    #  remove sort if id is used
-    if isinstance(q.current_part.term, IdTerm):
-        q = q.change_current_part(lambda p: evolve(p, sort=[]))
-        query_model = evolve(query_model, query=q)
 
     # try to add an IsTerm if not already provided
     q = add_is_term(query_model)

fixcore/fixcore/db/graphdb.py

@@ -744,7 +744,7 @@ async def search_history(
         more_than_one = len(query.query.parts) > 1
         has_invalid_terms = any(query.query.find_terms(lambda t: isinstance(t, (FulltextTerm, MergeTerm))))
         has_navigation = any(p.navigation for p in query.query.parts)
-        if more_than_one and has_invalid_terms or has_navigation:
+        if more_than_one or has_invalid_terms or has_navigation:
             raise AttributeError("Fulltext, merge terms and navigation is not supported in history queries!")
         # adjust query
         term = query.query.current_part.term

fixcore/fixcore/model/model.py

@@ -1374,6 +1374,9 @@ def for_complex_kind(
             Property("exported_at", "datetime", False, None, "datetime when the account was exported."),
             Property("exported_age", "trafo.duration_to_datetime", False, SyntheticProperty(["exported_at"])),
             Property("provider_link", "string", False, None, "Link to the provider of this resource."),
+            # History entries
+            Property("change", "string", False, None, "Kind of change."),
+            Property("changed_at", "datetime", False, None, "Time of change."),
         ],
         metadata={"dynamic": True},
     ),

fixcore/tests/fixcore/db/arango_query_rewrite_test.py

@@ -4,11 +4,6 @@
 from fixcore.query.query_parser import parse_query
 
 
-def test_id_rewrite(person_model: Model) -> None:
-    q = rewrite_query(QueryModel(parse_query("id(test) sort foo, bla, bar"), person_model))
-    assert str(q) == 'id("test")'
-
-
 def test_is_rewrite(person_model: Model) -> None:
     q = rewrite_query(QueryModel(parse_query("reported.city = Gotham"), person_model))
     assert str(q) == '(is("Address") and reported.city == "Gotham")'

fixcore/tests/fixcore/model/model_test.py

@@ -594,7 +594,7 @@ def test_filter_model(person_model: Model) -> None:
 
 def test_complete_path(person_model: Model) -> None:
     count, all_props = person_model.complete_path("", "", fuzzy=False, skip=0, limit=4)
-    assert count == 22  # total
+    assert count == 24  # total
     assert all_props == {"address": "Address", "addresses[*]": "Address", "age": "duration", "any": "any"}
     # filter by prefix
     count, all_props = person_model.complete_path("", "ad", fuzzy=False, skip=0, limit=4)
@@ -604,10 +604,10 @@ def test_complete_path(person_model: Model) -> None:
     assert ap == {"address": "Address", "addresses[*]": "Address", "other_addresses": "dictionary[string, Address]"}
     # filter by prefix fuzzy
     count, ap = person_model.complete_path("", "t", fuzzy=True, skip=0, limit=4)
-    assert ap == {"tags": "dictionary[string, string]", "test": "string", "city": "string", "ctime": "datetime"}
+    assert ap == {"tags": "dictionary[string, string]", "test": "string", "city": "string", "changed_at": "datetime"}
     # skip the first 4
     count, all_props = person_model.complete_path("", "", fuzzy=False, skip=4, limit=4)
-    assert all_props == {"city": "string", "ctime": "datetime", "expires": "datetime", "exported_age": "duration"}
+    assert all_props == {"change": "string", "changed_at": "datetime", "city": "string", "ctime": "datetime"}
     # ask for a nested kind
     count, all_props = person_model.complete_path("address", "", fuzzy=False, skip=4, limit=4)
     assert all_props == {"mtime": "datetime", "tags": "dictionary[string, string]", "zip": "string"}