Fix Credo Readability (strict)
- Max line length, implicit try, alias order, zero-arity defs - String sigils, long comments split; redundant blank lines fixed
This commit is contained in:
parent
f0a8dfcc21
commit
81ce204502
48 changed files with 131 additions and 144 deletions
|
|
@ -164,7 +164,7 @@ defmodule Mv.Accounts.User.Validations.OidcEmailCollision do
|
|||
end
|
||||
|
||||
@impl true
|
||||
def atomic?(), do: false
|
||||
def atomic?, do: false
|
||||
|
||||
@impl true
|
||||
def describe(_opts) do
|
||||
|
|
|
|||
|
|
@ -519,11 +519,9 @@ defmodule Mv.Membership.MemberExport.Build do
|
|||
defp key_to_atom(k) when is_atom(k), do: k
|
||||
|
||||
defp key_to_atom(k) when is_binary(k) do
|
||||
try do
|
||||
String.to_existing_atom(k)
|
||||
rescue
|
||||
ArgumentError -> k
|
||||
end
|
||||
String.to_existing_atom(k)
|
||||
rescue
|
||||
ArgumentError -> k
|
||||
end
|
||||
|
||||
defp get_cfv_by_id(member, id) do
|
||||
|
|
|
|||
|
|
@ -74,11 +74,9 @@ defmodule Mv.Membership.MembersCSV do
|
|||
defp key_to_atom(k) when is_atom(k), do: k
|
||||
|
||||
defp key_to_atom(k) when is_binary(k) do
|
||||
try do
|
||||
String.to_existing_atom(k)
|
||||
rescue
|
||||
ArgumentError -> k
|
||||
end
|
||||
String.to_existing_atom(k)
|
||||
rescue
|
||||
ArgumentError -> k
|
||||
end
|
||||
|
||||
defp get_cfv_by_id(member, id) do
|
||||
|
|
|
|||
|
|
@ -299,11 +299,9 @@ defmodule Mv.Membership.MembersPDF do
|
|||
defp date_column?(_), do: false
|
||||
|
||||
defp key_to_atom_safe(key) when is_binary(key) do
|
||||
try do
|
||||
String.to_existing_atom(key)
|
||||
rescue
|
||||
ArgumentError -> key
|
||||
end
|
||||
String.to_existing_atom(key)
|
||||
rescue
|
||||
ArgumentError -> key
|
||||
end
|
||||
|
||||
defp key_to_atom_safe(key), do: key
|
||||
|
|
|
|||
|
|
@ -82,11 +82,9 @@ defmodule Mv.OidcRoleSync do
|
|||
end
|
||||
|
||||
defp safe_get_atom(map, key) when is_binary(key) do
|
||||
try do
|
||||
Map.get(map, String.to_existing_atom(key))
|
||||
rescue
|
||||
ArgumentError -> nil
|
||||
end
|
||||
Map.get(map, String.to_existing_atom(key))
|
||||
rescue
|
||||
ArgumentError -> nil
|
||||
end
|
||||
|
||||
defp safe_get_atom(_map, _key), do: nil
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ defmodule Mv.Vereinfacht.Changes.SyncLinkedMemberAfterUserChange do
|
|||
use Ash.Resource.Change
|
||||
|
||||
require Logger
|
||||
alias Mv.Membership.Member
|
||||
alias Mv.Membership
|
||||
alias Mv.Helpers.SystemActor
|
||||
alias Mv.Helpers
|
||||
alias Mv.Helpers.SystemActor
|
||||
alias Mv.Membership
|
||||
alias Mv.Membership.Member
|
||||
|
||||
@impl true
|
||||
def change(changeset, _opts, _context) do
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ defmodule Mv.Vereinfacht do
|
|||
"""
|
||||
require Ash.Query
|
||||
import Ash.Expr
|
||||
alias Mv.Vereinfacht.Client
|
||||
alias Mv.Membership.Member
|
||||
alias Mv.Helpers.SystemActor
|
||||
alias Mv.Helpers
|
||||
alias Mv.Helpers.SystemActor
|
||||
alias Mv.Membership.Member
|
||||
alias Mv.Vereinfacht.Client
|
||||
|
||||
@doc """
|
||||
Tests the connection to the Vereinfacht API using the current configuration.
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ defmodule MvWeb do
|
|||
import MvWeb.Authorization, only: [can?: 3, can_access_page?: 2]
|
||||
|
||||
# Common modules used in templates
|
||||
alias Phoenix.LiveView.JS
|
||||
alias MvWeb.Layouts
|
||||
alias Phoenix.LiveView.JS
|
||||
|
||||
# Routes generation with the ~p sigil
|
||||
unquote(verified_routes())
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ defmodule MvWeb.MemberExportController do
|
|||
alias Mv.Membership.CustomField
|
||||
alias Mv.Membership.Member
|
||||
alias Mv.Membership.MembersCSV
|
||||
alias MvWeb.Translations.MemberFields
|
||||
alias MvWeb.MemberLive.Index.MembershipFeeStatus
|
||||
alias MvWeb.Translations.MemberFields
|
||||
use Gettext, backend: MvWeb.Gettext
|
||||
|
||||
@member_fields_allowlist (Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)) ++
|
||||
|
|
@ -105,12 +105,10 @@ defmodule MvWeb.MemberExportController do
|
|||
end
|
||||
|
||||
defp atom_exists?(name) do
|
||||
try do
|
||||
_ = String.to_existing_atom(name)
|
||||
true
|
||||
rescue
|
||||
ArgumentError -> false
|
||||
end
|
||||
_ = String.to_existing_atom(name)
|
||||
true
|
||||
rescue
|
||||
ArgumentError -> false
|
||||
end
|
||||
|
||||
defp extract_list(params, key) do
|
||||
|
|
|
|||
|
|
@ -446,23 +446,21 @@ defmodule MvWeb.MemberLive.Form do
|
|||
end
|
||||
|
||||
def handle_event("save", %{"member" => member_params}, socket) do
|
||||
try do
|
||||
actor = current_actor(socket)
|
||||
actor = current_actor(socket)
|
||||
|
||||
case submit_form(socket.assigns.form, member_params, actor) do
|
||||
{:ok, member} ->
|
||||
handle_save_success(socket, member)
|
||||
case submit_form(socket.assigns.form, member_params, actor) do
|
||||
{:ok, member} ->
|
||||
handle_save_success(socket, member)
|
||||
|
||||
{:error, form} ->
|
||||
handle_save_error(socket, form)
|
||||
end
|
||||
rescue
|
||||
_e in [Ash.Error.Forbidden, Ash.Error.Forbidden.Policy] ->
|
||||
handle_save_forbidden(socket)
|
||||
|
||||
e ->
|
||||
handle_save_exception(socket, e)
|
||||
{:error, form} ->
|
||||
handle_save_error(socket, form)
|
||||
end
|
||||
rescue
|
||||
_e in [Ash.Error.Forbidden, Ash.Error.Forbidden.Policy] ->
|
||||
handle_save_forbidden(socket)
|
||||
|
||||
e ->
|
||||
handle_save_exception(socket, e)
|
||||
end
|
||||
|
||||
@impl true
|
||||
|
|
@ -690,11 +688,9 @@ defmodule MvWeb.MemberLive.Form do
|
|||
|
||||
# Extracts message from struct error using Ash.ErrorKind protocol
|
||||
defp extract_struct_error_message(error) do
|
||||
try do
|
||||
Ash.ErrorKind.message(error)
|
||||
rescue
|
||||
Protocol.UndefinedError -> gettext("Failed to save member. Please try again.")
|
||||
end
|
||||
Ash.ErrorKind.message(error)
|
||||
rescue
|
||||
Protocol.UndefinedError -> gettext("Failed to save member. Please try again.")
|
||||
end
|
||||
|
||||
# Checks if form has any errors
|
||||
|
|
|
|||
|
|
@ -708,11 +708,9 @@ defmodule MvWeb.MemberLive.Index do
|
|||
end
|
||||
|
||||
defp to_sort_id(field) when is_binary(field) do
|
||||
try do
|
||||
String.to_existing_atom("sort_#{field}")
|
||||
rescue
|
||||
ArgumentError -> :"sort_#{field}"
|
||||
end
|
||||
String.to_existing_atom("sort_#{field}")
|
||||
rescue
|
||||
ArgumentError -> :"sort_#{field}"
|
||||
end
|
||||
|
||||
defp to_sort_id(field) when is_atom(field), do: :"sort_#{field}"
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
|
|||
|
||||
alias Mv.Membership
|
||||
alias Mv.MembershipFees
|
||||
alias Mv.MembershipFees.MembershipFeeType
|
||||
alias Mv.MembershipFees.MembershipFeeCycle
|
||||
alias Mv.MembershipFees.CycleGenerator
|
||||
alias Mv.MembershipFees.CalendarCycles
|
||||
alias Mv.MembershipFees.CycleGenerator
|
||||
alias Mv.MembershipFees.MembershipFeeCycle
|
||||
alias Mv.MembershipFees.MembershipFeeType
|
||||
alias MvWeb.Helpers.MembershipFeeHelpers
|
||||
|
||||
@impl true
|
||||
|
|
|
|||
|
|
@ -21,49 +21,47 @@ defmodule MvWeb.RoleLive.Show do
|
|||
|
||||
@impl true
|
||||
def mount(%{"id" => id}, _session, socket) do
|
||||
try do
|
||||
case Ash.get(
|
||||
Mv.Authorization.Role,
|
||||
id,
|
||||
domain: Mv.Authorization,
|
||||
actor: socket.assigns[:current_user]
|
||||
) do
|
||||
{:ok, role} ->
|
||||
user_count = load_user_count(role, socket.assigns[:current_user])
|
||||
case Ash.get(
|
||||
Mv.Authorization.Role,
|
||||
id,
|
||||
domain: Mv.Authorization,
|
||||
actor: socket.assigns[:current_user]
|
||||
) do
|
||||
{:ok, role} ->
|
||||
user_count = load_user_count(role, socket.assigns[:current_user])
|
||||
|
||||
{:ok,
|
||||
socket
|
||||
|> assign(:page_title, gettext("Show Role"))
|
||||
|> assign(:role, role)
|
||||
|> assign(:user_count, user_count)
|
||||
|> assign(:show_delete_modal, false)}
|
||||
{:ok,
|
||||
socket
|
||||
|> assign(:page_title, gettext("Show Role"))
|
||||
|> assign(:role, role)
|
||||
|> assign(:user_count, user_count)
|
||||
|> assign(:show_delete_modal, false)}
|
||||
|
||||
{:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
|
||||
{:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
|
||||
{:ok,
|
||||
socket
|
||||
|> put_flash(:error, gettext("Role not found."))
|
||||
|> redirect(to: ~p"/admin/roles")}
|
||||
|
||||
{:error, error} ->
|
||||
{:ok,
|
||||
socket
|
||||
|> put_flash(:error, format_error(error))
|
||||
|> redirect(to: ~p"/admin/roles")}
|
||||
end
|
||||
rescue
|
||||
e in [Ash.Error.Invalid] ->
|
||||
# Handle exceptions that Ash.get might throw (e.g., policy violations)
|
||||
case e do
|
||||
%Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
|
||||
{:ok,
|
||||
socket
|
||||
|> put_flash(:error, gettext("Role not found."))
|
||||
|> redirect(to: ~p"/admin/roles")}
|
||||
|
||||
{:error, error} ->
|
||||
{:ok,
|
||||
socket
|
||||
|> put_flash(:error, format_error(error))
|
||||
|> redirect(to: ~p"/admin/roles")}
|
||||
_ ->
|
||||
reraise e, __STACKTRACE__
|
||||
end
|
||||
rescue
|
||||
e in [Ash.Error.Invalid] ->
|
||||
# Handle exceptions that Ash.get might throw (e.g., policy violations)
|
||||
case e do
|
||||
%Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
|
||||
{:ok,
|
||||
socket
|
||||
|> put_flash(:error, gettext("Role not found."))
|
||||
|> redirect(to: ~p"/admin/roles")}
|
||||
|
||||
_ ->
|
||||
reraise e, __STACKTRACE__
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@impl true
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ defmodule MvWeb.StatisticsLive do
|
|||
require Logger
|
||||
|
||||
import MvWeb.LiveHelpers, only: [current_actor: 1]
|
||||
alias Mv.Statistics
|
||||
alias Mv.MembershipFees.MembershipFeeType
|
||||
alias Mv.Statistics
|
||||
alias MvWeb.Helpers.MembershipFeeHelpers
|
||||
|
||||
@impl true
|
||||
|
|
|
|||
|
|
@ -221,7 +221,8 @@ defmodule MvWeb.Plugs.CheckPagePermission do
|
|||
|
||||
defp path_param_equals(_, _, _, _), do: false
|
||||
|
||||
# For own_data: only allow show/edit when :id is the user's linked member. For other permission sets: allow when not reserved.
|
||||
# For own_data: only allow show/edit when :id is the user's linked member.
|
||||
# For other permission sets: allow when not reserved.
|
||||
defp members_show_allowed?(pattern, request_path, user) do
|
||||
if permission_set_name_from_user(user) == "own_data" do
|
||||
path_param_equals(pattern, request_path, "id", user_member_id(user))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue