From 7015ec59976a63aabe46f04a9594e5a86a2dca9e Mon Sep 17 00:00:00 2001 From: shibao Date: Mon, 31 Jan 2022 22:29:09 -0500 Subject: [PATCH] - store ammo type grain as integer - make ammo type desc as text --- lib/cannery/ammo/ammo_type.ex | 8 ++++---- priv/repo/migrations/20210903015537_create_ammo_types.exs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cannery/ammo/ammo_type.ex b/lib/cannery/ammo/ammo_type.ex index d6ec8ef..e29d21f 100644 --- a/lib/cannery/ammo/ammo_type.ex +++ b/lib/cannery/ammo/ammo_type.ex @@ -18,7 +18,7 @@ defmodule Cannery.Ammo.AmmoType do field :desc, :string field :manufacturer, :string field :name, :string - field :weight, :float + field :grain, :integer timestamps() end @@ -30,7 +30,7 @@ defmodule Cannery.Ammo.AmmoType do desc: String.t(), manufacturer: String.t(), name: String.t(), - weight: float(), + grain: integer(), inserted_at: NaiveDateTime.t(), updated_at: NaiveDateTime.t() } @@ -41,7 +41,7 @@ defmodule Cannery.Ammo.AmmoType do @spec changeset(t() | new_ammo_type(), attrs :: map()) :: Changeset.t() def changeset(ammo_type, attrs) do ammo_type - |> cast(attrs, [:name, :desc, :case_material, :bullet_type, :weight, :manufacturer]) - |> validate_required([:name, :desc, :case_material, :bullet_type, :weight, :manufacturer]) + |> cast(attrs, [:name, :desc, :case_material, :bullet_type, :grain, :manufacturer]) + |> validate_required([:name]) end end diff --git a/priv/repo/migrations/20210903015537_create_ammo_types.exs b/priv/repo/migrations/20210903015537_create_ammo_types.exs index aa9d606..895d3c3 100644 --- a/priv/repo/migrations/20210903015537_create_ammo_types.exs +++ b/priv/repo/migrations/20210903015537_create_ammo_types.exs @@ -5,10 +5,10 @@ defmodule Cannery.Repo.Migrations.CreateAmmoTypes do create table(:ammo_types, primary_key: false) do add :id, :binary_id, primary_key: true add :name, :string - add :desc, :string + add :desc, :text add :case_material, :string add :bullet_type, :string - add :weight, :float + add :grain, :integer add :manufacturer, :string timestamps()