Improve data queries so that they return FALSE instead of NULL when querying non-existing data fields

Author: wmnnd

Diff for: lib/keila/contacts/query.ex

@@ -161,16 +161,19 @@ defmodule Keila.Contacts.Query do
   defp build_data_condition(path, %{"$in" => value}) when is_list(value),
     do: dynamic([c], fragment("?#>?", c.data, ^path) in ^value)
 
-  defp build_data_condition(path, %{"$like" => value}),
-    do: dynamic([c], ilike(fragment("?#>>?", c.data, ^path), ^value))
+  defp build_data_condition(path, %{"$like" => value}) do
+    ilike = dynamic([c], ilike(fragment("?#>>?", c.data, ^path), ^value))
+
+    dynamic([c], fragment("coalesce(?, FALSE)", ^ilike))
+  end
 
   defp build_data_condition(path, value) when is_binary(value) or is_number(value) do
     value_in_array = [value]
     string_value = to_string(value)
 
     equals_string = dynamic([c], fragment("?#>>?", c.data, ^path) == ^string_value)
     array_contains = dynamic([c], fragment("?#>? @> ?", c.data, ^path, ^value_in_array))
-    dynamic([c], ^equals_string or ^array_contains)
+    dynamic([c], fragment("coalesce(?, FALSE)", ^equals_string or ^array_contains))
   end
 
   defp build_data_condition(path, value) when is_map(value) or is_list(value) do

Diff for: test/keila/contacts/contacts_query_test.exs

@@ -163,6 +163,7 @@ defmodule Keila.ContactsQueryTest do
       insert!(:contact, %{
         data: %{
           "string" => "bar",
+          "stringOnly2" => "yes",
           "array" => [4, 5, 6],
           "object" => %{"d" => %{"e" => "f"}},
           "objects" => [%{"e" => "f"}]
@@ -197,6 +198,11 @@ defmodule Keila.ContactsQueryTest do
     # Like operator
     assert [c1] == filter_contacts(%{"data.string" => %{"$like" => "%o%"}})
     assert [c2] == filter_contacts(%{"data.string" => %{"$like" => "%A%"}})
+
+    # Not operator
+    assert [c1, c2] == filter_contacts(%{"$not" => %{"data.string" => "no_match"}})
+    assert [c1, c2] == filter_contacts(%{"$not" => %{"data.stringOnly2" => "no_match"}})
+    assert [c1] == filter_contacts(%{"$not" => %{"data.stringOnly2" => "yes"}})
   end
 
   @tag :contacts_query