Merge branch 'fix/update-favorites-category' into dev

Author: mydearxym

lib/mastani_server/cms/post_favorite.ex

@@ -8,15 +8,14 @@ defmodule MastaniServer.CMS.PostFavorite do
   alias MastaniServer.CMS.Post
 
   @required_fields ~w(user_id post_id)a
-  @optional_fields ~w(category_title category_id)a
+  @optional_fields ~w(category_id)a
 
   @type t :: %PostFavorite{}
   schema "posts_favorites" do
     belongs_to(:user, Accounts.User, foreign_key: :user_id)
     belongs_to(:post, Post, foreign_key: :post_id)
     # has_many(:category, UserFavoriteCategory)
     belongs_to(:category, Accounts.FavoriteCategory)
-    field(:category_title, :string, default: "all")
 
     timestamps(type: :utc_datetime)
   end

priv/repo/migrations/20180825024247_remove_category_title_in_post_favrotes.exs

@@ -0,0 +1,9 @@
+defmodule MastaniServer.Repo.Migrations.RemoveCategoryTitleInPostFavrotes do
+  use Ecto.Migration
+
+  def change do
+    alter table(:posts_favorites) do
+      remove(:category_title)
+    end
+  end
+end

test/mastani_server/accounts/favorite_category_test.exs

@@ -67,14 +67,13 @@ defmodule MastaniServer.Test.Accounts.FavoriteCategory do
 
       assert {:error, _} =
                CMS.PostFavorite
-               |> ORM.find_by(%{category_title: category.title, user_id: user.id})
+               |> ORM.find_by(%{category_id: category.id, user_id: user.id})
 
       assert {:error, _} = FavoriteCategory |> ORM.find(category.id)
     end
   end
 
   describe "[favorite category set/unset]" do
-    @tag :wip
     test "user can set category to a favorited post", ~m(user post)a do
       test_category = "test category"
       {:ok, category} = Accounts.create_favorite_category(user, %{title: test_category})
@@ -86,7 +85,6 @@ defmodule MastaniServer.Test.Accounts.FavoriteCategory do
       assert post_favorite.category_id == category.id
     end
 
-    @tag :wip
     test "user can change category to a categoried favorited post", ~m(user post)a do
       test_category = "test category"
       {:ok, category} = Accounts.create_favorite_category(user, %{title: test_category})
@@ -117,7 +115,6 @@ defmodule MastaniServer.Test.Accounts.FavoriteCategory do
       assert {:error, _} = Accounts.set_favorites(user, :post, post.id, category.id)
     end
 
-    @tag :wip
     test "user set to a already categoried post fails", ~m(user post)a do
       test_category = "test category"
       {:ok, category} = Accounts.create_favorite_category(user, %{title: test_category})