Fix self invite as a facilitator

ClaperCo · Jun 7, 2024 · b54f9a4 · b54f9a4
1 parent 0b315ac
commit b54f9a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/claper/events/activity_leader.ex b/lib/claper/events/activity_leader.ex
@@ -7,6 +7,7 @@ defmodule Claper.Events.ActivityLeader do
     field :delete, :boolean, virtual: true
 
     field :user_id, :integer, virtual: true
+    field :user_email, :string, virtual: true
 
     field :email, :string
     belongs_to :event, Claper.Events.Event
@@ -21,12 +22,14 @@ defmodule Claper.Events.ActivityLeader do
     |> cast(attrs, [
       :email,
       :event_id,
-      :delete
+      :delete,
+      :user_email
     ])
     |> validate_required([:email])
     |> validate_format(:email, ~r/^[^\s]+@[^\s]+$/, message: "must have the @ sign and no spaces")
     |> validate_length(:email, min: 6, max: 160)
     |> unique_constraint(:email)
+    |> validate_not_current_user_email
     |> unsafe_validate_unique([:event_id, :email], Claper.Repo)
     |> maybe_mark_for_deletion
   end
@@ -40,4 +43,16 @@ defmodule Claper.Events.ActivityLeader do
       changeset
     end
   end
+
+  defp validate_not_current_user_email(changeset) do
+    email = get_field(changeset, :email)
+    user_email = get_change(changeset, :user_email)
+    IO.inspect(user_email)
+
+    if email == user_email do
+      add_error(changeset, :email, "cannot be the same as the current user's email")
+    else
+      changeset
+    end
+  end
 end
diff --git a/lib/claper_web/live/event_live/event_form_component.ex b/lib/claper_web/live/event_live/event_form_component.ex
@@ -61,7 +61,9 @@ defmodule ClaperWeb.EventLive.EventFormComponent do
     leaders =
       existing_leaders
       |> Enum.concat([
-        Events.change_activity_leader(%Events.ActivityLeader{temp_id: get_temp_id()})
+        Events.change_activity_leader(%Events.ActivityLeader{
+          temp_id: get_temp_id()
+        })
       ])
 
     changeset =

diff --git a/lib/claper_web/live/event_live/event_form_component.html.heex b/lib/claper_web/live/event_live/event_form_component.html.heex
@@ -343,6 +343,7 @@
               key={:email}
               name=""
             />
+            <%= hidden_input(l, :user_email, value: @current_user.email) %>
           </div>
 
           <label
@@ -364,6 +365,7 @@
 
           <%= hidden_input(l, :temp_id) %>
           <%= hidden_input(l, :event_id, value: @event.id) %>
+          <%= hidden_input(l, :user_email, value: @current_user.email) %>
 
           <button
             type="button"