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

feat: Add email to access request response #228

Merged
merged 2 commits into from
May 9, 2022
Merged

feat: Add email to access request response #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bba093d
feat: Add email to access request response
jonas-martinez May 9, 2022
637871f
fix
jonas-martinez May 9, 2022
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
18 changes: 14 additions & 4 deletions apps/lenra/lib/lenra/services/user_environment_access_services.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ defmodule Lenra.UserEnvironmentAccessServices do
The service that manages the different possible actions on an environment's user accesses.
"""
import Ecto.Query
alias Lenra.{EmailWorker, EnvironmentServices, Repo, UserEnvironmentAccess, UserServices}
alias Lenra.{EmailWorker, EnvironmentServices, Repo, User, UserEnvironmentAccess, UserServices}
require Logger

@app_url_prefix Application.compile_env!(:lenra_web, :app_url_prefix)

def all(env_id) do
Repo.all(from(e in UserEnvironmentAccess, where: e.environment_id == ^env_id))
Repo.all(
from(e in UserEnvironmentAccess,
join: u in User,
on: u.id == e.user_id,
where: e.environment_id == ^env_id,
select: %{user_id: e.user_id, environment_id: e.environment_id, email: u.email}
)
)
end

def fetch_by(clauses, error \\ {:error, :error_404}) do
Expand Down Expand Up @@ -54,8 +61,11 @@ defmodule Lenra.UserEnvironmentAccessServices do
EmailWorker.add_email_invitation_event(user, application_name, app_link)
end

def delete(user_access) do
def delete(%{environment_id: env_id, user_id: user_id} = _params) do
Ecto.Multi.new()
|> Ecto.Multi.delete(:deleted_user_access, user_access)
|> Ecto.Multi.run(:user_access, fn _repo, _changes ->
Lenra.UserEnvironmentAccessServices.fetch_by(environment_id: env_id, user_id: user_id)
end)
|> Ecto.Multi.delete(:deleted_user_access, fn %{user_access: user_access} -> user_access end)
end
end
4 changes: 2 additions & 2 deletions apps/lenra_web/test/controllers/user_environment_access_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ defmodule LenraWeb.UserEnvironmentAccessControllerTest do

assert %{
"data" => %{
"environment_user_accesses" => [%{"environment_id" => _, "user_id" => _}]
"environment_user_accesses" => [%{"environment_id" => _, "user_id" => _, "email" => _}]
},
"success" => true
} = json_response(creator!, 200)

assert %{
"data" => %{
"environment_user_accesses" => [%{"environment_id" => _, "user_id" => _}]
"environment_user_accesses" => [%{"environment_id" => _, "user_id" => _, "email" => _}]
},
"success" => true
} = json_response(admin, 200)
Expand Down