refactor(orm): use ! after-fix to make API clear

Author: mydearxym

cover/excoveralls.json

@@ -75,10 +75,10 @@ defmodule GroupherServer.Accounts.Delegate.Fans do
          {:ok, _follow_user} <- ORM.find(User, follower_id) do
       Multi.new()
       |> Multi.run(:delete_follower, fn _, _ ->
-        ORM.findby_delete(UserFollower, %{user_id: follower_id, follower_id: user_id})
+        ORM.findby_delete!(UserFollower, %{user_id: follower_id, follower_id: user_id})
       end)
       |> Multi.run(:delete_following, fn _, _ ->
-        ORM.findby_delete(UserFollowing, %{user_id: user_id, following_id: follower_id})
+        ORM.findby_delete!(UserFollowing, %{user_id: user_id, following_id: follower_id})
       end)
       |> Multi.run(:minus_achievement, fn _, _ ->
         Accounts.achieve(%User{id: follower_id}, :minus, :follow)

lib/groupher_server/accounts/delegates/fans.ex

@@ -351,8 +351,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
           article_comment_id: comment.id,
           user_id: user_id
         })
-
-        {:ok, :pass}
       end)
       |> Multi.run(:desc_upvotes_count, fn _, _ ->
         count_query = from(c in ArticleCommentUpvote, where: c.article_comment_id == ^comment_id)

lib/groupher_server/cms/delegates/article_comment.ex

@@ -37,7 +37,7 @@ defmodule GroupherServer.CMS.Delegate.CommentReaction do
     with {:ok, action} <- match_action(thread, feeling) do
       clause = Map.merge(%{user_id: user_id}, merge_thread_comment_id(thread, comment_id))
       # clause = %{post_comment_id: comment_id, user_id: user_id}
-      ORM.findby_delete(action.reactor, clause)
+      ORM.findby_delete!(action.reactor, clause)
       ORM.find(action.target, comment_id)
     end
   end

lib/groupher_server/cms/delegates/comment_reaction.ex

@@ -35,7 +35,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
   """
   def unset_category(%Community{id: community_id}, %Category{id: category_id}) do
     with {:ok, community_category} <-
-           CommunityCategory |> ORM.findby_delete(~m(community_id category_id)a) do
+           CommunityCategory |> ORM.findby_delete!(~m(community_id category_id)a) do
       Community |> ORM.find(community_category.community_id)
     end
   end
@@ -54,7 +54,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
   """
   def unset_thread(%Community{id: community_id}, %Thread{id: thread_id}) do
     with {:ok, community_thread} <-
-           CommunityThread |> ORM.findby_delete(~m(community_id thread_id)a) do
+           CommunityThread |> ORM.findby_delete!(~m(community_id thread_id)a) do
       Community |> ORM.find(community_thread.community_id)
     end
   end
@@ -80,7 +80,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
   unset a community editor
   """
   def unset_editor(%Community{id: community_id}, %User{id: user_id}) do
-    with {:ok, _} <- ORM.findby_delete(CommunityEditor, ~m(user_id community_id)a),
+    with {:ok, _} <- ORM.findby_delete!(CommunityEditor, ~m(user_id community_id)a),
          {:ok, _} <- PassportCURD.delete_passport(%User{id: user_id}) do
       User |> ORM.find(user_id)
     end
@@ -132,7 +132,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
     with {:ok, community} <- ORM.find(Community, community_id),
          true <- community.raw !== "home",
          {:ok, record} <-
-           ORM.findby_delete(CommunitySubscriber, community_id: community.id, user_id: user_id) do
+           ORM.findby_delete!(CommunitySubscriber, community_id: community.id, user_id: user_id) do
       Community |> ORM.find(record.community_id)
     else
       false ->
@@ -151,7 +151,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
     with {:ok, community} <- ORM.find(Community, community_id),
          true <- community.raw !== "home",
          {:ok, record} <-
-           CommunitySubscriber |> ORM.findby_delete(community_id: community.id, user_id: user_id) do
+           CommunitySubscriber |> ORM.findby_delete!(community_id: community.id, user_id: user_id) do
       update_community_geo(community_id, user_id, remote_ip, :dec)
       Community |> ORM.find(record.community_id)
     else
@@ -171,7 +171,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
     with {:ok, community} <- ORM.find(Community, community_id),
          true <- community.raw !== "home",
          {:ok, record} <-
-           CommunitySubscriber |> ORM.findby_delete(community_id: community.id, user_id: user_id) do
+           CommunitySubscriber |> ORM.findby_delete!(community_id: community.id, user_id: user_id) do
       update_community_geo_map(community.id, city, :dec)
       Community |> ORM.find(record.community_id)
     else

lib/groupher_server/cms/delegates/community_operation.ex

@@ -65,7 +65,7 @@ defmodule GroupherServer.CMS.Delegate.PassportCURD do
   end
 
   def delete_passport(%Accounts.User{id: user_id}) do
-    ORM.findby_delete(UserPasport, ~m(user_id)a)
+    ORM.findby_delete!(UserPasport, ~m(user_id)a)
   end
 
   defp reject_invalid_rules(rules) when is_map(rules) do

lib/groupher_server/cms/delegates/passport_curd.ex

@@ -41,7 +41,7 @@ defmodule GroupherServerWeb.Resolvers.CMS do
 
   def update_community(_root, args, _info), do: Community |> ORM.find_update(args)
 
-  def delete_community(_root, %{id: id}, _info), do: Community |> ORM.find_delete(id)
+  def delete_community(_root, %{id: id}, _info), do: Community |> ORM.find_delete!(id)
 
   # #######################
   # community thread (post, job), login user should be logged
@@ -178,7 +178,7 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.create_category(%{title: title, raw: raw}, user)
   end
 
-  def delete_category(_root, %{id: id}, _info), do: Category |> ORM.find_delete(id)
+  def delete_category(_root, %{id: id}, _info), do: Category |> ORM.find_delete!(id)
 
   def update_category(_root, ~m(id title)a, %{context: %{cur_user: _}}) do
     CMS.update_category(~m(%Category id title)a)
@@ -243,7 +243,7 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.create_tag(%Community{id: community_id}, thread, args, user)
   end
 
-  def delete_tag(_root, %{id: id}, _info), do: Tag |> ORM.find_delete(id)
+  def delete_tag(_root, %{id: id}, _info), do: Tag |> ORM.find_delete!(id)
 
   def update_tag(_root, args, _info), do: CMS.update_tag(args)
 

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -121,18 +121,25 @@ defmodule Helper.ORM do
   """
   def delete(content), do: Repo.delete(content)
 
-  def find_delete(queryable, id) do
+  def find_delete!(queryable, id) do
     with {:ok, content} <- find(queryable, id) do
       delete(content)
     end
   end
 
-  def findby_delete(queryable, clauses) do
+  def findby_delete!(queryable, clauses) do
     with {:ok, content} <- find_by(queryable, clauses) do
       delete(content)
     end
   end
 
+  def findby_delete(queryable, clauses) do
+    case find_by(queryable, clauses) do
+      {:ok, content} -> delete(content)
+      _ -> {:ok, :pass}
+    end
+  end
+
   def findby_or_insert(queryable, clauses, attrs) do
     case queryable |> find_by(clauses) do
       {:ok, content} ->

lib/helper/orm.ex

@@ -124,7 +124,7 @@ defmodule GroupherServer.Test.PostComment do
       {:ok, reply} =
         CMS.reply_comment(:post, comment.id, %{community: community.raw, body: reply_body}, user)
 
-      PostComment |> ORM.find_delete(comment.id)
+      PostComment |> ORM.find_delete!(comment.id)
 
       {:error, _} = ORM.find(PostComment, comment.id)
       {:error, _} = ORM.find(PostComment, reply.id)