Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add username to users, update register form #321

Merged
merged 3 commits into from
Jan 22, 2024
Merged

Add username to users, update register form #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
276fcb4
Add username to users, update register form
skanderm Jan 22, 2024
1db5fdc
Update tests with username
skanderm Jan 22, 2024
42820c6
Add username field to admin index, add constraint for non_empty
skanderm Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ npm-debug.log

config/*.secret.exs

.elixir_ls
.elixir_ls
erl_crash.dump
20 changes: 18 additions & 2 deletions server/lib/orcasite/accounts/user.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ defmodule Orcasite.Accounts.User do

identities do
identity :unique_email, [:email]
identity :unique_username, [:username]
end

attributes do
Expand All @@ -22,6 +23,11 @@ defmodule Orcasite.Accounts.User do
attribute :admin, :boolean, default: false, allow_nil?: false
attribute :moderator, :boolean, default: false, allow_nil?: false

attribute :username, :string do
allow_nil? false
constraints allow_empty?: false
end

create_timestamp :inserted_at
update_timestamp :updated_at
end
Expand All @@ -34,7 +40,7 @@ defmodule Orcasite.Accounts.User do
identity_field :email
sign_in_tokens_enabled? true

register_action_accept [:first_name, :last_name]
register_action_accept [:first_name, :last_name, :username]

resettable do
sender fn user, token, opts ->
Expand Down Expand Up @@ -110,7 +116,17 @@ defmodule Orcasite.Accounts.User do
end

admin do
table_columns [:id, :email, :first_name, :last_name, :admin, :moderator, :inserted_at]
table_columns [
:id,
:username,
:email,
:first_name,
:last_name,
:admin,
:moderator,
:inserted_at
]

actor? true
read_actions [:read, :current_user]
end
Expand Down
25 changes: 25 additions & 0 deletions server/priv/repo/migrations/20240122203808_add_username_to_users.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
defmodule Orcasite.Repo.Migrations.AddUsernameToUsers do
@moduledoc """
Updates resources based on their most recent snapshots.

This file was autogenerated with `mix ash_postgres.generate_migrations`
"""

use Ecto.Migration

def up do
alter table(:users) do
add :username, :text
end

create unique_index(:users, [:username], name: "users_unique_username_index")
end

def down do
drop_if_exists unique_index(:users, [:username], name: "users_unique_username_index")

alter table(:users) do
remove :username
end
end
end
11 changes: 11 additions & 0 deletions server/priv/repo/migrations/20240122203900_populate_username.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
defmodule Orcasite.Repo.Migrations.PopulateUsername do
use Ecto.Migration

def up do
execute("UPDATE users SET username = split_part(email, '@', 1) where username is null;")
flush()
end

def down do
end
end
21 changes: 21 additions & 0 deletions server/priv/repo/migrations/20240122204313_make_username_non_null.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
defmodule Orcasite.Repo.Migrations.MakeUsernameNonNull do
@moduledoc """
Updates resources based on their most recent snapshots.

This file was autogenerated with `mix ash_postgres.generate_migrations`
"""

use Ecto.Migration

def up do
alter table(:users) do
modify :username, :text, null: false
end
end

def down do
alter table(:users) do
modify :username, :text, null: true
end
end
end
136 changes: 136 additions & 0 deletions server/priv/resource_snapshots/repo/users/20240122203808.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"attributes": [
{
"default": "nil",
"size": null,
"type": "uuid",
"source": "id",
"references": null,
"allow_nil?": false,
"primary_key?": true,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "citext",
"source": "email",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "hashed_password",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "first_name",
"references": null,
"allow_nil?": true,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "last_name",
"references": null,
"allow_nil?": true,
"primary_key?": false,
"generated?": false
},
{
"default": "false",
"size": null,
"type": "boolean",
"source": "admin",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "false",
"size": null,
"type": "boolean",
"source": "moderator",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "username",
"references": null,
"allow_nil?": true,
"primary_key?": false,
"generated?": false
},
{
"default": "fragment(\"now()\")",
"size": null,
"type": "utc_datetime_usec",
"source": "inserted_at",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "fragment(\"now()\")",
"size": null,
"type": "utc_datetime_usec",
"source": "updated_at",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
}
],
"table": "users",
"hash": "36FFCF828BF6089D8E988E8B6ECBF0B538DEC0F23E0A20F4B75D234086FD8E30",
"repo": "Elixir.Orcasite.Repo",
"identities": [
{
"name": "unique_email",
"keys": [
"email"
],
"base_filter": null,
"index_name": "users_unique_email_index"
},
{
"name": "unique_username",
"keys": [
"username"
],
"base_filter": null,
"index_name": "users_unique_username_index"
}
],
"schema": null,
"check_constraints": [],
"custom_indexes": [],
"multitenancy": {
"global": null,
"attribute": null,
"strategy": null
},
"base_filter": null,
"custom_statements": [],
"has_create_action": true
}
136 changes: 136 additions & 0 deletions server/priv/resource_snapshots/repo/users/20240122204313.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"attributes": [
{
"default": "nil",
"size": null,
"type": "uuid",
"source": "id",
"references": null,
"allow_nil?": false,
"primary_key?": true,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "citext",
"source": "email",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "hashed_password",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "first_name",
"references": null,
"allow_nil?": true,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "last_name",
"references": null,
"allow_nil?": true,
"primary_key?": false,
"generated?": false
},
{
"default": "false",
"size": null,
"type": "boolean",
"source": "admin",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "false",
"size": null,
"type": "boolean",
"source": "moderator",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "nil",
"size": null,
"type": "text",
"source": "username",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "fragment(\"now()\")",
"size": null,
"type": "utc_datetime_usec",
"source": "inserted_at",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
},
{
"default": "fragment(\"now()\")",
"size": null,
"type": "utc_datetime_usec",
"source": "updated_at",
"references": null,
"allow_nil?": false,
"primary_key?": false,
"generated?": false
}
],
"table": "users",
"hash": "8E5FFA76E9AE3846E854025C36F1C8D6B5BA774D32BFB12876822C1AD1F26D72",
"repo": "Elixir.Orcasite.Repo",
"identities": [
{
"name": "unique_email",
"keys": [
"email"
],
"base_filter": null,
"index_name": "users_unique_email_index"
},
{
"name": "unique_username",
"keys": [
"username"
],
"base_filter": null,
"index_name": "users_unique_username_index"
}
],
"schema": null,
"check_constraints": [],
"custom_indexes": [],
"multitenancy": {
"global": null,
"strategy": null,
"attribute": null
},
"base_filter": null,
"custom_statements": [],
"has_create_action": true
}
Loading
Loading