refactor(notify): refactor account mailbox tests

Author: mydearxym

lib/groupher_server/accounts/accounts.ex

@@ -62,6 +62,7 @@ defmodule GroupherServer.Accounts do
   # upvoted articles
   defdelegate paged_upvoted_articles(user_id, filter), to: UpvotedArticles
 
+  defdelegate mailbox_status(user), to: Mailbox
   defdelegate update_mailbox_status(user_id), to: Mailbox
 
   # customization

lib/groupher_server/accounts/delegates/mailbox.ex

@@ -1,10 +1,19 @@
 defmodule GroupherServer.Accounts.Delegate.Mailbox do
   import Ecto.Query, warn: false
 
+  import Helper.Utils, only: [done: 1]
+
   alias GroupherServer.{Accounts, Delivery}
-  alias Accounts.Model.User
+
+  alias Accounts.Model.{Embeds, User}
   alias Helper.ORM
 
+  @default_mailbox_status Embeds.UserMailbox.default_status()
+
+  def mailbox_status(%User{mailbox: nil}), do: @default_mailbox_status |> done
+  def mailbox_status(%User{mailbox: mailbox}), do: mailbox |> done
+
+  @doc "update messages count in mailbox"
   def update_mailbox_status(user_id) do
     with {:ok, user} <- ORM.find(User, user_id),
          {:ok, unread_mentions_count} <- Delivery.unread_count(:mention, user_id),

lib/groupher_server/accounts/models/embeds/user_mailbox.ex

@@ -7,10 +7,19 @@ defmodule GroupherServer.Accounts.Model.Embeds.UserMailbox do
 
   import Ecto.Changeset
 
-  @optional_fields ~w(reported_count)a
+  @optional_fields ~w(is_empty unread_total_count unread_mentions_count unread_notifications_count)a
+
+  def default_status() do
+    %{
+      is_empty: true,
+      unread_total_count: 0,
+      unread_mentions_count: 0,
+      unread_notifications_count: 0
+    }
+  end
 
   embedded_schema do
-    field(:is_empty, :boolean, default: false)
+    field(:is_empty, :boolean, default: true)
     field(:unread_total_count, :integer, default: 0)
     field(:unread_mentions_count, :integer, default: 0)
     field(:unread_notifications_count, :integer, default: 0)

lib/groupher_server/delivery/delegates/mention.ex

@@ -37,6 +37,9 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
         false -> {:error, "insert mentions error"}
       end
     end)
+    |> Multi.run(:update_user_mailbox_status, fn _, _ ->
+      Enum.each(mentions, &Accounts.update_mailbox_status(&1.to_user_id)) |> done
+    end)
     |> Repo.transaction()
     |> result()
   end
@@ -58,6 +61,9 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
         false -> {:error, "insert mentions error"}
       end
     end)
+    |> Multi.run(:update_user_mailbox_status, fn _, _ ->
+      Enum.each(mentions, &Accounts.update_mailbox_status(&1.to_user_id)) |> done
+    end)
     |> Repo.transaction()
     |> result()
   end

lib/groupher_server/delivery/delegates/notification.ex

@@ -12,7 +12,9 @@ defmodule GroupherServer.Delivery.Delegate.Notification do
   alias GroupherServer.{Accounts, Delivery, Repo}
   alias Delivery.Model.Notification
   alias Accounts.Model.User
+
   alias Helper.ORM
+  alias Ecto.Multi
 
   @notify_actions get_config(:general, :nofity_actions)
   @notify_group_interval_hour get_config(:general, :notify_group_interval_hour)
@@ -21,12 +23,23 @@ defmodule GroupherServer.Delivery.Delegate.Notification do
     with true <- action in @notify_actions,
          true <- is_valid?(attrs),
          true <- user_id !== from_user.id do
