Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 1302bf5

Browse files
committed
refactor(viewer-solution): fix nil meta
1 parent 43e57f1 commit 1302bf5

File tree

12 files changed

+25
-20
lines changed

12 files changed

+25
-20
lines changed

lib/groupher_server/cms/delegates/article_curd.ex

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
7878

7979
defp mark_viewer_has_states({:error, reason}, _), do: {:error, reason}
8080

81+
defp do_mark_viewer_has_states(nil, _) do
82+
%{
83+
viewer_has_collected: false,
84+
viewer_has_upvoted: false,
85+
viewer_has_viewed: false,
86+
viewer_has_reported: false
87+
}
88+
end
89+
8190
defp do_mark_viewer_has_states(meta, %User{id: user_id}) do
8291
# TODO: 根据是否付费进一步判断
8392
# user_is_member = true
@@ -375,10 +384,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
375384
defp update_content_result({:error, :update_content, result, _steps}), do: {:error, result}
376385
defp update_content_result({:error, :update_tag, result, _steps}), do: {:error, result}
377386

378-
defp content_id(:post, id), do: %{post_id: id}
379-
defp content_id(:job, id), do: %{job_id: id}
380-
defp content_id(:repo, id), do: %{repo_id: id}
381-
382387
# for create content step in Multi.new
383388
defp do_create_content(target, attrs, %Author{id: aid}, %Community{id: cid}) do
384389
target

lib/groupher_server_web/middleware/pagesize_proof.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ defmodule GroupherServerWeb.Middleware.PageSizeProof do
2929
# NOTE: c11n display_density should also linted by page limit,
3030
# otherwise dataloader will crash for empty extra items
3131
size = customization.display_density |> String.to_integer() |> min(@max_page_size)
32-
# size = 28
3332

3433
case Map.has_key?(arguments, :filter) do
3534
true ->

test/groupher_server/cms/post_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ defmodule GroupherServer.Test.CMS.Post do
2626
assert post.title == post_attrs.title
2727
end
2828

29-
@tag :wip2
29+
@tag :wip3
3030
test "read post should update views and meta viewed_user_list",
3131
~m(post_attrs community user user2)a do
3232
{:ok, post} = CMS.create_content(community, :post, post_attrs, user)

test/groupher_server_web/mutation/accounts/customization_test.exs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ defmodule GroupherServer.Test.Mutation.Account.Customization do
7272
}
7373
}
7474
"""
75+
@tag :wip2
7576
test "PageSizeProof middleware should lint c11n displayDensity size", ~m(user)a do
7677
user_conn = simu_conn(:user, user)
7778
db_insert_multi(:post, 50)

test/groupher_server_web/query/cms/article_reaction_users_test.exs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ defmodule GroupherServer.Test.Query.ArticleReactionUsers do
3636
}
3737
}
3838
"""
39-
@tag :wip2
39+
@tag :wip3
4040
test "guest can get upvoted users list after upvote to a post",
4141
~m(guest_conn post user user2)a do
4242
{:ok, _} = CMS.upvote_article(:post, post.id, user)
@@ -52,7 +52,7 @@ defmodule GroupherServer.Test.Query.ArticleReactionUsers do
5252
assert user_exist_in?(user2, results["entries"], :string_key)
5353
end
5454

55-
@tag :wip2
55+
@tag :wip3
5656
test "guest can get upvoted users list after upvote to a job",
5757
~m(guest_conn job user user2)a do
5858
{:ok, _} = CMS.upvote_article(:job, job.id, user)
@@ -89,7 +89,7 @@ defmodule GroupherServer.Test.Query.ArticleReactionUsers do
8989
}
9090
}
9191
"""
92-
@tag :wip2
92+
@tag :wip3
9393
test "guest can get collected users list after collect a post",
9494
~m(guest_conn post user user2)a do
9595
{:ok, _} = CMS.collect_article(:post, post.id, user)
@@ -105,7 +105,7 @@ defmodule GroupherServer.Test.Query.ArticleReactionUsers do
105105
assert user_exist_in?(user2, results["entries"], :string_key)
106106
end
107107

108-
@tag :wip2
108+
@tag :wip3
109109
test "guest can get collected users list after collect a job",
110110
~m(guest_conn job user user2)a do
111111
{:ok, _} = CMS.collect_article(:job, job.id, user)

test/groupher_server_web/query/cms/job_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defmodule GroupherServer.Test.Query.Job do
1919
}
2020
}
2121
"""
22-
@tag :wip2
22+
@tag :wip3
2323
test "basic graphql query on job with logined user", ~m(user_conn job)a do
2424
variables = %{id: job.id}
2525
results = user_conn |> query_result(@query, variables, "job")
@@ -30,7 +30,7 @@ defmodule GroupherServer.Test.Query.Job do
3030
assert length(Map.keys(results)) == 3
3131
end
3232

33-
@tag :wip2
33+
@tag :wip3
3434
test "basic graphql query on job with stranger(unloged user)", ~m(guest_conn job)a do
3535
variables = %{id: job.id}
3636
results = guest_conn |> query_result(@query, variables, "job")

test/groupher_server_web/query/cms/paged_jobs_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ defmodule GroupherServer.Test.Query.PagedJobs do
9797
}
9898
}
9999
"""
100-
@tag :wip2
100+
@tag :wip3
101101
test "has_xxx state should work", ~m(user)a do
102102
user_conn = simu_conn(:user, user)
103103
{:ok, community} = db_insert(:community)

test/groupher_server_web/query/cms/paged_posts_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ defmodule GroupherServer.Test.Query.PagedPosts do
170170
}
171171
}
172172
"""
173-
@tag :wip2
173+
@tag :wip3
174174
test "has_xxx state should work", ~m(user)a do
175175
user_conn = simu_conn(:user, user)
176176
{:ok, community} = db_insert(:community)

test/groupher_server_web/query/cms/paged_repos_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ defmodule GroupherServer.Test.Query.PagedRepos do
9393
}
9494
}
9595
"""
96-
@tag :wip2
96+
@tag :wip3
9797
test "has_xxx state should work", ~m(user)a do
9898
user_conn = simu_conn(:user, user)
9999
{:ok, community} = db_insert(:community)

test/groupher_server_web/query/cms/post_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defmodule GroupherServer.Test.Query.Post do
2828
}
2929
}
3030
"""
31-
@tag :wip2
31+
@tag :wip3
3232
test "basic graphql query on post with logined user",
3333
~m(user_conn community user post_attrs)a do
3434
{:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -43,7 +43,7 @@ defmodule GroupherServer.Test.Query.Post do
4343
assert length(Map.keys(results)) == 4
4444
end
4545

46-
@tag :wip2
46+
@tag :wip3
4747
test "basic graphql query on post with stranger(unloged user)", ~m(guest_conn post)a do
4848
variables = %{id: post.id}
4949
results = guest_conn |> query_result(@query, variables, "post")

0 commit comments

Comments
 (0)