diff --git a/lib/materia/accounts/accounts.ex b/lib/materia/accounts/accounts.ex index 22cc247..5fa30e8 100644 --- a/lib/materia/accounts/accounts.ex +++ b/lib/materia/accounts/accounts.ex @@ -73,7 +73,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "living", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -96,7 +98,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "billing", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: nil, @@ -279,7 +283,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "billing", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -302,7 +308,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "living", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: nil, @@ -491,7 +499,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "billing", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -514,7 +524,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "living", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: nil, @@ -878,7 +890,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "billing", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -901,7 +915,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "living", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: nil, @@ -1128,7 +1144,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "billing", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -1151,7 +1169,9 @@ defmodule Materia.Accounts do fax_number: "fax_number", subject: "living", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: nil, diff --git a/lib/materia/locations/address.ex b/lib/materia/locations/address.ex index 3170a16..e08e0de 100644 --- a/lib/materia/locations/address.ex +++ b/lib/materia/locations/address.ex @@ -21,6 +21,8 @@ defmodule Materia.Locations.Address do field(:zip_code, :string) field(:subject, :string) field(:lock_version, :integer, default: 0) + field(:status, :integer, default: 1) + field(:area_code, :string) belongs_to(:user, Materia.Accounts.User) belongs_to(:organization, Materia.Organizations.Organization) @@ -51,7 +53,9 @@ defmodule Materia.Locations.Address do :notation_org_name_p, :notation_name, :notation_name_p, - :fax_number + :fax_number, + :status, + :area_code ]) |> validate_required([:subject]) end @@ -79,7 +83,9 @@ defmodule Materia.Locations.Address do :notation_org_name_p, :notation_name, :notation_name_p, - :fax_number + :fax_number, + :status, + :area_code ]) |> validate_required([:lock_version]) |> optimistic_lock(:lock_version) diff --git a/lib/materia/locations/locations.ex b/lib/materia/locations/locations.ex index 2acd133..60565dc 100644 --- a/lib/materia/locations/locations.ex +++ b/lib/materia/locations/locations.ex @@ -52,7 +52,9 @@ defmodule Materia.Locations do role: "admin", status: 1 }, - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ``` @@ -110,7 +112,9 @@ defmodule Materia.Locations do role: "admin", status: 1 }, - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ``` @@ -130,7 +134,7 @@ defmodule Materia.Locations do ## Examples ``` - iex(1)> {:ok, address} = Materia.Locations.create_address(%{subject: "living"}) + iex(1)> {:ok, address} = Materia.Locations.create_address(%{subject: "living", area_code: "TEST"}) iex(2)> MateriaWeb.AddressView.render("show.json", %{address: address}) |> Map.delete(:id) %{ address1: nil, @@ -152,7 +156,9 @@ defmodule Materia.Locations do fax_number: nil, subject: "living", user: [], - zip_code: nil + zip_code: nil, + area_code: "TEST", + status: 1 } ``` @@ -212,7 +218,9 @@ defmodule Materia.Locations do role: "admin", status: 1 }, - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ``` diff --git a/lib/materia/organizations/organizations.ex b/lib/materia/organizations/organizations.ex index 8309cdd..d972b7f 100644 --- a/lib/materia/organizations/organizations.ex +++ b/lib/materia/organizations/organizations.ex @@ -46,7 +46,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "branch", user: [], - zip_code: "812-ZZZZ" + zip_code: "812-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -69,7 +71,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "registry", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: "https://hogehoge.com/ib_img.jpg", @@ -150,7 +154,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "branch", user: [], - zip_code: "812-ZZZZ" + zip_code: "812-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -173,7 +179,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "registry", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: "https://hogehoge.com/ib_img.jpg", @@ -325,7 +333,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "branch", user: [], - zip_code: "812-ZZZZ" + zip_code: "812-ZZZZ", + area_code: nil, + status: 1 }, %{ address1: "福岡市中央区", @@ -348,7 +358,9 @@ defmodule Materia.Organizations do fax_number: "fax_number", subject: "registry", user: [], - zip_code: "810-ZZZZ" + zip_code: "810-ZZZZ", + area_code: nil, + status: 1 } ], back_ground_img_url: "https://hogehoge.com/ib_img.jpg", diff --git a/lib/materia_web/views/address_view.ex b/lib/materia_web/views/address_view.ex index ebb6e9e..7a94adc 100644 --- a/lib/materia_web/views/address_view.ex +++ b/lib/materia_web/views/address_view.ex @@ -32,7 +32,9 @@ defmodule MateriaWeb.AddressView do latitude: address.latitude, longitude: address.longitude, subject: address.subject, - lock_version: address.lock_version + lock_version: address.lock_version, + area_code: address.area_code, + status: address.status } result_map = diff --git a/lib/mix/templates/017_add_column_address..exs b/lib/mix/templates/017_add_column_address..exs new file mode 100644 index 0000000..a6ade7f --- /dev/null +++ b/lib/mix/templates/017_add_column_address..exs @@ -0,0 +1,10 @@ +defmodule Materia.Repo.Migrations.AddColumnAddresses do + use Ecto.Migration + + def change do + alter table(:addresses) do + add(:status, :integer) + add(:area_code, :string) + end + end +end diff --git a/priv/repo/migrations/201912130000003_materia_003_add_column_address..exs b/priv/repo/migrations/201912130000003_materia_003_add_column_address..exs new file mode 100644 index 0000000..a6ade7f --- /dev/null +++ b/priv/repo/migrations/201912130000003_materia_003_add_column_address..exs @@ -0,0 +1,10 @@ +defmodule Materia.Repo.Migrations.AddColumnAddresses do + use Ecto.Migration + + def change do + alter table(:addresses) do + add(:status, :integer) + add(:area_code, :string) + end + end +end diff --git a/test/materia_web/controllers/authenticator_conrtoller_test.exs b/test/materia_web/controllers/authenticator_conrtoller_test.exs index 8a313a1..7e73ae5 100644 --- a/test/materia_web/controllers/authenticator_conrtoller_test.exs +++ b/test/materia_web/controllers/authenticator_conrtoller_test.exs @@ -123,7 +123,9 @@ defmodule MateriaWeb.AuthenticatorControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 }, %{ "address1" => "福岡市中央区", @@ -146,7 +148,9 @@ defmodule MateriaWeb.AuthenticatorControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 } ], "back_ground_img_url" => nil, diff --git a/test/materia_web/controllers/user_controller_test.exs b/test/materia_web/controllers/user_controller_test.exs index 2d88d00..d7952c7 100644 --- a/test/materia_web/controllers/user_controller_test.exs +++ b/test/materia_web/controllers/user_controller_test.exs @@ -61,7 +61,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 }, %{ "address1" => "福岡市中央区", @@ -84,7 +86,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 } ], "back_ground_img_url" => nil, @@ -163,7 +167,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 }, %{ "address1" => "福岡市中央区", @@ -186,7 +192,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 } ], "back_ground_img_url" => nil, @@ -369,7 +377,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 }, %{ "address1" => "福岡市中央区", @@ -392,7 +402,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 } ], "back_ground_img_url" => nil, @@ -454,7 +466,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 }, %{ "address1" => "福岡市中央区", @@ -477,7 +491,9 @@ defmodule MateriaWeb.UserControllerTest do "notation_org_name_p" => "notation_org_name_p", "notation_name_p" => "notation_name_p", "phone_number" => "phone_number", - "fax_number" => "fax_number" + "fax_number" => "fax_number", + "area_code" => nil, + "status" => 1 } ], "back_ground_img_url" => nil,