Merge pull request #63 from coderplanets/user-detail

feat: add edu & work background && refactor

Author: mydearxym

lib/mastani_server/accounts/delegates/profile.ex

@@ -14,13 +14,33 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
 
   @default_subscribed_communities get_config(:general, :default_subscribed_communities)
 
-  def update_profile(%User{id: id}, attrs \\ %{}) do
-    with {:ok, user} <- ORM.find(User, id) do
-      case user.id === id do
-        true -> user |> ORM.update(attrs)
-        false -> {:error, "Error: not qualified"}
+  @doc """
+  update user's profile
+  """
+  def update_profile(%User{} = user, attrs \\ %{}) do
+    changeset =
+      user
+      |> Ecto.Changeset.change(attrs)
+
+    changeset =
+      cond do
+        Map.has_key?(attrs, :education_backgrounds) ->
+          changeset
+          |> Ecto.Changeset.put_embed(:education_backgrounds, attrs.education_backgrounds)
+
+        Map.has_key?(attrs, :work_backgrounds) ->
+          changeset
+          |> Ecto.Changeset.put_embed(:work_backgrounds, attrs.work_backgrounds)
+
+        Map.has_key?(attrs, :other_embeds) ->
+          changeset
+          |> Ecto.Changeset.put_embed(:other_embeds, attrs.other_embeds)
+
+        true ->
+          changeset
       end
