shift in the opposite direction in to_datetime_in_timezone

fix-timezones
ruslandoga 3 years ago
parent d88722a91b
commit bbdf8979b0

@ -23,15 +23,31 @@ defmodule Plausible.Timezones do
end
end
@spec to_date_in_timezone(Date.t() | NaiveDateTime.t() | DateTime.t(), String.t()) :: Date.t()
@spec to_date_in_timezone(NaiveDateTime.t() | DateTime.t(), String.t()) :: Date.t()
def to_date_in_timezone(dt, timezone) do
to_datetime_in_timezone(dt, timezone) |> Timex.to_date()
dt |> to_datetime_in_timezone(timezone) |> DateTime.to_date()
end
@spec to_datetime_in_timezone(Date.t() | NaiveDateTime.t() | DateTime.t(), String.t()) ::
@doc """
Represents a point in time in a different timezone.
Naive datetimes are assumed to be GMT.
Examples:
iex> to_datetime_in_timezone(~U[2024-03-16 01:50:45.180928Z], "Asia/Kuala_Lumpur")
#DateTime<2024-03-16 09:50:45.180928+08:00 +08 Asia/Kuala_Lumpur>
"""
@spec to_datetime_in_timezone(NaiveDateTime.t() | DateTime.t(), String.t()) ::
DateTime.t()
def to_datetime_in_timezone(dt, timezone) do
dt |> Timex.to_datetime("UTC") |> Timex.Timezone.convert(timezone)
def to_datetime_in_timezone(%NaiveDateTime{} = naive, timezone) do
naive
|> DateTime.from_naive!("Etc/UTC")
|> to_datetime_in_timezone(timezone)
end
def to_datetime_in_timezone(%DateTime{} = dt, timezone) do
DateTime.shift_zone!(dt, timezone)
end
defp build_option(timezone_code, acc, now) do

@ -3,6 +3,8 @@ defmodule Plausible.TimezonesTest do
import Plausible.Timezones
doctest Plausible.Timezones, import: true
test "options/0 returns a list of timezones" do
options = options()
refute Enum.empty?(options)
@ -29,14 +31,14 @@ defmodule Plausible.TimezonesTest do
end
test "to_date_in_timezone/1" do
assert to_date_in_timezone(~D[2021-01-03], "Etc/UTC") == ~D[2021-01-03]
assert to_date_in_timezone(~U[2015-01-13 13:00:07Z], "Etc/UTC") == ~D[2015-01-13]
assert to_date_in_timezone(~N[2015-01-13 13:00:07], "Etc/UTC") == ~D[2015-01-13]
assert to_date_in_timezone(~N[2015-01-13 19:00:07], "Etc/GMT+12") == ~D[2015-01-14]
assert to_date_in_timezone(~N[2015-01-13 19:00:07], "Etc/GMT+12") == ~D[2015-01-13]
assert to_date_in_timezone(~N[2015-01-13 11:00:07], "Etc/GMT+12") == ~D[2015-01-12]
assert to_date_in_timezone(~N[2015-01-13 19:00:07], "Etc/GMT-12") == ~D[2015-01-14]
end
test "to_datetime_in_timezone/1" do
assert to_datetime_in_timezone(~D[2021-01-03], "Etc/UTC") == ~U[2021-01-03 00:00:00Z]
assert to_datetime_in_timezone(~N[2015-01-13 13:00:07], "Etc/UTC") == ~U[2015-01-13 13:00:07Z]
assert to_datetime_in_timezone(~N[2015-01-13 19:00:07], "Etc/GMT+12") ==
@ -45,13 +47,13 @@ defmodule Plausible.TimezonesTest do
second: 7,
calendar: Calendar.ISO,
month: 1,
day: 14,
day: 13,
year: 2015,
minute: 0,
hour: 7,
time_zone: "Etc/GMT-12",
zone_abbr: "+12",
utc_offset: 43_200,
time_zone: "Etc/GMT+12",
zone_abbr: "-12",
utc_offset: -43_200,
std_offset: 0
}

Loading…
Cancel
Save