broken

Signed-off-by: Eddy Babetto <eddy.babetto@secomind.com>

Author: eddbbt

apps/astarte_appengine_api/lib/astarte_appengine_api/device/device_status.ex

@@ -51,25 +51,25 @@ defmodule Astarte.AppEngine.API.Device.DeviceStatus do
 
   def from_db_row(row) when is_map(row) do
     %{
-      "device_id" => device_id,
-      "aliases" => aliases,
-      "introspection" => introspection_major,
-      "introspection_minor" => introspection_minor,
-      "connected" => connected,
-      "last_connection" => last_connection,
-      "last_disconnection" => last_disconnection,
-      "first_registration" => first_registration,
-      "first_credentials_request" => first_credentials_request,
-      "last_credentials_request_ip" => last_credentials_request_ip,
-      "last_seen_ip" => last_seen_ip,
-      "attributes" => attributes,
-      "inhibit_credentials_request" => credentials_inhibited,
-      "total_received_msgs" => total_received_msgs,
-      "total_received_bytes" => total_received_bytes,
-      "groups" => groups_map,
-      "exchanged_msgs_by_interface" => exchanged_msgs_by_interface,
-      "exchanged_bytes_by_interface" => exchanged_bytes_by_interface,
-      "old_introspection" => old_introspection
+      device_id: device_id,
+      aliases: aliases,
+      introspection: introspection_major,
+      introspection_minor: introspection_minor,
+      connected: connected,
+      last_connection: last_connection,
+      last_disconnection: last_disconnection,
+      first_registration: first_registration,
+      first_credentials_request: first_credentials_request,
+      last_credentials_request_ip: last_credentials_request_ip,
+      last_seen_ip: last_seen_ip,
+      attributes: attributes,
+      inhibit_credentials_request: credentials_inhibited,
+      total_received_msgs: total_received_msgs,
+      total_received_bytes: total_received_bytes,
+      groups: groups_map,
+      exchanged_msgs_by_interface: exchanged_msgs_by_interface,
+      exchanged_bytes_by_interface: exchanged_bytes_by_interface,
+      old_introspection: old_introspection
     } = row
 
     introspection =

apps/astarte_appengine_api/lib/astarte_appengine_api/groups/queries.ex

@@ -34,19 +34,16 @@ defmodule Astarte.AppEngine.API.Groups.Queries do
   def list_devices(realm_name, group_name, opts \\ []) do
     keyspace = DataAccessRealm.keyspace_name(realm_name)
 
-    query =
+    result =
       if opts[:details],
         do: list_devices_with_details(keyspace, group_name, opts),
         else: list_grouped_devices(keyspace, group_name, opts)
 
-    limit = opts[:limit]
-    query = query |> limit(^limit)
-    IO.inspect(query)
+    # limit = opts[:limit]
+    # query = query |> limit(^limit)
+    # IO.inspect(query)
 
-    case Repo.all(query) do
-      [] -> {:error, :group_not_found}
-      devices -> {:ok, build_device_list(keyspace, devices, opts)}
-    end
+    _devices = {:ok, build_device_list(keyspace, result.devices, opts)}
 
     Xandra.Cluster.run(:xandra, fn conn ->
       query = list_devices_with_details_query(keyspace, group_name, opts)
@@ -80,7 +77,7 @@ defmodule Astarte.AppEngine.API.Groups.Queries do
 
     case Repo.all(query) do
       [] -> {:error, :group_not_found}
-      devices -> {:ok, build_device_list(keyspace, devices, opts)}
+      devices -> build_device_list(keyspace, devices, opts)
     end
   end
 
@@ -89,7 +86,7 @@ defmodule Astarte.AppEngine.API.Groups.Queries do
 
     case Repo.all(query) do
       [] -> {:error, :group_not_found}
-      devices -> {:ok, build_device_list(keyspace, devices, opts)}
+      devices -> build_device_list(keyspace, devices, opts)
     end
   end
 
@@ -222,7 +219,28 @@ defmodule Astarte.AppEngine.API.Groups.Queries do
   end
 
   defp compute_device_status(realm_name, device_row) do
-    %{"device_id" => device_id} = device_row
+    %{
+      id: device_id,
+      aliases: _aliases,
+      introspection: _introspection_major,
+      introspection_minor: _introspection_minor,
+      connected: _connected,
+      last_connection: _last_connection,
+      last_disconnection: _last_disconnection,
+      first_registration: _first_registration,
+      first_credentials_request: _first_credentials_request,
+      last_credentials_request_ip: _last_credentials_request_ip,
+      last_seen_ip: _last_seen_ip,
+      attributes: _attributes,
+      inhibit_credentials_request: _credentials_inhibited,
+      total_received_msgs: _total_received_msgs,
+      total_received_bytes: _total_received_bytes,
+      groups: _groups_map,
+      exchanged_msgs_by_interface: _exchanged_msgs_by_interface,
+      exchanged_bytes_by_interface: _exchanged_bytes_by_interface,
+      old_introspection: _old_introspection
+    } = device_row
+
     device_status = DeviceStatus.from_db_row(device_row)
     # TODO: rebase on newer devicestatus
     deletion_in_progress? = deletion_in_progress?(realm_name, device_id)

apps/astarte_appengine_api/lib/astarte_appengine_api/health.ex

@@ -60,6 +60,8 @@ defmodule Astarte.AppEngine.API.Health do
     with {:ok, _result} <- safe_query(schema_query, opts),
          {:ok, _result} <- safe_query(realm_query, opts) do
       :ok
+    else
+      err -> err
     end
   end
 
@@ -74,6 +76,9 @@ defmodule Astarte.AppEngine.API.Health do
       {:error, %Xandra.ConnectionError{}} ->
         {:error, :database_connection_error}
 
+      {:error, :health_check_bad} ->
+        {:error, :database_connection_error}
+
       {:error, %Xandra.Error{message: message, reason: reason}} ->
         error_message =
           case message do

apps/astarte_appengine_api/lib/astarte_appengine_api_web/controllers/device_status_by_group_controller.ex

@@ -32,7 +32,10 @@ defmodule Astarte.AppEngine.APIWeb.DeviceStatusByGroupController do
       ) do
     with {:ok, %DevicesList{} = devices_list} <-
            Groups.list_detailed_devices(realm_name, group_name, params) do
+      IO.inspect(devices_list)
       render(conn, "detailed_index.json", devices_list: devices_list, request: params)
+    else
+      err -> IO.inspect(err)
     end
   end
 

apps/astarte_appengine_api/test/astarte_appengine_api_web/controllers/device_status_by_group_controller_test.exs

@@ -152,6 +152,8 @@ defmodule Astarte.AppEngine.APIWeb.DeviceStatusByGroupControllerTest do
       assert length(devices) == length(@group_devices)
 
       for device <- devices do
+        IO.inspect(device)
+
         %{
           "id" => device_id,
           "connected" => _,