-    end
+
+    changeset |> User.update_changeset(attrs) |> Repo.update()
   end
 
   @doc """

lib/mastani_server/accounts/education_background.ex

@@ -0,0 +1,23 @@
+defmodule MastaniServer.Accounts.EducationBackground do
+  @moduledoc false
+  alias __MODULE__
+
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  @required_fields ~w(school)a
+  @optional_fields ~w(major)a
+
+  @type t :: %EducationBackground{}
+  embedded_schema do
+    field(:school, :string)
+    field(:major, :string)
+  end
+
+  @doc false
+  def changeset(%EducationBackground{} = education_background, attrs) do
+    education_background
+    |> cast(attrs, @optional_fields ++ @required_fields)
+    |> validate_required(@required_fields)
+  end
+end

lib/mastani_server/accounts/user.ex

@@ -8,16 +8,21 @@ defmodule MastaniServer.Accounts.User do
   alias MastaniServer.Accounts.{
     Achievement,
     Customization,
+    EducationBackground,
     FavoriteCategory,
     GithubUser,
     Purchase,
     UserBill,
     UserFollower,
-    UserFollowing
+    UserFollowing,
+    WorkBackground
   }
 
   alias MastaniServer.CMS
 
+  @required_fields ~w(nickname avatar)a
+  @optional_fields ~w(nickname bio sex location email company education qq weichat weibo)a
+
   @type t :: %User{}
   schema "users" do
     field(:nickname, :string)
@@ -26,8 +31,16 @@ defmodule MastaniServer.Accounts.User do
     field(:bio, :string)
     field(:email, :string)
     field(:location, :string)
+
     field(:education, :string)
     field(:company, :string)
+
+    # TODO
+    # field(:twitter, :string)
+    # field(:facebook, :string)
+    embeds_many(:education_backgrounds, EducationBackground)
+    embeds_many(:work_backgrounds, WorkBackground)
+
     field(:qq, :string)
     field(:weibo, :string)
     field(:weichat, :string)
@@ -56,17 +69,21 @@ defmodule MastaniServer.Accounts.User do
     timestamps(type: :utc_datetime)
   end
 
-  @required_fields ~w(nickname avatar)a
-  @optional_fields ~w(nickname bio avatar sex location email company education qq weichat weibo)a
-
   @doc false
   def changeset(%User{} = user, attrs) do
-    # |> cast(attrs, [:username, :nickname, :bio, :company])
-    # |> validate_required([:username])
-    # |> cast(attrs, @required_fields, @optional_fields)
     user
     |> cast(attrs, @optional_fields ++ @required_fields)
+    |> update_changeset(attrs)
     |> validate_required(@required_fields)
+
+    # |> unique_constraint(:username)
+  end
+
+  def update_changeset(user, attrs) do
+    user
+    |> cast(attrs, @optional_fields ++ @required_fields)
+    |> cast_embed(:education_backgrounds, with: &EducationBackground.changeset/2)
+    |> cast_embed(:work_backgrounds, with: &WorkBackground.changeset/2)
     |> validate_length(:nickname, min: 3, max: 30)
     |> validate_length(:bio, min: 3, max: 100)
     |> validate_inclusion(:sex, ["dude", "girl"])
@@ -76,7 +93,5 @@ defmodule MastaniServer.Accounts.User do
     |> validate_length(:qq, min: 8, max: 15)
     |> validate_length(:weichat, min: 3, max: 30)
     |> validate_length(:weibo, min: 3, max: 30)
-
-    # |> unique_constraint(:username)
   end
 end

lib/mastani_server/accounts/work_background.ex

@@ -0,0 +1,23 @@
+defmodule MastaniServer.Accounts.WorkBackground do
+  @moduledoc false
+  alias __MODULE__
+
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  @required_fields ~w(company)a
+  @optional_fields ~w(title)a
+
+  @type t :: %WorkBackground{}
+  embedded_schema do
+    field(:company, :string)
+    field(:title, :string)
+  end
+
+  @doc false
+  def changeset(%WorkBackground{} = work_background, attrs) do
+    work_background
+    |> cast(attrs, @optional_fields ++ @required_fields)
+    |> validate_required(@required_fields)
+  end
+end

lib/mastani_server_web/middleware/changeset_errors.ex

@@ -3,21 +3,36 @@
 # see https://hexdocs.pm/absinthe/Absinthe.Middleware.html#content
 # ---
 defmodule MastaniServerWeb.Middleware.ChangesetErrors do
+  @moduledoc """
+  translate changeset into Graphql-spec with i18n support
+  """
+
   @behaviour Absinthe.Middleware
   import Helper.Utils, only: [handle_absinthe_error: 3]
   import Helper.ErrorCode
 
   alias MastaniServerWeb.Gettext, as: Translator
 
   def call(%{errors: [%Ecto.Changeset{} = changeset]} = resolution, _) do
-    # IO.inspect changeset, label: "Changeset error"
-    # IO.inspect transform_errors(changeset), label: "transform_errors"
     resolution
     |> handle_absinthe_error(transform_errors(changeset), ecode(:changeset))
   end
 
   def call(resolution, _), do: resolution
 
+  # handle special embed schema errors
+  defp transform_errors(%Ecto.Changeset{errors: [], valid?: false} = changeset) do
+    first_errored_embed_changeset =
+      changeset.changes
+      |> Map.values()
+      |> List.flatten()
+      |> Enum.filter(&is_map/1)
+      |> Enum.filter(fn x -> x.valid? == false end)
+      |> List.first()
+
+    transform_errors(first_errored_embed_changeset)
+  end
+
   defp transform_errors(changeset) do
     changeset
     |> Ecto.Changeset.traverse_errors(&format_error/1)

lib/mastani_server_web/schema/account/account_misc.ex

@@ -31,6 +31,16 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:public_gists, :integer)
   end
 
+  input_object :education_background do
+    field(:school, :string)
+    field(:major, :string)
+  end
+
+  input_object :work_background do
+    field(:company, :string)
+    field(:title, :string)
+  end
+
   input_object :user_profile_input do
     field(:nickname, :string)
     field(:bio, :string)
@@ -42,6 +52,8 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:qq, :string)
     field(:weibo, :string)
     field(:weichat, :string)
+    field(:education_backgrounds, list_of(:education_background))
+    field(:work_backgrounds, list_of(:work_background))
   end
 
   # see: https://github.com/absinthe-graphql/absinthe/issues/206

lib/mastani_server_web/schema/account/account_types.ex

@@ -14,6 +14,16 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:is_valid, :boolean)
   end
 
+  object :education_background do
+    field(:school, :string)
+    field(:major, :string)
+  end
+
+  object :work_background do
+    field(:company, :string)
+    field(:title, :string)
+  end
+
   object :user do
     field(:id, :id)
     field(:nickname, :string)
@@ -33,6 +43,9 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:github_profile, :github_profile, resolve: dataloader(Accounts, :github_profile))
     field(:achievement, :achievement, resolve: dataloader(Accounts, :achievement))
 
+    field(:education_backgrounds, list_of(:education_background))
+    field(:work_backgrounds, list_of(:work_background))
+
     # field(:favorites_categories, :paged_favorites_category) do
     # arg(:filter, non_null(:common_paged_filter))
 

priv/repo/migrations/20180825043644_create_education_backgrounds.exs

@@ -0,0 +1,13 @@
+defmodule MastaniServer.Repo.Migrations.CreateEducationBackgrounds do
+  use Ecto.Migration
+
+  def change do
+    create table(:education_backgrounds) do
+      add(:user_id, references(:users, on_delete: :delete_all), null: false)
+      add(:school, :string)
+      add(:major, :string)
+    end
+
+    create(unique_index(:education_backgrounds, [:user_id]))
+  end
+end

priv/repo/migrations/20180825060140_add_education_backgrounds_to_users.exs

@@ -0,0 +1,9 @@
+defmodule MastaniServer.Repo.Migrations.AddEducationBackgroundsToUsers do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      add(:education_backgrounds, :map)
+    end
+  end
+end

priv/repo/migrations/20180825094837_add_work_backgrounds_to_users.exs

@@ -0,0 +1,9 @@
+defmodule MastaniServer.Repo.Migrations.AddWorkBackgroundsToUsers do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      add(:work_backgrounds, :map)
+    end
+  end
+end