diff --git a/lib/cannery/ammo/ammo_group.ex b/lib/cannery/ammo/ammo_group.ex index 6432069..3a48d33 100644 --- a/lib/cannery/ammo/ammo_group.ex +++ b/lib/cannery/ammo/ammo_group.ex @@ -9,7 +9,7 @@ defmodule Cannery.Ammo.AmmoGroup do use Ecto.Schema import Ecto.Changeset alias Cannery.Ammo.{AmmoGroup, AmmoType} - alias Cannery.{Accounts.User, Containers.Container, Tags.Tag} + alias Cannery.{Accounts.User, Containers.Container} alias Ecto.{Changeset, UUID} @primary_key {:id, :binary_id, autogenerate: true} @@ -19,7 +19,6 @@ defmodule Cannery.Ammo.AmmoGroup do field :notes, :string field :price_paid, :float - belongs_to :tag, Tag belongs_to :ammo_type, AmmoType belongs_to :container, Container belongs_to :user, User @@ -30,15 +29,13 @@ defmodule Cannery.Ammo.AmmoGroup do @type t :: %AmmoGroup{ id: id(), count: integer, - notes: String.t(), - price_paid: float(), - tag: Tag.t(), - tag_id: Tag.id(), - ammo_type: AmmoType.t(), + notes: String.t() | nil, + price_paid: float() | nil, + ammo_type: AmmoType.t() | nil, ammo_type_id: AmmoType.id(), - container: Container.t(), + container: Container.t() | nil, container_id: Container.id(), - user: User.t(), + user: User.t() | nil, user_id: User.id(), inserted_at: NaiveDateTime.t(), updated_at: NaiveDateTime.t() diff --git a/priv/repo/migrations/20210903015611_create_ammo_groups.exs b/priv/repo/migrations/20210903015611_create_ammo_groups.exs index 0dd0ae9..547c94b 100644 --- a/priv/repo/migrations/20210903015611_create_ammo_groups.exs +++ b/priv/repo/migrations/20210903015611_create_ammo_groups.exs @@ -8,7 +8,6 @@ defmodule Cannery.Repo.Migrations.CreateAmmoGroups do add :price_paid, :float add :notes, :text - add :tag_id, references(:tags, on_delete: :nothing, type: :binary_id) add :ammo_type_id, references(:ammo_types, on_delete: :delete_all, type: :binary_id) add :container_id, references(:containers, on_delete: :nothing, type: :binary_id) add :user_id, references(:users, on_delete: :delete_all, type: :binary_id) @@ -16,7 +15,6 @@ defmodule Cannery.Repo.Migrations.CreateAmmoGroups do timestamps() end - create index(:ammo_groups, [:tag_id]) create index(:ammo_groups, [:ammo_type_id]) create index(:ammo_groups, [:container_id]) create index(:ammo_groups, [:user_id])