make planet ids serial

Author: goncalotomas

lib/galaxies/accounts.ex

@@ -174,22 +174,29 @@ defmodule Galaxies.Accounts do
   """
   def register_player(attrs) do
     now = DateTime.utc_now()
-    home_planet_id = Ecto.UUID.generate()
 
     attrs =
       Enum.reduce(attrs, %{}, fn
         {key, value}, acc when is_atom(key) -> Map.put(acc, key, value)
         {key, value}, acc when is_binary(key) -> Map.put(acc, String.to_existing_atom(key), value)
       end)
 
-    player_changeset =
-      Player.registration_changeset(
-        %Player{},
-        Map.put(attrs, :current_planet_id, home_planet_id)
-      )
-
     Ecto.Multi.new()
-    |> Ecto.Multi.insert(:player, player_changeset)
+    |> Ecto.Multi.run(:home_planet_id, fn repo, _changes ->
+      query = "select nextval('planets_id_seq')"
+      %{rows: [[id]]} = Ecto.Adapters.SQL.query!(repo, query)
+
+      {:ok, id}
+    end)
+    |> Ecto.Multi.run(:player, fn repo, %{home_planet_id: home_planet_id} ->
+      player_changeset =
+        Player.registration_changeset(
+          %Player{},
+          Map.put(attrs, :current_planet_id, home_planet_id)
+        )
+
+      repo.insert(player_changeset)
+    end)
     |> Ecto.Multi.run(:player_researches, fn repo, %{player: player} ->
       player_researches =
         repo.all(from(r in Research))
@@ -211,7 +218,7 @@ defmodule Galaxies.Accounts do
 
       {:ok, nil}
     end)
-    |> Ecto.Multi.insert(:planet, fn %{player: player} ->
+    |> Ecto.Multi.insert(:planet, fn %{home_planet_id: home_planet_id, player: player} ->
       {galaxy, system, slot} = get_available_planet_slot()
 
       player

lib/galaxies/accounts/player.ex

@@ -11,7 +11,7 @@ defmodule Galaxies.Accounts.Player do
     field :current_password, :string, virtual: true, redact: true
     field :hashed_password, :string, redact: true
     field :confirmed_at, :naive_datetime
-    field :current_planet_id, :binary_id
+    field :current_planet_id, :integer
 
     has_many :planets, Galaxies.Planet
 

lib/galaxies/planet.ex

@@ -1,5 +1,5 @@
 defmodule Galaxies.Planet do
-  use Galaxies.Schema
+  use Ecto.Schema
 
   import Ecto.Changeset
 
@@ -27,7 +27,7 @@ defmodule Galaxies.Planet do
     # image_id is used to refer to multiple planet images for the same planet type.
     field :image_id, :integer
 
-    belongs_to :player, Galaxies.Accounts.Player
+    belongs_to :player, Galaxies.Accounts.Player, type: :binary_id
 
     has_many :buildings, Galaxies.PlanetBuilding
     has_many :units, Galaxies.PlanetUnit

lib/galaxies/planet_building.ex

@@ -7,7 +7,7 @@ defmodule Galaxies.PlanetBuilding do
   schema "planet_buildings" do
     field :current_level, :integer
 
-    belongs_to :planet, Galaxies.Planet, primary_key: true
+    belongs_to :planet, Galaxies.Planet, primary_key: true, type: :integer
     belongs_to :building, Galaxies.Building, primary_key: true, type: :integer
 
     timestamps(type: :utc_datetime_usec)

lib/galaxies/planet_unit.ex

@@ -5,7 +5,7 @@ defmodule Galaxies.PlanetUnit do
   schema "planet_units" do
     field :amount, :integer
 
-    belongs_to :planet, Galaxies.Planet, primary_key: true
+    belongs_to :planet, Galaxies.Planet, primary_key: true, type: :integer
     belongs_to :unit, Galaxies.Unit, primary_key: true, type: :integer
 
     timestamps(type: :utc_datetime_usec)

lib/galaxies/planets/enqueued_building.ex

@@ -18,7 +18,7 @@ defmodule Galaxies.Planets.EnqueuedBuilding do
     field :completed_at, :utc_datetime
 
     belongs_to :building, Galaxies.Building, type: :integer
-    belongs_to :planet, Galaxies.Planet
+    belongs_to :planet, Galaxies.Planet, type: :integer
 
     timestamps(type: :utc_datetime_usec)
   end

lib/galaxies/planets/planet_event.ex

@@ -18,7 +18,7 @@ defmodule Galaxies.Planets.PlanetEvent do
 
     field :completed_at, :utc_datetime
 
-    belongs_to :planet, Galaxies.Planet
+    belongs_to :planet, Galaxies.Planet, type: :integer
 
     timestamps(updated_at: false, type: :utc_datetime)
   end

lib/galaxies/player_research.ex

@@ -3,13 +3,14 @@ defmodule Galaxies.PlayerResearch do
 
   import Ecto.Changeset
 
+  @primary_key false
   schema "player_researches" do
     field :current_level, :integer
     field :is_upgrading, :boolean
     field :upgrade_finished_at, :utc_datetime_usec
 
-    belongs_to :player, Galaxies.Accounts.Player
-    belongs_to :research, Galaxies.Research, type: :integer
+    belongs_to :player, Galaxies.Accounts.Player, primary_key: true
+    belongs_to :research, Galaxies.Research, type: :integer, primary_key: true
 
     timestamps(type: :utc_datetime_usec)
   end

lib/galaxies_web/live/fleet_live.ex

@@ -9,8 +9,7 @@ defmodule GalaxiesWeb.FleetLive do
     {:ok, assign(socket, first_step: @first_step, last_step: @last_step)}
   end
 
-  def handle_params(unsigned_params, _uri, socket) do
-    dbg(unsigned_params)
+  def handle_params(_unsigned_params, _uri, socket) do
     {:noreply, socket |> GalaxiesWeb.Common.mount_live_context() |> assign(:current_step, 1)}
   end
 

lib/galaxies_web/live/resources_live.ex

@@ -18,8 +18,7 @@ defmodule GalaxiesWeb.ResourcesLive do
      socket
      |> assign(:build_queue, build_queue)
      |> assign(:planet_buildings, planet_buildings)
-     |> assign(:building_timers, building_timers)
-     |> dbg()}
+     |> assign(:building_timers, building_timers)}
   end
 
   defp timers_from_build_queue([]), do: %{}

lib/galaxies_web/live/shipyard_live.ex

@@ -6,8 +6,6 @@ defmodule GalaxiesWeb.ShipyardLive do
   def mount(_params, _session, socket) do
     socket = GalaxiesWeb.Common.mount_live_context(socket)
     planet_ships = Accounts.get_planet_ship_units(socket.assigns.current_planet)
-    dbg(Enum.map(planet_ships, &Galaxies.Prerequisites.get_unit_prerequisites(&1.id)))
-    # dbg(planet_ships)
 
     {:ok, assign(socket, :planet_ships, planet_ships)}
   end

priv/repo/migrations/20240124123636_create_planets_table.exs

@@ -3,7 +3,7 @@ defmodule Galaxies.Repo.Migrations.CreatePlanetsTable do
 
   def change do
     create table(:planets, primary_key: false) do
-      add :id, :binary_id, primary_key: true
+      add :id, :serial, primary_key: true
       add :name, :string, size: 24, null: false
 
       add :galaxy, :smallint, null: false

priv/repo/migrations/20240125090830_add_current_planet_id_to_players_table.exs

@@ -15,7 +15,7 @@ defmodule Galaxies.Repo.Migrations.AddCurrentPlanetIdToPlayersTable do
   def change do
     execute """
     ALTER TABLE players
