chore: Merge branch 'dev'

Author: mydearxym

lib/groupher_server/cms/utils/loader.ex

@@ -179,21 +179,37 @@ defmodule GroupherServer.CMS.Utils.Loader do
   # should use WINDOW function
   # see https://github.com/coderplanets/coderplanets_server/issues/16
   def query({"posts_comments", PostComment}, %{filter: filter, unique: true}) do
-    # PostComment
-    # |> QueryBuilder.filter_pack(filter)
-    # |> join(:inner, [c], a in assoc(c, :author))
-    # |> distinct([c, a], a.id)
-    # |> select([c, a], %{
-    # nickname: a.nickname,
-    # id: a.id,
-    # what_ever: row_number() |> over(partition_by: a.id)
-    # })
-
     PostComment
-    |> QueryBuilder.filter_pack(filter)
     |> join(:inner, [c], a in assoc(c, :author))
     |> distinct([c, a], a.id)
     |> select([c, a], a)
+
+    # |> select([c, a], %{
+    #   rankid: rank() |> over(partition_by: c.inserted_at),
+    #   id: a.id,
+    #   nickname: a.nickname
+    # })
+    # |> windows([rankid: [partition_by: c.inserted_at]]) 
+    # |> where([c, a], a.no < 3)
+    # |> select([c, a], rank() |>  over(partition_by: c.inserted_at))
+    # |> select([c, a], %{
+    #     nickname: a.nickname,
+
+    # working raw sql
+    # select * from(
+    #     select rank() over(partition by cid order by pinserted_at desc) as r, * from(
+    #         select c.id as cid,
+    #  c.body as cbody, 
+    #  p.inserted_at as pinserted_at, 
+    #  u.* from "cms_posts" as c join "posts_comments" as p on c.id= p.post_id join "users" as u on p.author_id= u.id) as view
+    # ) as v where r<= 3;
+
+    # backup -> 
+    # PostComment
+    # |> QueryBuilder.filter_pack(filter)
+    # |> join(:inner, [c], a in assoc(c, :author))
+    # |> distinct([c, a], a.id)
+    # |> select([c, a], a)
   end
 
   def query({"posts_comments", PostComment}, %{count: _, unique: true}) do

lib/groupher_server_web/middleware/cut_participators.ex

@@ -11,12 +11,16 @@ defmodule GroupherServerWeb.Middleware.CutParticipators do
   """
 
   @behaviour Absinthe.Middleware
-  @count 5
+  @default_length 5
 
   def call(%{errors: errors} = resolution, _) when length(errors) > 0, do: resolution
 
+  def call(%{value: value, arguments: %{filter: %{first: first}} = args} = resolution, _) do
+    %{resolution | value: value |> Enum.reverse() |> Enum.slice(0, first)}
+  end
+
   def call(%{value: value} = resolution, _) do
-    %{resolution | value: value |> Enum.slice(0, @count)}
+    %{resolution | value: value |> Enum.reverse() |> Enum.slice(0, @default_length)}
   end
 
   def call(resolution, _), do: resolution

lib/groupher_server_web/middleware/pagesize_proof.ex

@@ -24,7 +24,7 @@ defmodule GroupherServerWeb.Middleware.PageSizeProof do
       when not is_nil(customization) do
     # NOTE:  c11n display_density should also linted by page limit, 
     # otherwise dataloader will crash for empty extra items
-    size = customization.display_density |> String.to_integer() |> min(@max_page_size - 2)
+    size = customization.display_density |> String.to_integer() |> min(@max_page_size)
     # size = 28
 
     case Map.has_key?(arguments, :filter) do

lib/groupher_server_web/schema/utils/helper.ex

@@ -273,10 +273,10 @@ defmodule GroupherServerWeb.Schema.Utils.Helper do
         arg(:filter, :members_filter)
         arg(:unique, :unique_type, default_value: true)
 
-        middleware(M.ForceLoader)
+        # middleware(M.ForceLoader)
         middleware(M.PageSizeProof)
         resolve(dataloader(CMS, :comments))
-        # middleware(M.CutParticipators)
+        middleware(M.CutParticipators)
       end
 
       field(:paged_comments_participators, :paged_users) do

test/groupher_server_web/mutation/accounts/customization_test.exs

@@ -87,8 +87,7 @@ defmodule GroupherServer.Test.Mutation.Account.Customization do
 
       variables = %{filter: %{page: 1}}
       results = user_conn |> query_result(@paged_post_query, variables, "pagedPosts")
-      #  FIXME:   this 2 is magic number, otherwise it will crash the dataloader
-      assert results["pageSize"] == @max_page_size - 2
+      assert results["pageSize"] == @max_page_size
     end
 
     test "set single customization should merge not overwright other settings", ~m(user_conn)a do

test/groupher_server_web/query/cms/job_comment_test.exs

@@ -87,10 +87,9 @@ defmodule GroupherServer.Test.Query.JobComment do
       variables = %{thread: "JOB", filter: %{community: community.raw}}
       results = guest_conn |> query_result(@query, variables, "pagedJobs")
 
-      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length ==
-               10
+      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length == 5
 
-      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 10
+      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 5
     end
 
     test "can get paged commetns participators of a job", ~m(user guest_conn)a do

test/groupher_server_web/query/cms/post_comment_test.exs

@@ -143,52 +143,40 @@ defmodule GroupherServer.Test.Query.PostComment do
       }
     }
     """
