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

Commit f5a459b

Browse files
committed
refactor(community): add default index to community
1 parent 36b87ef commit f5a459b

File tree

8 files changed

+21
-9
lines changed

8 files changed

+21
-9
lines changed

lib/mastani_server/cms/community.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defmodule MastaniServer.CMS.Community do
2121

2222
@required_fields ~w(title desc user_id logo raw)a
2323
# @required_fields ~w(title desc user_id)a
24-
@optional_fields ~w(label geo_info)a
24+
@optional_fields ~w(label geo_info index)a
2525

2626
schema "communities" do
2727
field(:title, :string)
@@ -30,6 +30,7 @@ defmodule MastaniServer.CMS.Community do
3030
# field(:category, :string)
3131
field(:label, :string)
3232
field(:raw, :string)
33+
field(:index, :integer)
3334
field(:geo_info, :map)
3435

3536
belongs_to(:author, Accounts.User, foreign_key: :user_id)

lib/mastani_server_web/schema/cms/cms_types.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ defmodule MastaniServerWeb.Schema.CMS.Types do
252252
field(:title, :string)
253253
field(:desc, :string)
254254
field(:raw, :string)
255+
field(:index, :integer)
255256
field(:logo, :string)
256257
field(:author, :user, resolve: dataloader(CMS, :author))
257258
field(:threads, list_of(:thread), resolve: dataloader(CMS, :threads))
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
defmodule MastaniServer.Repo.Migrations.AddDefaultIndexToCommunity do
2+
use Ecto.Migration
3+
4+
def change do
5+
alter table(:communities) do
6+
add(:index, :integer, default: 100_000)
7+
end
8+
end
9+
end

test/mastani_server_web/mutation/cms/post_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ defmodule MastaniServer.Test.Mutation.Post do
7070
assert user_conn |> mutation_get_error?(@create_post_query, variables)
7171
end
7272

73-
@tag :wip
7473
test "can create post with tags" do
7574
{:ok, user} = db_insert(:user)
7675
user_conn = simu_conn(:user, user)
@@ -93,7 +92,6 @@ defmodule MastaniServer.Test.Mutation.Post do
9392
assert post.tags |> Enum.any?(&(&1.id == tag2.id))
9493
end
9594

96-
@tag :wip
9795
test "can create post with mentionUsers" do
9896
{:ok, user} = db_insert(:user)
9997
{:ok, user2} = db_insert(:user)

test/mastani_server_web/mutation/delivery/delivery_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ defmodule MastaniServer.Test.Mutation.Delivery do
150150
}
151151
}
152152
"""
153-
@tag :wip
154153
test "login user can mention other user" do
155154
{:ok, user} = db_insert(:user)
156155
{:ok, user2} = db_insert(:user)
@@ -173,7 +172,6 @@ defmodule MastaniServer.Test.Mutation.Delivery do
173172
assert user.id == mentions.entries |> List.first() |> Map.get(:from_user_id)
174173
end
175174

176-
@tag :wip
177175
test "unauth user send mention fails", ~m(guest_conn)a do
178176
{:ok, user2} = db_insert(:user)
179177

test/mastani_server_web/query/accounts/account_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ defmodule MastaniServer.Test.Query.Account.Basic do
3636
}
3737
}
3838
"""
39-
@tag :wip
4039
test "guest user can get specific user's info by user's id", ~m(guest_conn user)a do
4140
variables = %{id: user.id}
4241
results = guest_conn |> query_result(@query, variables, "user")
@@ -48,7 +47,6 @@ defmodule MastaniServer.Test.Query.Account.Basic do
4847
assert results["cmsPassport"] == nil
4948
end
5049

51-
@tag :wip
5250
test "login user can get it's own profile", ~m(user_conn user)a do
5351
results = user_conn |> query_result(@query, %{}, "user")
5452
assert results["id"] == to_string(user.id)

test/mastani_server_web/query/accounts/mention_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ defmodule MastaniServer.Test.Query.Accounts.Mention do
2626
}
2727
}
2828
"""
29-
@tag :wip
3029
test "auth user can get it's own mailbox status" do
3130
{:ok, [user, user2]} = db_insert_multi(:user, 2)
3231

@@ -75,7 +74,6 @@ defmodule MastaniServer.Test.Query.Accounts.Mention do
7574
}
7675
}
7776
"""
78-
@tag :wip
7977
test "auth user can get it's own mentions" do
8078
{:ok, [user, user2]} = db_insert_multi(:user, 2)
8179

test/mastani_server_web/query/cms/cms_test.exs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ defmodule MastaniServer.Test.Query.CMS.Basic do
5050
entries {
5151
id
5252
title
53+
index
5354
categories {
5455
id
5556
title
@@ -74,6 +75,14 @@ defmodule MastaniServer.Test.Query.CMS.Basic do
7475
assert results["totalCount"] == 5 + 1
7576
end
7677

78+
test "community has default index = 100000", ~m(guest_conn)a do
79+
{:ok, _communities} = db_insert_multi(:community, 5)
80+
variables = %{filter: %{page: 1, size: 20}}
81+
results = guest_conn |> query_result(@query, variables, "pagedCommunities")
82+
83+
results["entries"] |> Enum.all?(fn x -> x["index"] == 100_000 end)
84+
end
85+
7786
test "guest user can get paged communities based on category", ~m(guest_conn)a do
7887
{:ok, category1} = db_insert(:category)
7988
{:ok, category2} = db_insert(:category)

0 commit comments

Comments
 (0)