-      from_user = from_user |> Map.take([:login, :nickname]) |> Map.put(:user_id, from_user.id)
-
-      case find_exist_notify(attrs, :latest_peroid) do
-        {:ok, notify} -> merge_notification(notify, from_user)
-        {:error, _} -> create_notification(attrs, from_user)
-      end
+      Multi.new()
+      |> Multi.run(:upsert_notifications, fn _, _ ->
+        from_user =
+          from_user
+          |> Map.take([:login, :nickname])
+          |> Map.put(:user_id, from_user.id)
+
+        case find_exist_notify(attrs, :latest_peroid) do
+          {:ok, notify} -> merge_notification(notify, from_user)
+          {:error, _} -> create_notification(attrs, from_user)
+        end
+      end)
+      |> Multi.run(:update_user_mailbox_status, fn _, %{upsert_notifications: nofity} ->
+        Accounts.update_mailbox_status(nofity.user_id)
+      end)
+      |> Repo.transaction()
+      |> result()
     else
       false -> {:error, "invalid args for notification"}
       error -> error
@@ -38,19 +51,27 @@ defmodule GroupherServer.Delivery.Delegate.Notification do
     attrs = attrs |> Map.put(:from_user, from_user)
 
     with {:ok, notifications} <- find_exist_notify(attrs, :all) do
