diff --git a/lib/safira_web/templates/layout/torch.html.eex b/lib/safira_web/templates/layout/torch.html.eex
index bbc990cb..1edc75d2 100644
--- a/lib/safira_web/templates/layout/torch.html.eex
+++ b/lib/safira_web/templates/layout/torch.html.eex
@@ -26,7 +26,7 @@
Badges
Attendees
-
Managers
+
Staffs
Companies
Redeems
Referrals
diff --git a/lib/safira_web/views/admin/manager_view.ex b/lib/safira_web/views/admin/staff_view.ex
similarity index 65%
rename from lib/safira_web/views/admin/manager_view.ex
rename to lib/safira_web/views/admin/staff_view.ex
index 4ccce264..da0ab0b4 100644
--- a/lib/safira_web/views/admin/manager_view.ex
+++ b/lib/safira_web/views/admin/staff_view.ex
@@ -1,4 +1,4 @@
-defmodule SafiraWeb.Admin.ManagerView do
+defmodule SafiraWeb.Admin.StaffView do
use SafiraWeb, :view
import Torch.TableView
diff --git a/lib/safira_web/views/attendee_view.ex b/lib/safira_web/views/attendee_view.ex
index a013a60e..973ee342 100644
--- a/lib/safira_web/views/attendee_view.ex
+++ b/lib/safira_web/views/attendee_view.ex
@@ -17,8 +17,8 @@ defmodule SafiraWeb.AttendeeView do
%{data: render_one(attendee, AttendeeView, "attendee_simple.json")}
end
- def render("manager_show.json", %{attendee: attendee}) do
- %{data: render_one(attendee, AttendeeView, "manager_attendee.json")}
+ def render("staff_show.json", %{attendee: attendee}) do
+ %{data: render_one(attendee, AttendeeView, "staff_attendee.json")}
end
def render("attendee.json", %{attendee: attendee}) do
@@ -54,7 +54,7 @@ defmodule SafiraWeb.AttendeeView do
}
end
- def render("manager_attendee.json", %{attendee: attendee}) do
+ def render("staff_attendee.json", %{attendee: attendee}) do
%{
id: attendee.id,
nickname: attendee.nickname,
diff --git a/priv/repo/migrations/20180724140327_create_staff.exs b/priv/repo/migrations/20180724140327_create_staff.exs
index c95b8c63..4d646eaa 100644
--- a/priv/repo/migrations/20180724140327_create_staff.exs
+++ b/priv/repo/migrations/20180724140327_create_staff.exs
@@ -2,7 +2,7 @@ defmodule Safira.Repo.Migrations.CreateStaff do
use Ecto.Migration
def change do
- create table(:managers) do
+ create table(:staffs) do
add :active, :boolean, default: true
add :user_id, references(:users, on_delete: :delete_all)
diff --git a/priv/repo/migrations/20180726215104_create_redeems.exs b/priv/repo/migrations/20180726215104_create_redeems.exs
index 18cfdb8a..b0c1cc50 100644
--- a/priv/repo/migrations/20180726215104_create_redeems.exs
+++ b/priv/repo/migrations/20180726215104_create_redeems.exs
@@ -5,7 +5,7 @@ defmodule Safira.Repo.Migrations.CreateRedeems do
create table(:redeems) do
add :badge_id, references(:badges, on_delete: :delete_all)
add :attendee_id, references(:attendees, on_delete: :delete_all, type: :uuid)
- add :manager_id, references(:managers, on_delete: :nothing)
+ add :staff_id, references(:staffs, on_delete: :nothing)
timestamps()
end
diff --git a/priv/repo/migrations/20220121123022_add_admin_to_manager.exs b/priv/repo/migrations/20220121123022_add_admin_to_manager.exs
index 288711fd..90d45d98 100644
--- a/priv/repo/migrations/20220121123022_add_admin_to_manager.exs
+++ b/priv/repo/migrations/20220121123022_add_admin_to_manager.exs
@@ -1,8 +1,8 @@
-defmodule Safira.Repo.Migrations.AddAdminToManager do
+defmodule Safira.Repo.Migrations.AddAdminToStaff do
use Ecto.Migration
def change do
- alter table(:managers) do
+ alter table(:staffs) do
add :is_admin, :boolean, default: false, null: false
end
end
diff --git a/priv/repo/seeds/accounts.exs b/priv/repo/seeds/accounts.exs
index e1b40922..bf098d71 100644
--- a/priv/repo/seeds/accounts.exs
+++ b/priv/repo/seeds/accounts.exs
@@ -6,7 +6,7 @@ defmodule Safira.Repo.Seeds.Accounts do
alias Safira.Repo
def run do
- seed_managers()
+ seed_staffs()
seed_companies()
seed_attendees()
reset_passwords()
@@ -16,8 +16,8 @@ defmodule Safira.Repo.Seeds.Accounts do
Mix.Tasks.Gen.Companies.run(["data/sponsors.csv"])
end
- defp seed_managers do
- Mix.Tasks.Gen.Managers.run(["10"])
+ defp seed_staffs do
+ Mix.Tasks.Gen.Staffs.run(["10"])
end
defp seed_attendees do
diff --git a/test/factories/accounts_factory.ex b/test/factories/accounts_factory.ex
index 63313cc3..a6bf1a21 100644
--- a/test/factories/accounts_factory.ex
+++ b/test/factories/accounts_factory.ex
@@ -31,8 +31,8 @@ defmodule Safira.AccountsFactory do
}
end
- def manager_factory do
- %Safira.Accounts.Manager{
+ def staff_factory do
+ %Safira.Accounts.Staff{
active: Enum.random([true, false]),
is_admin: Enum.random([true, false]),
user: build(:user)
diff --git a/test/factories/contest_factory.ex b/test/factories/contest_factory.ex
index 5cad286a..e8c4843a 100644
--- a/test/factories/contest_factory.ex
+++ b/test/factories/contest_factory.ex
@@ -25,7 +25,7 @@ defmodule Safira.ContestFactory do
%Safira.Contest.Redeem{
attendee: build(:attendee),
badge: build(:badge),
- manager: build(:manager)
+ staff: build(:staff)
}
end
diff --git a/test/safira/accounts_test.exs b/test/safira/accounts_test.exs
index f2104334..541fd8f6 100644
--- a/test/safira/accounts_test.exs
+++ b/test/safira/accounts_test.exs
@@ -50,7 +50,7 @@ defmodule Safira.AccountsTest do
user =
user
|> set_password_as_nil()
- |> Repo.preload([:attendee, :company, :manager])
+ |> Repo.preload([:attendee, :company, :staff])
assert Accounts.get_user_preload!(user.id) == user
end
@@ -86,7 +86,7 @@ defmodule Safira.AccountsTest do
user =
user
|> set_password_as_nil()
- |> Repo.preload([:attendee, :company, :manager])
+ |> Repo.preload([:attendee, :company, :staff])
assert Accounts.get_user_preload_email!(user.email) == user
end
@@ -106,7 +106,7 @@ defmodule Safira.AccountsTest do
user =
user
|> set_password_as_nil()
- |> Repo.preload([:attendee, :company, :manager])
+ |> Repo.preload([:attendee, :company, :staff])
assert Accounts.get_user_preload_email(user.email) == user
end
@@ -322,93 +322,93 @@ defmodule Safira.AccountsTest do
end
end
- describe "list_managers/0" do
- test "no managers" do
- assert Accounts.list_managers() == []
+ describe "list_staffs/0" do
+ test "no staffs" do
+ assert Accounts.list_staffs() == []
end
- test "multiple managers" do
- [manager1, manager2] = insert_pair(:manager)
+ test "multiple staffs" do
+ [staff1, staff2] = insert_pair(:staff)
- manager1 =
- manager1
+ staff1 =
+ staff1
|> forget(:user)
- manager2 =
- manager2
+ staff2 =
+ staff2
|> forget(:user)
- assert Accounts.list_managers() == [manager1, manager2]
+ assert Accounts.list_staffs() == [staff1, staff2]
end
end
- describe "get_manager!/1" do
- test "manager exists" do
- manager = insert(:manager)
+ describe "get_staff!/1" do
+ test "staff exists" do
+ staff = insert(:staff)
- manager =
- manager
+ staff =
+ staff
|> forget(:user)
- assert Accounts.get_manager!(manager.id) == manager
+ assert Accounts.get_staff!(staff.id) == staff
end
test "user does not exist" do
- manager = insert(:manager)
+ staff = insert(:staff)
- manager =
- manager
+ staff =
+ staff
|> forget(:user)
- assert_raise Ecto.NoResultsError, fn -> Accounts.get_manager!(manager.id + 1) end
+ assert_raise Ecto.NoResultsError, fn -> Accounts.get_staff!(staff.id + 1) end
end
end
- describe "get_manager_by_email/1" do
+ describe "get_staff_by_email/1" do
test "user with that email exists" do
- manager = insert(:manager)
+ staff = insert(:staff)
- assert Enum.at(Accounts.get_manager_by_email(manager.user.email), 0).id == manager.id
+ assert Enum.at(Accounts.get_staff_by_email(staff.user.email), 0).id == staff.id
end
test "user with that email does not exist" do
- assert Accounts.get_manager_by_email("wrong_email@mail.com") == []
+ assert Accounts.get_staff_by_email("wrong_email@mail.com") == []
end
end
- describe "create_manager/1" do
+ describe "create_staff/1" do
test "with valid data" do
- {:ok, manager} =
- params_for(:manager)
- |> Accounts.create_manager()
+ {:ok, staff} =
+ params_for(:staff)
+ |> Accounts.create_staff()
- assert Accounts.list_managers() == [manager]
+ assert Accounts.list_staffs() == [staff]
end
end
- describe "update_manager/1" do
+ describe "update_staff/1" do
test "with valid data" do
- manager1 = insert(:manager)
+ staff1 = insert(:staff)
- {:ok, manager2} =
- manager1
- |> Accounts.update_manager(params_for(:manager))
+ {:ok, staff2} =
+ staff1
+ |> Accounts.update_staff(params_for(:staff))
- manager2 =
- manager2
+ staff2 =
+ staff2
|> forget(:user)
- assert Accounts.list_managers() == [manager2]
+ assert Accounts.list_staffs() == [staff2]
end
end
- describe "delete_manager/1" do
+ describe "delete_staff/1" do
test "user exists" do
- manager = insert(:manager)
+ staff = insert(:staff)
- {:ok, _manager} = Accounts.delete_manager(manager)
+ {:ok, _staff} = Accounts.delete_staff(staff)
- assert Accounts.list_managers() == []
+ assert Accounts.list_staffs() == []
end
end
diff --git a/test/safira_web/controllers/cv_controller_test.exs b/test/safira_web/controllers/cv_controller_test.exs
index 0defbb06..17f6b228 100644
--- a/test/safira_web/controllers/cv_controller_test.exs
+++ b/test/safira_web/controllers/cv_controller_test.exs
@@ -88,7 +88,7 @@ defmodule SafiraWeb.CVControllerTest do
attendee_with_badge: attendee
} do
user = create_user_strategy(:user)
- insert(:manager, user: user, is_admin: true)
+ insert(:staff, user: user, is_admin: true)
%{conn: conn, user: _user} = api_authenticate(user)
diff --git a/test/safira_web/controllers/deliver_prize_controller_test.exs b/test/safira_web/controllers/deliver_prize_controller_test.exs
index ee3e0c65..454e67b6 100644
--- a/test/safira_web/controllers/deliver_prize_controller_test.exs
+++ b/test/safira_web/controllers/deliver_prize_controller_test.exs
@@ -6,10 +6,10 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
end
describe "create" do
- test "with valid token (manager)" do
+ test "with valid token (staff)" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize = insert(:attendee_prize, attendee: attendee, prize: prize, redeemed: 0)
%{conn: conn, user: _} = api_authenticate(user)
@@ -31,7 +31,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
}
end
- test "with valid token (not a manager)" do
+ test "with valid token (not a staff)" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
_attendee1 = insert(:attendee, user: user)
@@ -51,13 +51,13 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
conn
|> post(Routes.deliver_prize_path(conn, :create), params)
- assert json_response(conn, 401) == %{"error" => "Only managers can give prizes"}
+ assert json_response(conn, 401) == %{"error" => "Only staffs can give prizes"}
end
test "with invalid token", %{conn: conn} do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize = insert(:attendee_prize, attendee: attendee, prize: prize, redeemed: 0)
@@ -80,7 +80,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "with no token", %{conn: conn} do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize = insert(:attendee_prize, attendee: attendee, prize: prize, redeemed: 0)
@@ -102,7 +102,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "did not win the prize" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
%{conn: conn, user: _} = api_authenticate(user)
@@ -124,7 +124,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "already redeemed the prize" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
insert(:attendee_prize, attendee: attendee, prize: prize, quantity: 1, redeemed: 1)
@@ -148,7 +148,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "prize does not exist" do
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
%{conn: conn, user: _} = api_authenticate(user)
@@ -170,7 +170,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "attendee does not exist" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
%{conn: conn, user: _} = api_authenticate(user)
params = %{
@@ -193,7 +193,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "with valid token" do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize =
@@ -218,7 +218,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "with invalid token", %{conn: conn} do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize =
@@ -235,7 +235,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "with no token", %{conn: conn} do
prize = insert(:prize, is_redeemable: true)
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user)
+ _staff = insert(:staff, user: user)
attendee = insert(:attendee)
_attendee_prize =
@@ -252,7 +252,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
describe "delete" do
test "not a admin" do
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user, is_admin: false)
+ _staff = insert(:staff, user: user, is_admin: false)
%{conn: conn, user: _} = api_authenticate(user)
conn =
@@ -264,7 +264,7 @@ defmodule SafiraWeb.DeliverPrizeControllerTest do
test "valid badge and attendee" do
user = create_user_strategy(:user)
- _manager = insert(:manager, user: user, is_admin: true)
+ _staff = insert(:staff, user: user, is_admin: true)
badge = insert(:badge)
attendee = insert(:attendee)
diff --git a/test/safira_web/controllers/deliver_redeemable_controller_test.exs b/test/safira_web/controllers/deliver_redeemable_controller_test.exs
index 06b03939..63feaa80 100644
--- a/test/safira_web/controllers/deliver_redeemable_controller_test.exs
+++ b/test/safira_web/controllers/deliver_redeemable_controller_test.exs
@@ -6,9 +6,9 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
end
describe "create" do
- test "with valid token (manager)" do
+ test "with valid token (staff)" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -32,7 +32,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
}
end
- test "with valid token (not a manager)" do
+ test "with valid token (not a staff)" do
user = create_user_strategy(:user)
insert(:attendee, user: user)
attendee = insert(:attendee)
@@ -53,12 +53,12 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
conn
|> post(Routes.deliver_redeemable_path(conn, :create), params)
- assert json_response(conn, 401) == %{"error" => "Only managers can deliver redeemables"}
+ assert json_response(conn, 401) == %{"error" => "Only staffs can deliver redeemables"}
end
test "attendee does not exist" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
redeemable = insert(:redeemable)
insert(:buy, redeemable: redeemable)
@@ -81,7 +81,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "redeemable does not exist" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
insert(:buy, attendee: attendee)
@@ -104,7 +104,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "without quantity param" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -127,7 +127,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "with invalid token", %{conn: conn} do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -150,7 +150,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "with no token", %{conn: conn} do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -174,7 +174,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
describe "show" do
test "with valid token" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -199,7 +199,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "show after redeem" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
redeemable = insert(:redeemable)
insert(:buy, attendee: attendee, redeemable: redeemable)
@@ -224,7 +224,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "with invalid token", %{conn: conn} do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
conn =
@@ -237,7 +237,7 @@ defmodule SafiraWeb.DeliverRedeemableControllerTest do
test "with no token", %{conn: conn} do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
conn =
diff --git a/test/safira_web/controllers/redeem_controller_test.exs b/test/safira_web/controllers/redeem_controller_test.exs
index 4e627b6c..7a33ea6a 100644
--- a/test/safira_web/controllers/redeem_controller_test.exs
+++ b/test/safira_web/controllers/redeem_controller_test.exs
@@ -24,10 +24,10 @@ defmodule SafiraWeb.RedeemControllerTest do
"Badge redeemed successfully. Tokens added to your balance"
end
- test "with valid token (manager)" do
+ test "with valid token (staff)" do
user = create_user_strategy(:user)
badge = insert(:badge)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
%{conn: conn, user: _user} = api_authenticate(user)
@@ -71,7 +71,7 @@ defmodule SafiraWeb.RedeemControllerTest do
test "with valid token (badge does not exist)" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
%{conn: conn, user: _user} = api_authenticate(user)
@@ -92,7 +92,7 @@ defmodule SafiraWeb.RedeemControllerTest do
test "with invalid token" do
user = create_user_strategy(:user)
badge = insert(:badge)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
%{conn: conn, user: _user} = api_authenticate(user)
@@ -115,7 +115,7 @@ defmodule SafiraWeb.RedeemControllerTest do
test "with no token", %{conn: conn} do
user = create_user_strategy(:user)
badge = insert(:badge)
- insert(:manager, user: user)
+ insert(:staff, user: user)
attendee = insert(:attendee)
params = %{
@@ -134,7 +134,7 @@ defmodule SafiraWeb.RedeemControllerTest do
test "when user is not an attendee" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
create_prize_strategy(:prize, probability: 1.0)
%{conn: conn, user: _user} = api_authenticate(user)
diff --git a/test/safira_web/controllers/redeemable_controller_test.exs b/test/safira_web/controllers/redeemable_controller_test.exs
index 7d0e3e72..f3b8d810 100644
--- a/test/safira_web/controllers/redeemable_controller_test.exs
+++ b/test/safira_web/controllers/redeemable_controller_test.exs
@@ -30,7 +30,7 @@ defmodule SafiraWeb.RedeemableControllerTest do
test "with valid token (not attendee)" do
user = create_user_strategy(:user)
redeemable = insert(:redeemable)
- insert(:manager, user: user)
+ insert(:staff, user: user)
%{conn: conn, user: _user} = api_authenticate(user)
@@ -107,7 +107,7 @@ defmodule SafiraWeb.RedeemableControllerTest do
test "with valid token (not attendee)" do
user = create_user_strategy(:user)
redeemable = insert(:redeemable)
- insert(:manager, user: user)
+ insert(:staff, user: user)
%{conn: conn, user: _user} = api_authenticate(user)
diff --git a/test/safira_web/controllers/roulette_controller_test.exs b/test/safira_web/controllers/roulette_controller_test.exs
index ecf495a4..9c140528 100644
--- a/test/safira_web/controllers/roulette_controller_test.exs
+++ b/test/safira_web/controllers/roulette_controller_test.exs
@@ -63,7 +63,7 @@ defmodule SafiraWeb.RouletteControllerTest do
test "when user is not an attendee" do
user = create_user_strategy(:user)
- insert(:manager, user: user)
+ insert(:staff, user: user)
create_prize_strategy(:prize, probability: 1.0)
%{conn: conn, user: _user} = api_authenticate(user)