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

Commit 43e57f1

Browse files
committed
refactor(viewer-solution): remove viewer states and test
1 parent 837fc73 commit 43e57f1

File tree

9 files changed

+16
-29
lines changed

9 files changed

+16
-29
lines changed

lib/groupher_server/cms/delegates/article_curd.ex

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -279,19 +279,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
279279

280280
defp domain_filter_query(queryable, _filter), do: queryable
281281

282-
# query if user has viewed before
283-
defp read_state_query(queryable, %{read: true} = _filter, user) do
284-
queryable
285-
|> join(:inner, [content, f, c], viewers in assoc(content, :viewers))
286-
|> where([content, f, c, viewers], viewers.user_id == ^user.id)
287-
end
288-
289-
defp read_state_query(queryable, %{read: false} = _filter, _user) do
290-
queryable
291-
end
292-
293-
defp read_state_query(queryable, _, _), do: queryable
294-
295282
defp add_pin_contents_ifneed(contents, querable, %{community: _community} = filter) do
296283
with {:ok, _} <- should_add_pin?(filter),
297284
{:ok, info} <- match(querable),
@@ -318,10 +305,10 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
318305
defp add_pin_contents_ifneed(contents, _querable, _filter), do: contents
319306

320307
# if filter contains like: tags, sort.., then don't add pin content
321-
defp should_add_pin?(%{page: 1, tag: :all, sort: :desc_inserted, read: :all} = filter) do
308+
defp should_add_pin?(%{page: 1, tag: :all, sort: :desc_inserted} = filter) do
322309
filter
323310
|> Map.keys()
324-
|> Enum.reject(fn x -> x in [:community, :tag, :sort, :read, :page, :size] end)
311+
|> Enum.reject(fn x -> x in [:community, :tag, :sort, :page, :size] end)
325312
|> case do
326313
[] -> {:ok, :pass}
327314
_ -> {:error, :pass}

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 :wip3
29+
@tag :wip2
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/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 :wip3
39+
@tag :wip2
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 :wip3
55+
@tag :wip2
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 :wip3
92+
@tag :wip2
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 :wip3
108+
@tag :wip2
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 :wip3
22+
@tag :wip2
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 :wip3
33+
@tag :wip2
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 :wip3
100+
@tag :wip2
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 :wip3
173+
@tag :wip2
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 :wip3
96+
@tag :wip2
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 :wip3
31+
@tag :wip2
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 :wip3
46+
@tag :wip2
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")

test/groupher_server_web/query/cms/repo_test.exs

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

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

0 commit comments

Comments
 (0)