DUP: move Queries.register_device_with_interface to Ecto + a small TODO + yeet CQEx

Signed-off-by: Arnaldo Cesco <arnaldo.cesco@secomind.com>

Author: Annopaolo

apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/data_updater/impl.ex

@@ -31,7 +31,6 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Impl do
   alias Astarte.Core.Triggers.SimpleTriggersProtobuf.Utils, as: SimpleTriggersProtobufUtils
   alias Astarte.Core.Triggers.SimpleTriggersProtobuf.AMQPTriggerTarget
   alias Astarte.DataAccess.Data
-  alias Astarte.DataAccess.Database
   alias Astarte.DataAccess.Device, as: DeviceQueries
   alias Astarte.DataAccess.Interface, as: InterfaceQueries
   alias Astarte.DataAccess.Mappings
@@ -1228,8 +1227,6 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Impl do
   end
 
   def process_introspection(state, new_introspection_list, payload, message_id, timestamp) do
-    {:ok, db_client} = Database.connect(realm: state.realm)
-
     new_state = execute_time_based_actions(state, timestamp)
 
     timestamp_ms = div(timestamp, 10_000)
@@ -1289,7 +1286,7 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Impl do
             :ok =
               if interface_major == 0 do
                 Queries.register_device_with_interface(
-                  db_client,
+                  realm,
                   state.device_id,
                   interface_name,
                   0

apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/data_updater/queries.ex

@@ -28,7 +28,6 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
   alias Astarte.DataUpdaterPlant.DataUpdater.IndividualProperty
   alias Astarte.DataUpdaterPlant.DataUpdater.KvStore
   alias Astarte.DataUpdaterPlant.DataUpdater.Realm
-  alias CQEx.Query, as: DatabaseQuery
   alias Astarte.DataUpdaterPlant.Repo
   import Ecto.Query
   require Logger
@@ -602,34 +601,25 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
     end
   end
 
-  def register_device_with_interface(db_client, device_id, interface_name, interface_major) do
-    key_insert_statement = """
-    INSERT INTO kv_store (group, key)
-    VALUES (:group, :key)
-    """
-
-    major_str = "v#{Integer.to_string(interface_major)}"
+  def register_device_with_interface(realm, device_id, interface_name, interface_major) do
+    keyspace_name = Realm.keyspace_name(realm)
     encoded_device_id = CoreDevice.encode_device_id(device_id)
 
-    insert_device_by_interface_query =
-      DatabaseQuery.new()
-      |> DatabaseQuery.statement(key_insert_statement)
-      |> DatabaseQuery.put(:group, "devices-by-interface-#{interface_name}-#{major_str}")
-      |> DatabaseQuery.put(:key, encoded_device_id)
-      |> DatabaseQuery.consistency(:each_quorum)
-
-    insert_to_with_data_on_interface =
-      DatabaseQuery.new()
-      |> DatabaseQuery.statement(key_insert_statement)
-      |> DatabaseQuery.put(
-        :group,
-        "devices-with-data-on-interface-#{interface_name}-#{major_str}"
-      )
-      |> DatabaseQuery.put(:key, encoded_device_id)
-      |> DatabaseQuery.consistency(:each_quorum)
+    devices_by_interface = %{
+      "group" => "devices-by-interface-#{interface_name}-v#{interface_major}",
+      "key" => encoded_device_id
+    }
+
+    devices_on_interface = %{
+      "group" => "devices-with-data-on-interface-#{interface_name}-v#{interface_major}",
+      "key" => encoded_device_id
+    }
+
+    opts = [prefix: keyspace_name, consistency: :each_quorum]
 
-    with {:ok, _result} <- DatabaseQuery.call(db_client, insert_device_by_interface_query),
-         {:ok, _result} <- DatabaseQuery.call(db_client, insert_to_with_data_on_interface) do
+    # TODO: what about a batch here?
+    with {n, _} when is_integer(n) <- Repo.safe_insert(KvStore, devices_by_interface, opts),
+         {m, _} when is_integer(m) <- Repo.safe_insert(KvStore, devices_on_interface, opts) do
       :ok
     else
       {:error, reason} ->