Merge pull request #1123 from Annopaolo/dup-style-queries

DUP: use a more elegant style when handling some queries

Author: davidebriani

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

@@ -501,7 +501,7 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Impl do
          :ok <- can_write_on_interface?(interface_descriptor),
          interface_id <- interface_descriptor.interface_id,
          {:ok, mapping} <- resolve_path(path, interface_descriptor, new_state.mappings),
-         endpoint_id <- mapping.endpoint_id,
+         endpoint_id = mapping.endpoint_id,
          db_retention_policy = mapping.database_retention_policy,
          db_ttl = mapping.database_retention_ttl,
          {value, value_timestamp, _metadata} <-

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

@@ -73,7 +73,7 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
         update: [set: [pending_empty_cache: ^pending_empty_cache]]
 
     case Repo.safe_update_all(device, []) do
-      {1, _} ->
+      {:ok, _} ->
         :ok
 
       {:error, reason} ->
@@ -587,7 +587,7 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
         update: [set: [old_introspection: fragment(" old_introspection + ?", ^old_interfaces)]]
 
     case Repo.safe_update_all(device, [], consistency: :quorum) do
-      {1, _} ->
+      {:ok, _} ->
         :ok
 
       {:error, reason} ->
@@ -616,7 +616,7 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
         update: [set: [old_introspection: fragment(" old_introspection - ?", ^old_interfaces)]]
 
     case Repo.safe_update_all(device, [], consistency: :quorum) do
-      {1, _} ->
+      {:ok, _} ->
         :ok
 
       {:error, reason} ->
@@ -678,14 +678,12 @@ defmodule Astarte.DataUpdaterPlant.DataUpdater.Queries do
     encoded_device_id = CoreDevice.encode_device_id(device_id)
 
     query =
-      from(
-        KvStore
-        |> where(group: ^group, key: ^encoded_device_id)
-        |> put_query_prefix(keyspace_name)
-      )
+      from(KvStore)
+      |> where(group: ^group, key: ^encoded_device_id)
+      |> put_query_prefix(keyspace_name)
 
     case Repo.safe_delete_all(query, consistency: :each_quorum) do
-      {n, _} when is_integer(n) ->
+      {:ok, _} ->
         :ok
 
       {:error, reason} ->

apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/repo.ex

@@ -50,7 +50,7 @@ defmodule Astarte.DataUpdaterPlant.Repo do
 
   def safe_update_all(queryable, updates, opts \\ []) do
     try do
-      update_all(queryable, updates, opts)
+      {:ok, update_all(queryable, updates, opts)}
     catch
       error ->
         handle_xandra_error(error)
@@ -59,7 +59,7 @@ defmodule Astarte.DataUpdaterPlant.Repo do
 
   def safe_delete_all(queryable, opts \\ []) do
     try do
-      delete_all(queryable, opts)
+      {:ok, delete_all(queryable, opts)}
     catch
       error ->
         handle_xandra_error(error)