Skip to content

Commit 2b0acf1

Browse files
authored
Merge pull request #1086 from noaccOS/refactor/appengine-device-select-exandra
refactor(appengine): port Device select queries to exandra
2 parents 05b4a18 + 07b6d16 commit 2b0acf1

File tree

6 files changed

+802
-1112
lines changed

6 files changed

+802
-1112
lines changed

apps/astarte_appengine_api/lib/astarte_appengine_api/device/astarte_value.ex

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,22 @@ defmodule Astarte.AppEngine.API.Device.AstarteValue do
5050
Base.encode64(value)
5151
end
5252

53-
def to_json_friendly(value, :datetime, opts) do
53+
def to_json_friendly(value, :datetime, opts) when is_integer(value) do
5454
if opts[:keep_milliseconds] do
5555
value
5656
else
5757
DateTime.from_unix!(value, :millisecond)
5858
end
5959
end
6060

61+
def to_json_friendly(value, :datetime, opts) when is_struct(value, DateTime) do
62+
if opts[:keep_milliseconds] do
63+
DateTime.to_unix(value, :millisecond)
64+
else
65+
value
66+
end
67+
end
68+
6169
def to_json_friendly(value, :longintegerarray, opts) do
6270
for item <- value do
6371
to_json_friendly(item, :longinteger, opts)

0 commit comments

Comments
 (0)