-    @tag :pain_in_ass
-    test "top N per Group test", ~m(user guest_conn)a do
+    test "top N per Group test v2", ~m(user guest_conn)a do
       body = "this is a test comment"
 
       {:ok, community} = db_insert(:community)
       {:ok, post} = CMS.create_content(community, :post, mock_attrs(:post), user)
       {:ok, post2} = CMS.create_content(community, :post, mock_attrs(:post), user)
-      # {:ok, users_list} = db_insert_multi(:user, 10)
-
-      CMS.create_comment(:post, post.id, %{community: community.raw, body: body}, user)
-      CMS.create_comment(:post, post2.id, %{community: community.raw, body: body}, user)
-
-      variables = %{filter: %{community: community.raw}}
-      results = guest_conn |> query_result(@query, variables, "pagedPosts")
+      {:ok, users_list} = db_insert_multi(:user, 10)
+      {:ok, users_list2} = db_insert_multi(:user, 10)
 
-      # for test window function
-      _commentsParticipators = results["entries"]
-      # IO.inspect(commentsParticipators, label: "commentsParticipators->")
-    end
+      post_last_comment_user_id = users_list |> List.last() |> Map.get(:id)
+      post2_last_comment_user_id = users_list2 |> List.last() |> Map.get(:id)
 
-    # ~m(user guest_conn)a do
-    test "top N per Group test v2" do
-      # body = "this is a test comment"
+      Enum.each(
+        users_list,
+        &CMS.create_comment(:post, post.id, %{community: community.raw, body: body}, &1)
+      )
 
-      # {:ok, community} = db_insert(:community)
-      # {:ok, post} = CMS.create_content(community, :post, mock_attrs(:post), user)
-      # {:ok, post2} = CMS.create_content(community, :post, mock_attrs(:post), user)
-      # {:ok, users_list} = db_insert_multi(:user, 10)
-      # {:ok, users_list2} = db_insert_multi(:user, 10)
+      Enum.each(
+        users_list2,
+        &CMS.create_comment(:post, post2.id, %{community: community.raw, body: body}, &1)
+      )
 
-      # Enum.each(
-      # users_list,
-      # &CMS.create_comment(:post, post.id, %{body: body}, &1)
-      # )
+      variables = %{filter: %{community: community.raw}}
+      results = guest_conn |> query_result(@query, variables, "pagedPosts")
 
-      # Enum.each(
-      # users_list2,
-      # &CMS.create_comment(:post, post2.id, body, &1)
-      # )
+      first_result = results["entries"] |> List.first() |> Map.get("commentsParticipators")
+      last_result = results["entries"] |> List.last() |> Map.get("commentsParticipators")
 
-      # variables = %{filter: %{community: community.raw}}
-      # results = guest_conn |> query_result(@query, variables, "pagedPosts")
-      # commentsParticipators =
-      # results["entries"] |> List.first() |> Map.get("commentsParticipators")
+      assert 5 == first_result |> length
+      assert 5 == last_result |> length
 
-      # IO.inspect(commentsParticipators, label: "commentsParticipators->")
+      # 默认显示最新评论的登陆用户
+      assert to_string(post_last_comment_user_id) == first_result |> List.first() |> Map.get("id")
+      assert to_string(post2_last_comment_user_id) == last_result |> List.first() |> Map.get("id")
     end
   end
 

test/groupher_server_web/query/cms/repo_comment_test.exs

@@ -88,10 +88,9 @@ defmodule GroupherServer.Test.Query.RepoComment do
       variables = %{thread: "REPO", filter: %{community: community.raw}}
       results = guest_conn |> query_result(@query, variables, "pagedRepos")
 
-      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length ==
-               10
+      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length == 5
 
-      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 10
+      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 5
     end
 
     test "can get paged commetns participators of a repo", ~m(guest_conn user)a do

test/groupher_server_web/query/cms/video_comment_test.exs

@@ -92,10 +92,8 @@ defmodule GroupherServer.Test.Query.VideoComment do
       variables = %{thread: "VIDEO", filter: %{community: community.raw}}
       results = guest_conn |> query_result(@query, variables, "pagedVideos")
 
-      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length ==
-               10
-
-      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 10
+      assert results["entries"] |> List.first() |> Map.get("commentsParticipators") |> length == 5
+      assert results["entries"] |> List.last() |> Map.get("commentsParticipators") |> length == 5
     end
 
     test "can get paged commetns participators of a video", ~m(user guest_conn)a do