-      Enum.each(notifications, fn notify ->
-        case length(notify.from_users) == 1 do
-          # 只有一就删除记录
-          true ->
-            ORM.delete(notify)
-
-          # 如果是多人集合就在 from_users 中删除该用户
-          false ->
-            from_users = Enum.reject(notify.from_users, &(&1.login == from_user.login))
-            notify |> ORM.update_embed(:from_users, from_users)
-        end
+      Multi.new()
+      |> Multi.run(:revoke_notifications, fn _, _ ->
+        Enum.each(notifications, fn notify ->
+          case length(notify.from_users) == 1 do
+            # 只有一就删除记录
+            true ->
+              ORM.delete(notify)
+
+            # 如果是多人集合就在 from_users 中删除该用户
+            false ->
+              from_users = Enum.reject(notify.from_users, &(&1.login == from_user.login))
+              notify |> ORM.update_embed(:from_users, from_users)
+          end
+        end)
+        |> done
       end)
-      |> done
+      |> Multi.run(:update_user_mailbox_status, fn _, _ ->
+        Enum.each(notifications, &Accounts.update_mailbox_status(&1.to_user_id)) |> done
+      end)
+      |> Repo.transaction()
+      |> result()
     else
       false -> {:ok, :pass}
       {:error, _} -> {:ok, :pass}
@@ -191,4 +212,8 @@ defmodule GroupherServer.Delivery.Delegate.Notification do
   defp interval_threshold_time() do
     Timex.shift(Timex.now(), hours: -@notify_group_interval_hour)
   end
+
+  defp result({:ok, %{upsert_notifications: result}}), do: {:ok, result}
+  defp result({:ok, %{revoke_notifications: result}}), do: {:ok, result}
+  defp result({:error, _, result, _steps}), do: {:error, result}
 end

lib/groupher_server_web/resolvers/accounts_resolver.ex

@@ -220,8 +220,7 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
     Accounts.paged_editable_communities(cur_user, filter)
   end
 
-  # TODO: refactor
-  def get_mail_box_status(_root, _args, %{context: %{cur_user: cur_user}}) do
+  def mailbox_status(_root, _args, %{context: %{cur_user: cur_user}}) do
     Accounts.mailbox_status(cur_user)
   end
 
@@ -243,10 +242,6 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
     Accounts.fetch_notifications(cur_user, filter)
   end
 
-  def fetch_sys_notifications(_root, %{filter: filter}, %{context: %{cur_user: cur_user}}) do
-    Accounts.fetch_sys_notifications(cur_user, filter)
-  end
-
   def mark_notification_read(_root, %{id: id}, %{context: %{cur_user: cur_user}}) do
     Accounts.mark_mail_read(%NotificationMail{id: id}, cur_user)
   end

lib/groupher_server_web/resolvers/delivery_resolver.ex

@@ -7,7 +7,7 @@ defmodule GroupherServerWeb.Schema do
   import GroupherServerWeb.Schema.Helper.Imports
 
   alias GroupherServerWeb.Middleware, as: M
-  alias GroupherServerWeb.Schema.{Account, Billing, CMS, Delivery, Statistics, Helper}
+  alias GroupherServerWeb.Schema.{Account, Billing, CMS, Statistics, Helper}
 
   import_types(Absinthe.Type.Custom)
 
@@ -29,11 +29,6 @@ defmodule GroupherServerWeb.Schema do
   import_types(Statistics.Queries)
   import_types(Statistics.Mutations)
 
-  # delivery
-  import_types(Delivery.Types)
-  import_types(Delivery.Queries)
-  import_types(Delivery.Mutations)
-
   # cms
   import_types(CMS.Types)
   import_types(CMS.Queries)
@@ -48,7 +43,6 @@ defmodule GroupherServerWeb.Schema do
     import_fields(:account_queries)
     import_fields(:billing_queries)
     import_fields(:statistics_queries)
-    import_fields(:delivery_queries)
     import_fields(:cms_queries)
   end
 
@@ -59,8 +53,6 @@ defmodule GroupherServerWeb.Schema do
     import_fields(:billing_mutations)
     # statistics
     import_fields(:statistics_mutations)
-    # delivery
-    import_fields(:delivery_mutations)
     # cms
     import_fields(:cms_mutation_community)
     import_fields(:cms_opertion_mutations)

lib/groupher_server_web/schema.ex

@@ -35,14 +35,14 @@ defmodule GroupherServerWeb.Schema.Account.Queries do
       resolve(&R.Accounts.subscribed_communities/3)
     end
 
-    @desc "get user's mentions"
-    field :mentions, :paged_mentions do
-      arg(:filter, :messages_filter)
-
-      middleware(M.Authorize, :login)
-      middleware(M.PageSizeProof)
-      resolve(&R.Accounts.fetch_mentions/3)
-    end
+    # @desc "get user's mentions"
+    # field :mentions, :paged_mentions do
+    #   arg(:filter, :messages_filter)
+
+    #   middleware(M.Authorize, :login)
+    #   middleware(M.PageSizeProof)
+    #   resolve(&R.Accounts.fetch_mentions/3)
+    # end
 
     @desc "get user's follower"
     field :paged_followers, :paged_users do

lib/groupher_server_web/schema/account/account_queries.ex

@@ -82,38 +82,21 @@ defmodule GroupherServerWeb.Schema.Account.Types do
     # 3. has_notifications ?
     # 4. has_watches ?
 
-    field :mail_box, :mail_box_status do
+    field :mailbox, :mailbox_status do
       middleware(M.Authorize, :login)
-      resolve(&R.Accounts.get_mail_box_status/3)
-    end
-
-    field :mentions, :paged_mentions do
-      arg(:filter, :messages_filter)
-
-      middleware(M.Authorize, :login)
-      middleware(M.PageSizeProof)
-      resolve(&R.Accounts.fetch_mentions/3)
-    end
-
-    field :notifications, :paged_notifications do
-      arg(:filter, :messages_filter)
-
-      middleware(M.Authorize, :login)
-      middleware(M.PageSizeProof)
-      resolve(&R.Accounts.fetch_notifications/3)
-    end
-
-    field :sys_notifications, :paged_sys_notifications do
-      arg(:filter, :messages_filter)
-
-      middleware(M.Authorize, :login)
-      middleware(M.PageSizeProof)
-      resolve(&R.Accounts.fetch_sys_notifications/3)
+      resolve(&R.Accounts.mailbox_status/3)
     end
 
     timestamp_fields()
   end
 
+  object :mailbox_status do
+    field(:is_empty, :boolean)
+    field(:unread_total_count, :integer)
+    field(:unread_mentions_count, :integer)
+    field(:unread_notifications_count, :integer)
+  end
+
   # field(:sidebar_layout, :map)
   object :customization do
     field(:theme, :string)