Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Fixes and improvements

- Fix form submission crash for anonymous attendees
- Improve SMTP config and handling (#197)
- Fix presentation slides URL (#200)
- Fix custom S3 endpoint (#199)
Expand Down
4 changes: 4 additions & 0 deletions lib/claper/forms.ex
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,9 @@ defmodule Claper.Forms do
nil -> broadcast({:ok, r, event_uuid}, :form_submit_created)
_form_submit -> broadcast({:ok, r, event_uuid}, :form_submit_updated)
end

{:error, changeset} ->
{:error, changeset}
end
end

Expand All @@ -344,6 +347,7 @@ defmodule Claper.Forms do
|> Repo.delete()
|> case do
{:ok, r} -> broadcast({:ok, r, event_uuid}, :form_submit_deleted)
{:error, changeset} -> {:error, changeset}
end
end

Expand Down
14 changes: 13 additions & 1 deletion lib/claper/forms/form_submit.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ defmodule Claper.Forms.FormSubmit do
def changeset(form_submit, attrs) do
form_submit
|> cast(attrs, [:attendee_identifier, :user_id, :form_id, :response])
|> validate_required([:form_id, :user_id, :response])
|> validate_required([:form_id, :response])
|> validate_user_or_attendee()
end

defp validate_user_or_attendee(changeset) do
user_id = get_field(changeset, :user_id)
attendee_identifier = get_field(changeset, :attendee_identifier)

if is_nil(user_id) and is_nil(attendee_identifier) do
add_error(changeset, :user_id, "either user_id or attendee_identifier must be present")
else
changeset
end
end
end
6 changes: 6 additions & 0 deletions lib/claper_web/live/event_live/form_component.ex
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ defmodule ClaperWeb.EventLive.FormComponent do
{:noreply,
socket
|> assign(:current_form_submit, form_submit)}

{:error, _changeset} ->
{:noreply, socket}
end
end

Expand All @@ -167,6 +170,9 @@ defmodule ClaperWeb.EventLive.FormComponent do
{:noreply,
socket
|> assign(:current_form_submit, form_submit)}

{:error, _changeset} ->
{:noreply, socket}
end
end

Expand Down
57 changes: 57 additions & 0 deletions test/claper/forms_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,62 @@ defmodule Claper.FormsTest do
}
)
end

test "create_or_update_form_submit/2 with attendee_identifier creates a form_submit" do
presentation_file = presentation_file_fixture(%{}, [:event])
f = form_fixture(%{presentation_file_id: presentation_file.id})

assert {:ok, %Claper.Forms.FormSubmit{} = form_submit} =
Forms.create_or_update_form_submit(
presentation_file.event.uuid,
%{
"attendee_identifier" => "test-attendee-123",
"form_id" => f.id,
"response" => %{"Name" => "Daniel"}
}
)

assert form_submit.attendee_identifier == "test-attendee-123"
assert is_nil(form_submit.user_id)
assert form_submit.form_id == f.id
end

test "create_or_update_form_submit/2 with attendee_identifier updates existing form_submit" do
presentation_file = presentation_file_fixture(%{}, [:event])
f = form_fixture(%{presentation_file_id: presentation_file.id})

{:ok, _first_submit} =
Forms.create_or_update_form_submit(
presentation_file.event.uuid,
%{
"attendee_identifier" => "test-attendee-123",
"form_id" => f.id,
"response" => %{"Name" => "Daniel"}
}
)

assert {:ok, %Claper.Forms.FormSubmit{} = updated_submit} =
Forms.create_or_update_form_submit(
presentation_file.event.uuid,
%{
"attendee_identifier" => "test-attendee-123",
"form_id" => f.id,
"response" => %{"Name" => "Updated Name"}
}
)

assert updated_submit.response == %{"Name" => "Updated Name"}
end

test "create_or_update_form_submit/2 without user_id or attendee_identifier returns error" do
presentation_file = presentation_file_fixture(%{}, [:event])
f = form_fixture(%{presentation_file_id: presentation_file.id})

assert {:error, %Ecto.Changeset{}} =
Forms.create_form_submit(%{
form_id: f.id,
response: %{"Name" => "Daniel"}
})
end
end
end
Loading