Merge pull request #67 from otakulan/feature/tgh/otp-26-elixir-1.15

Upgrade to OTP 26, Elixir 1.15 and fix warns

flake.nix

@@ -67,8 +67,8 @@
         devenv.shells.default = let
           inherit (pkgs.lib) optional optionals;
           erlang = pkgs.beam.interpreters.erlangR25;
-          elixir = pkgs.beam.packages.erlangR25.elixir_1_14;
-          rebar = pkgs.beam.packages.erlangR25.rebar3;
+          elixir = pkgs.beam.packages.erlangR26.elixir_1_15;
+          rebar = pkgs.rebar3;
           nodejs = pkgs.nodejs_20;
         in {
           services.postgres = {

lib/lanpartyseating/logic/autoassign_logic.ex

@@ -2,7 +2,6 @@ defmodule Lanpartyseating.AutoAssignLogic do
   alias Lanpartyseating.LastAssignedSeat, as: LastAssignedStation
   alias Lanpartyseating.SettingsLogic, as: SettingsLogic
   alias Lanpartyseating.StationLogic, as: StationLogic
-  alias Lanpartyseating.Station, as: Station
   alias Lanpartyseating.Repo, as: Repo
 
   def register_station(uid) do

lib/lanpartyseating/logic/reservation_logic.ex

@@ -64,7 +64,7 @@ defmodule Lanpartyseating.ReservationLogic do
     end
   end
 
-  def cancel_reservation(id, station_number, reason) do
+  def cancel_reservation(id, reason) do
     Reservation
     |> where(station_id: ^id)
     |> where([v], is_nil(v.deleted_at))

lib/lanpartyseating/logic/station_logic.ex

@@ -142,7 +142,7 @@ defmodule Lanpartyseating.StationLogic do
     end)
   end
 
-  def get_station_status(station, now \\ DateTime.utc_now()) do
+  def get_station_status(station) do
     case station do
       %Station{is_closed: true} ->
         %{status: :broken, reservation: nil}

lib/lanpartyseating/repositories/station_status_repo.ex

@@ -14,8 +14,8 @@ defmodule Lanpartyseating.StationStatus do
 
   @doc false
   def changeset(reservation, attrs) do
-    #reservation
-    #|> cast(attrs, [:station_id, :tournament_id])
-    #|> validate_required([:station_id, :tournament_id])
+    reservation
+    |> cast(attrs, [:station_id, :tournament_id])
+    |> validate_required([:station_id, :tournament_id])
   end
 end

lib/lanpartyseating/tasks/expire_tournament.ex

@@ -1,10 +1,7 @@
 defmodule Lanpartyseating.Tasks.ExpireTournament do
   use GenServer, restart: :transient
-  import Ecto.Query
   require Logger
   alias Lanpartyseating.StationLogic
-  alias Lanpartyseating.Tournament, as: Tournament
-  alias Lanpartyseating.Repo, as: Repo
   alias Lanpartyseating.PubSub, as: PubSub
 
   def start_link(arg) do
@@ -30,21 +27,11 @@ defmodule Lanpartyseating.Tasks.ExpireTournament do
   def handle_info(:expire_tournament, tournament_id) do
     Logger.debug("Expiring tournament #{tournament_id}")
 
-    tournament =
-      from(t in Tournament,
-        where: t.id == ^tournament_id,
-        join: tr in assoc(t, :tournament_reservations),
-        join: s in assoc(tr, :station),
-        preload: [tournament_reservations: {tr, station: s}]
-      ) |> Repo.one()
-
-    Enum.map(tournament.tournament_reservations, fn reservation ->
-      Phoenix.PubSub.broadcast(
-        PubSub,
-        "station_update",
-        {:stations, StationLogic.get_all_stations()}
-      )
-    end)
+    Phoenix.PubSub.broadcast(
+      PubSub,
+      "station_update",
+      {:stations, StationLogic.get_all_stations()}
+    )
 
     {:stop, :normal, tournament_id}
   end

lib/lanpartyseating/tasks/start_tournament.ex

@@ -1,10 +1,7 @@
 defmodule Lanpartyseating.Tasks.StartTournament do
   use GenServer, restart: :transient
-  import Ecto.Query
   require Logger
   alias Lanpartyseating.StationLogic
-  alias Lanpartyseating.Tournament, as: Tournament
-  alias Lanpartyseating.Repo, as: Repo
   alias Lanpartyseating.PubSub, as: PubSub
 
   def start_link(arg) do
@@ -16,35 +13,26 @@ defmodule Lanpartyseating.Tasks.StartTournament do
   def init({start_date, tournament_id}) do
     delay = DateTime.diff(start_date, DateTime.truncate(DateTime.utc_now(), :second), :millisecond) |> max(0)
     Logger.debug("Starting tournament #{tournament_id} in #{delay} milliseconds")
-    Process.send_after(self(), :expire_tournament, delay)
+    Process.send_after(self(), :start_tournament, delay)
     {:ok, tournament_id}
   end
 
   @impl true
   def handle_cast(:terminate, state) do
-    Logger.debug("Terminating reservation expiration task for #{state}")
+    Logger.debug("Terminating reservation start task for #{state}")
     {:stop, :normal, state}
   end
 
   @impl true
-  def handle_info(:expire_tournament, tournament_id) do
+  def handle_info(:start_tournament, tournament_id) do
     Logger.debug("Starting tournament #{tournament_id}")
 
-    tournament =
-      from(t in Tournament,
-        where: t.id == ^tournament_id,
-        join: tr in assoc(t, :tournament_reservations),
-        join: s in assoc(tr, :station),
-        preload: [tournament_reservations: {tr, station: s}]
-      ) |> Repo.one()
+    Phoenix.PubSub.broadcast(
+      PubSub,
+      "station_update",
+      {:stations, StationLogic.get_all_stations()}
+    )
 
-    Enum.map(tournament.tournament_reservations, fn reservation ->
-      Phoenix.PubSub.broadcast(
-        PubSub,
-        "station_update",
-        {:stations, StationLogic.get_all_stations()}
-      )
-    end)
     {:stop, :normal, tournament_id}
   end
 end

lib/lanpartyseating_web/live/cancellation_live.ex

@@ -46,19 +46,18 @@ defmodule LanpartyseatingWeb.CancellationLive do
 
     socket =
       socket
-      |> assign(:registration_error, nil)
+      |> assign(:registration_error, registration_error)
 
     {:noreply, socket}
   end
 
   def handle_event(
         "cancel_station",
-        %{"station_id" => id, "station_number" => station_number, "cancel_reason" => reason},
+        %{"station_id" => id, "station_number" => _station_number, "cancel_reason" => reason},
         socket
       ) do
     ReservationLogic.cancel_reservation(
       String.to_integer(id),
-      String.to_integer(station_number),
       reason
     )