-    ADD COLUMN current_planet_id uuid
+    ADD COLUMN current_planet_id serial
     CONSTRAINT players_current_planet_id_fk
     REFERENCES planets (id)
     DEFERRABLE INITIALLY DEFERRED;

priv/repo/migrations/20240126093746_create_buildings_table.exs

@@ -26,7 +26,7 @@ defmodule Galaxies.Repo.Migrations.CreateBuildingsTable do
     create index(:buildings, [:name, :list_order])
 
     create table(:planet_buildings, primary_key: false) do
-      add :planet_id, references(:planets, type: :binary_id, on_delete: :delete_all),
+      add :planet_id, references(:planets, type: :serial, on_delete: :delete_all),
         null: false,
         primary_key: true
 

priv/repo/migrations/20240127172200_create_researches_table.exs

@@ -23,8 +23,6 @@ defmodule Galaxies.Repo.Migrations.CreateResearchesTable do
     create index(:researches, [:list_order])
 
     create table(:player_researches, primary_key: false) do
-      add :id, :binary_id, primary_key: true
-
       add :player_id, references(:players, type: :binary_id, on_delete: :delete_all),
         null: false,
         primary_key: true

priv/repo/migrations/20240129163345_create_units_table.exs

@@ -32,7 +32,7 @@ defmodule Galaxies.Repo.Migrations.CreateUnitsTable do
     create index(:units, [:name, :list_order])
 
     create table(:planet_units, primary_key: false) do
-      add :planet_id, references(:planets, type: :binary_id, on_delete: :delete_all),
+      add :planet_id, references(:planets, type: :serial, on_delete: :delete_all),
         null: false,
         primary_key: true
 

priv/repo/migrations/20240131135434_create_planet_events_table.exs

@@ -2,7 +2,7 @@ defmodule Galaxies.Repo.Migrations.CreateEventQueueTables do
   @moduledoc """
   Defines an event queue to serialize all events happening on any given planet.
   When wanting to move time forward for a given planet, the game can read from
-  the planet event queue and execute all events by order. Processing the events
+  the planet event queue and execute all events in order. Processing the events
   for one planet does not affect any other events.
   Keep in mind that player actions may cause events in the queue to be
   cancelled (e.g. cancelling an attack) or postponed (sending more ships to an
@@ -13,7 +13,7 @@ defmodule Galaxies.Repo.Migrations.CreateEventQueueTables do
   def change do
     create table(:planet_events, primary_key: false) do
       add :id, :binary_id, primary_key: true
-      add :planet_id, references(:planets, type: :binary_id, on_delete: :delete_all), null: false
+      add :planet_id, references(:planets, type: :serial, on_delete: :delete_all), null: false
       # specifies which table to fetch event from (e.g. planet_building_queue, fleet, etc).
       add :type, :integer, null: false
       # event data is polymorphic and depends on event type
@@ -31,7 +31,7 @@ defmodule Galaxies.Repo.Migrations.CreateEventQueueTables do
 
     create table(:planet_build_queue, primary_key: false) do
       add :id, :binary_id, primary_key: true
-      add :planet_id, references(:planets, type: :binary_id, on_delete: :delete_all), null: false
+      add :planet_id, references(:planets, type: :serial, on_delete: :delete_all), null: false
 
       add :building_id, references(:buildings, on_delete: :delete_all), null: false