From 8a8502724d5cd0a004e6611ba7ea574dbd33f694 Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 4 Jul 2025 00:58:18 +0200 Subject: [PATCH] chore: formatting --- lib/mv/membership/member.ex | 34 ++++++++++++++++++++++++++------ lib/mv_web/components/layouts.ex | 2 +- lib/mv_web/live/member_live.ex | 1 - 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lib/mv/membership/member.ex b/lib/mv/membership/member.ex index b6fe9a8..65c8953 100644 --- a/lib/mv/membership/member.ex +++ b/lib/mv/membership/member.ex @@ -26,7 +26,21 @@ defmodule Mv.Membership.Member do @doc false def changeset(member, attrs) do member - |> cast(attrs, [:first_name, :last_name, :email, :birth_date, :paid, :phone_number, :join_date, :exit_date, :notes, :city, :street, :house_number, :postal_code]) + |> cast(attrs, [ + :first_name, + :last_name, + :email, + :birth_date, + :paid, + :phone_number, + :join_date, + :exit_date, + :notes, + :city, + :street, + :house_number, + :postal_code + ]) |> validate_required([:first_name, :last_name, :email]) |> validate_length(:first_name, min: 1) |> validate_length(:last_name, min: 1) @@ -49,7 +63,9 @@ defmodule Mv.Membership.Member do defp validate_birth_date(changeset) do case get_field(changeset, :birth_date) do - nil -> changeset + nil -> + changeset + birth_date -> if Date.compare(birth_date, Date.utc_today()) == :gt do add_error(changeset, :birth_date, "cannot be in the future") @@ -61,7 +77,9 @@ defmodule Mv.Membership.Member do defp validate_join_date(changeset) do case get_field(changeset, :join_date) do - nil -> changeset + nil -> + changeset + join_date -> if Date.compare(join_date, Date.utc_today()) == :gt do add_error(changeset, :join_date, "cannot be in the future") @@ -74,7 +92,7 @@ defmodule Mv.Membership.Member do defp validate_exit_date(changeset) do join_date = get_field(changeset, :join_date) exit_date = get_field(changeset, :exit_date) - + if join_date && exit_date && Date.compare(exit_date, join_date) != :gt do add_error(changeset, :exit_date, "cannot be before join date") else @@ -84,7 +102,9 @@ defmodule Mv.Membership.Member do defp validate_phone_number(changeset) do case get_field(changeset, :phone_number) do - nil -> changeset + nil -> + changeset + phone_number -> if Regex.match?(~r/^\+?[0-9\- ]{6,20}$/, phone_number) do changeset @@ -96,7 +116,9 @@ defmodule Mv.Membership.Member do defp validate_postal_code(changeset) do case get_field(changeset, :postal_code) do - nil -> changeset + nil -> + changeset + postal_code -> if Regex.match?(~r/^\d{5}$/, postal_code) do changeset diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index dd70936..920d048 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -52,7 +52,7 @@ defmodule MvWeb.Layouts do - <%= @inner_content %> + {@inner_content} """ end diff --git a/lib/mv_web/live/member_live.ex b/lib/mv_web/live/member_live.ex index 5556059..285c4da 100644 --- a/lib/mv_web/live/member_live.ex +++ b/lib/mv_web/live/member_live.ex @@ -72,4 +72,3 @@ defmodule MvWeb.Live.MemberLive do ] end end -