end

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/eventos/accounts/account.ex

@@ -4,21 +4,20 @@ defmodule Eventos.Accounts.Account do
   alias Eventos.Accounts.{Account, GroupAccount, GroupRequest, Group, User}
   alias Eventos.Events.Event
 
-
   schema "accounts" do
+    field :username, :string
     field :description, :string
     field :display_name, :string
-    field :domain, :string
+    field :domain, :string, default: nil
     field :private_key, :string
     field :public_key, :string
     field :suspended, :boolean, default: false
     field :uri, :string
     field :url, :string
-    field :username, :string
     has_many :organized_events, Event
     many_to_many :groups, Group, join_through: GroupAccount
     has_many :group_request, GroupRequest
-    has_one :user_id, User
+    has_one :user, User
 
     timestamps()
   end
@@ -27,6 +26,7 @@ defmodule Eventos.Accounts.Account do
   def changeset(%Account{} = account, attrs) do
     account
     |> cast(attrs, [:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url])
-    |> validate_required([:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url])
+    |> validate_required([:username, :display_name, :description, :private_key, :public_key, :suspended])
+    |> unique_constraint(:username, name: :accounts_username_domain_index)
   end
 end

lib/eventos/accounts/user.ex

@@ -1,16 +1,17 @@
 defmodule Eventos.Accounts.User do
   use Ecto.Schema
   import Ecto.Changeset
-  alias Eventos.Accounts.{User}
+  alias Eventos.Accounts.{Account, User}
+  alias Eventos.Repo
 
+  import Logger
 
   schema "users" do
     field :email, :string
     field :role, :integer, default: 0
     field :password, :string, virtual: true
     field :password_hash, :string
-    field :account_id, :integer
-
+    belongs_to :account, Account
     timestamps()
   end
 
@@ -18,7 +19,7 @@ defmodule Eventos.Accounts.User do
   @doc false
   def changeset(%User{} = user, attrs) do
     user
-    |> cast(attrs, [:email, :password_hash, :role])
+    |> cast(attrs, [:email, :password_hash])
     |> validate_required([:email])
     |> unique_constraint(:email)
     |> validate_format(:email, ~r/@/)