feat: app home page (#442)

Co-authored-by: Nuno Miguel <[email protected]>

Author: Darguima

lib/safira/accounts.ex

@@ -47,12 +47,11 @@ defmodule Safira.Accounts do
   end
 
   @doc """
-  Lists all attendees with CV.
+  Lists all users with CV.
   """
-  def list_attendees_with_cv do
-    Attendee
-    |> where([at], not is_nil(at.cv))
-    |> preload(:user)
+  def list_users_with_cv do
+    User
+    |> where([user], not is_nil(user.cv))
     |> Repo.all()
   end
 
@@ -81,24 +80,6 @@ defmodule Safira.Accounts do
     |> Repo.update()
   end
 
-  @doc """
-  Updates an attendee's CV.
-
-  ## Examples
-
-      iex> update_atttendee_cv(badge, %{cv: cv})
-      {:ok, %Badge{}}
-
-      iex> update_attendee_cv(badge, %{cv: bad_cv})
-      {:error, %Ecto.Changeset{}}
-
-  """
-  def update_attendee_cv(%Attendee{} = attendee, attrs) do
-    attendee
-    |> Attendee.cv_changeset(attrs)
-    |> Repo.update()
-  end
-
   def change_attendee(%Attendee{} = attendee, attrs \\ %{}) do
     Attendee.changeset(attendee, attrs)
   end
@@ -211,6 +192,24 @@ defmodule Safira.Accounts do
     Repo.get_by(User, email: email)
   end
 
+  @doc """
+  Gets a user by handle.
+
+  ## Examples
+
+      iex> get_user_by_handle("lisasimpson")
+      %User{}
+
+      iex> get_user_by_handle("lisasimpson")
+      nil
+
+  """
+  def get_user_by_handle!(handle) when is_binary(handle) do
+    User
+    |> preload([:attendee])
+    |> Repo.get_by!(handle: handle)
+  end
+
   @doc """
   Gets a user by email and password.
 
@@ -338,6 +337,109 @@ defmodule Safira.Accounts do
     |> Repo.insert()
   end
 
+  @doc """
+  Returns an `%Ecto.Changeset{}` for changing the user profile (name, handle, password and email).
+  Doesn't validate the uniqueness of the email.
+
+  ## Examples
+
+      iex> change_user_profile(user)
+      %Ecto.Changeset{data: %User{}}
+
+  """
+  def change_user_profile(user, attrs \\ %{}) do
+    user
+    |> User.profile_changeset(attrs, validate_email: false)
+    |> User.picture_changeset(attrs)
+  end
+
+  @doc """
+  Updates the user profile (name, handle, password).
+
+  If everything succeed, emulates that the email was change without
+  actually changing it in the database.
+  """
+  def update_user_profile(%User{} = user, current_password, attrs) do
+    password_changed? =
+      attrs["password"] != nil && String.trim(attrs["password"]) != ""
+
+    changeset =
+      user
+      |> User.profile_changeset(attrs, validate_email: true)
+      |> maybe_validate_current_password(password_changed?, current_password)
+
+    # Just simulate a complete update, to check if everything is valid
+    applied_user = Ecto.Changeset.apply_action(changeset, :update)
+
+    case applied_user do
+      {:ok, _} ->
+        # Removing the email from the changeset, since the mail just will be updated over mail confirmation
+        changeset_without_mail_update = Ecto.Changeset.change(changeset, email: user.email)
+
+        tokens_to_delete = if password_changed?, do: :all, else: ["false"]
+
+        Ecto.Multi.new()
+        |> Ecto.Multi.update(:user, changeset_without_mail_update)
+        # The tokens will just be deleted if the password was changed
+        |> Ecto.Multi.delete_all(
+          :tokens,
+          UserToken.by_user_and_contexts_query(user, tokens_to_delete)
+        )
+        |> Repo.transaction()
+        |> case do
+          # Return the user with ALL the changes
+          {:ok, _} -> applied_user
+          {:error, :user, changeset, _} -> {:error, changeset}
+        end
+
+      otherwise ->
+        otherwise
+    end
+  end
+
+  defp maybe_validate_current_password(changeset, password_changed?, current_password) do
+    if password_changed? do
+      User.validate_current_password(changeset, current_password)
+    else
+      changeset
+    end
+  end
+
+  def update_user_picture(%User{} = user, attrs) do
+    user
+    |> User.picture_changeset(attrs)
+    |> Repo.update()
+  end
+
+  @doc """
+  Updates a user's CV.
+
+  ## Examples
+
+      iex> update_user_cv(user, %{cv: cv})
+      {:ok, %User{}}
+
+      iex> update_user_cv(user, %{cv: bad_cv})
+      {:error, %Ecto.Changeset{}}
+
+  """
+  def update_user_cv(%User{} = user, attrs) do
+    user
+    |> User.cv_changeset(attrs)
+    |> Repo.update()
+    |> case do
+      {:ok, user} ->
+        if user.type == :attendee do
+          Contest.enqueue_badge_trigger_execution_job(user.attendee, :upload_cv_event)
+        end
+
+        {:ok, user}
+
+      {:error, changeset} ->
+        {:error, changeset}
+    end
+  end
+
   @doc """
   Returns an `%Ecto.Changeset{}` for tracking user changes.
 
@@ -807,12 +909,13 @@ defmodule Safira.Accounts do
       iex> get_attendee_from_credential(456)
       nil
   """
-  def get_attendee_from_credential(credential_id) do
+  def get_attendee_from_credential(credential_id, preloads \\ []) do
     Credential
     |> where([c], c.id == ^credential_id)
     |> join(:inner, [c], a in assoc(c, :attendee))
     |> select([c, a], a)
     |> Repo.one()
+    |> Repo.preload(preloads)
   end
 
   @doc """

lib/safira/accounts/attendee.ex

@@ -10,7 +10,6 @@ defmodule Safira.Accounts.Attendee do
   schema "attendees" do
     field :tokens, :integer, default: 0
     field :entries, :integer, default: 0
-    field :cv, Uploaders.CV.Type
     field :ineligible, :boolean, default: false
 
     belongs_to :course, Safira.Accounts.Course
@@ -29,11 +28,6 @@ defmodule Safira.Accounts.Attendee do
     |> validate_required(@required_fields)
   end
 
-  def cv_changeset(attendee, attrs) do
-    attendee
-    |> cast_attachments(attrs, [:cv])
-  end
-
   def update_tokens_changeset(attendee, attrs) do
     attendee
     |> cast(attrs, [:tokens])

lib/safira/accounts/user.ex

@@ -36,12 +36,14 @@ defmodule Safira.Accounts.User do
     field :name, :string
     field :email, :string
     field :handle, :string
+    field :picture, Safira.Uploaders.UserPicture.Type
     field :password, :string, virtual: true, redact: true
     field :hashed_password, :string, redact: true
     field :current_password, :string, virtual: true, redact: true
     field :confirmed_at, :utc_datetime
     field :type, Ecto.Enum, values: [:attendee, :staff, :company], default: :attendee
     field :allows_marketing, :boolean, default: false
+    field :cv, Uploaders.CV.Type
 
     has_one :attendee, Attendee, on_delete: :delete_all
     has_one :staff, Staff, on_delete: :delete_all, on_replace: :update
@@ -103,6 +105,7 @@ defmodule Safira.Accounts.User do
     |> cast(attrs, [:name, :handle, :email, :confirmed_at, :type])
     |> unique_constraint(:email)
     |> validate_handle()
+    |> email_changeset(attrs, opts |> Keyword.put(:check_email_changed, false))
     |> if_changed_password_changeset(attrs, opts)
   end
 
@@ -177,15 +180,26 @@ defmodule Safira.Accounts.User do
   @doc """
   A user changeset for changing the email.
 
-  It requires the email to change otherwise an error is added.
+  ## Options
+
+   * `:check_email_changed` - If true, it requires the email to change, otherwise an error is added.
+      Defaults to `true`.
   """
   def email_changeset(user, attrs, opts \\ []) do
     user
     |> cast(attrs, [:email])
     |> validate_email(opts)
-    |> case do
-      %{changes: %{email: _}} = changeset -> changeset
-      %{} = changeset -> add_error(changeset, :email, "did not change")
+    |> maybe_validate_email_changed(opts)
+  end
+
+  defp maybe_validate_email_changed(%{changes: %{email: _}} = changeset, _opts), do: changeset
+
+  defp maybe_validate_email_changed(changeset, opts) do
+    check_email_changed? = Keyword.get(opts, :check_email_changed, true)
+
+    case check_email_changed? do
+      true -> changeset |> add_error(:email, "did not change")
+      false -> changeset
     end
   end
 
@@ -247,7 +261,19 @@ defmodule Safira.Accounts.User do
     if valid_password?(changeset.data, password) do
       changeset
     else
-      add_error(changeset, :current_password, "is not valid")
+      add_error(changeset, :current_password, "password not correct")
     end
   end
+
+  @doc false
+  def picture_changeset(user, attrs) do
+    user
+    |> cast_attachments(attrs, [:picture])
+  end
+
+  @doc false
+  def cv_changeset(attendee, attrs) do
+    attendee
+    |> cast_attachments(attrs, [:cv])
+  end
 end

lib/safira/companies.ex

@@ -371,14 +371,14 @@ defmodule Safira.Companies do
   """
   def get_cvs(company) when not is_nil(company.badge_id) do
     if company.tier.full_cv_access do
-      Accounts.list_attendees_with_cv()
-      |> Enum.map(fn at ->
-        {at.user.handle, Uploaders.CV.url({at.cv, at}, :original, signed: true)}
+      Accounts.list_users_with_cv()
+      |> Enum.map(fn user ->
+        {user.handle, Uploaders.CV.url({user.cv, user}, :original, signed: true)}
       end)
     else
-      Contest.list_attendees_with_badge_and_cv(company.badge_id)
-      |> Enum.map(fn at ->
-        {at.user.handle, Uploaders.CV.url({at.cv, at}, :original, signed: true)}
+      Contest.list_users_with_badge_and_cv(company.badge_id)
+      |> Enum.map(fn user ->
+        {user.handle, Uploaders.CV.url({user.cv, user}, :original, signed: true)}
       end)
     end
   end

lib/safira/contest.ex

@@ -5,7 +5,7 @@ defmodule Safira.Contest do
   use Safira.Context
 
   alias Ecto.Multi
-  alias Safira.Accounts.Attendee
+  alias Safira.Accounts.{Attendee, User}
   alias Safira.{Companies, Spotlights, Workers}
 
   alias Safira.Contest.{
@@ -122,20 +122,35 @@ defmodule Safira.Contest do
   end
 
   @doc """
-  Lists all badge redeems belonging to a badge, where the attendee has uploaded their CV.
+  Lists all users (both attendees and staffs) that have the specified badge and have uploaded their CV.
 
   ## Examples
 
-      iex> list_attendees_with_badge_and_cv(123)
-      [%BadgeRedeem{}, %BadgeRedeem{}]
-
+      iex> list_users_with_badge_and_cv(123)
+      [%User{}, ...]
   """
-  def list_attendees_with_badge_and_cv(badge_id) do
-    Attendee
-    |> join(:inner, [at], br in BadgeRedeem, on: at.id == br.attendee_id)
-    |> where([at, br], br.badge_id == ^badge_id and not is_nil(at.cv))
-    |> preload(:user)
-    |> select([at, br], at)
+  def list_users_with_badge_and_cv(badge_id) do
+    # First query for attendees with badge and CV
+    attendees_query =
+      from u in User,
+        join: at in Attendee,
+        on: at.user_id == u.id,
+        join: br in BadgeRedeem,
+        on: br.attendee_id == at.id,
+        where: br.badge_id == ^badge_id and not is_nil(u.cv),
+        where: u.type == :attendee,
+        select: u.id
+
+    # Then query for staff with badge and CV
+    staff_query =
+      from u in User,
+        where: u.type == :staff and not is_nil(u.cv),
+        select: u.id
+
+    # Combine queries and preload associations after
+    User
+    |> where([u], u.id in subquery(attendees_query |> union(^staff_query)))
+    |> preload([:attendee, :staff])
     |> Repo.all()
   end
 

lib/safira/contest/badge.ex

@@ -7,7 +7,7 @@ defmodule Safira.Contest.Badge do
   alias Safira.Companies
 
   @required_fields ~w(name description begin end tokens entries category_id)a
-  @optional_fields ~w(image counts_for_day givable)a
+  @optional_fields ~w(image counts_for_day givable is_checkpoint)a
 
   @derive {
     Flop.Schema,
@@ -24,6 +24,7 @@ defmodule Safira.Contest.Badge do
     field :end, :utc_datetime
     field :counts_for_day, :boolean, default: true
     field :givable, :boolean, default: true
+    field :is_checkpoint, :boolean, default: false
 
     belongs_to :category, Safira.Contest.BadgeCategory
     has_one :company, Companies.Company

lib/safira/uploaders/cv.ex

@@ -5,7 +5,7 @@ defmodule Safira.Uploaders.CV do
 
   use Safira.Uploader
 
-  alias Safira.Accounts.Attendee
+  alias Safira.Accounts.User
 
   @versions [:original]
   @extension_whitelist ~w(.pdf)
@@ -15,8 +15,8 @@ defmodule Safira.Uploaders.CV do
     Enum.member?(extension_whitelist(), file_extension)
   end
 
-  def storage_dir(_, {_file, %Attendee{} = attendee}) do
-    "uploads/cvs/attendee/#{attendee.id}"
+  def storage_dir(_, {_file, %User{} = user}) do
+    "uploads/user/cv/#{user.id}"
   end
 
   def filename(version, _) do