Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix caching issue #7

Merged
merged 1 commit into from
Dec 8, 2024
Merged

Fix caching issue #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions lib/aoch.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,35 @@ defmodule AoCH do
"""

def get_leaderboard_day(day, year) do
{leaderboard_day, _, _} = get_data(year, day)
leaderboard_day
raw_data = get_data(year)

ConCache.get_or_store(:cache, "leaderboard_day_#{year}_#{day}", fn ->
parse_leaderboard_day(raw_data, day, year)
end)
end

def get_leaderboard_year(day, year) do
{_, leaderboard, _} = get_data(year, day)
leaderboard
def get_leaderboard_year(year) do
raw_data = get_data(year)

ConCache.get_or_store(:cache, "leaderboard_#{year}", fn ->
parse_leaderboard_year(raw_data)
end)
end

def get_api_data(day, year) do
{_, _, data} = get_data(year, day)
data
raw_data = get_data(year)

ConCache.get_or_store(:cache, "data_#{year}_#{day}", fn ->
leaderboard_day = parse_leaderboard_day(raw_data, day, year)
leaderboard = parse_leaderboard_year(raw_data)
day_challenge = get_challenge(day, year)

%{
assignment: day_challenge,
today: leaderboard_day |> Enum.map(&assign_time_strings/1),
total: leaderboard
}
end)
end

def get_challenge(day, year) do
Expand Down Expand Up @@ -47,21 +64,16 @@ defmodule AoCH do
}
end

defp get_data(year, day) do
defp get_data(year) do
ConCache.get_or_store(:cache, "data_#{year}", fn ->
raw_data = request_raw_data(year)
leaderboard_day = parse_leaderboard_day(raw_data, day, year)
leaderboard = parse_leaderboard_year(raw_data)
day_challenge = get_challenge(day, year)
for day <- 1..25 do
ConCache.delete(:cache, "leaderboard_day_#{year}_#{day}")
ConCache.delete(:cache, "data_#{year}_#{day}")
end

data =
%{
assignment: day_challenge,
today: leaderboard_day |> Enum.map(&assign_time_strings/1),
total: leaderboard
}
ConCache.delete(:cache, "leaderboard_#{year}")

{leaderboard_day, leaderboard, data}
request_raw_data(year)
end)
end

Expand Down
7 changes: 3 additions & 4 deletions lib/aoch_web/controllers/page_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule AoCHWeb.PageController do
def today(conn, params) do
now = AoCH.now()
year = to_int(params["year"]) || if now.month == 12, do: now.year, else: now.year - 1
day = to_int(params["day"]) || if now.month < 12, do: 25, else: now.day
day = to_int(params["day"]) || if now.month < 12 or now.day > 25, do: 25, else: now.day

today = AoCH.get_leaderboard_day(day, year)

Expand All @@ -19,8 +19,7 @@ defmodule AoCHWeb.PageController do
def total(conn, params) do
now = AoCH.now()
year = to_int(params["year"]) || if now.month == 12, do: now.year, else: now.year - 1
day = to_int(params["day"]) || if now.month < 12, do: 25, else: now.day
total = AoCH.get_leaderboard_year(day, year)
total = AoCH.get_leaderboard_year(year)

render(conn, :total,
year: year,
Expand All @@ -33,7 +32,7 @@ defmodule AoCHWeb.PageController do
def challenge(conn, params) do
now = AoCH.now()
year = to_int(params["year"]) || if now.month == 12, do: now.year, else: now.year - 1
day = to_int(params["day"]) || if now.month < 12, do: 25, else: now.day
day = to_int(params["day"]) || if now.month < 12 or now.day > 25, do: 25, else: now.day
assignment = AoCH.get_challenge(day, year)

render(conn, :assignment,
Expand Down
Loading