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

Commit 89b830a

Browse files
committed
chore: length issue
1 parent c110e31 commit 89b830a

File tree

16 files changed

+5
-24
lines changed

16 files changed

+5
-24
lines changed

lib/groupher_server/cms/delegates/article_curd.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
526526
defp result({:ok, %{set_viewer_has_states: result}}), do: result |> done()
527527
defp result({:ok, %{update_article_meta: result}}), do: {:ok, result}
528528

529-
defp result({:error, :create_article, _result, _steps}) do
529+
defp result({:error, :create_article, result, _steps}) do
530530
{:error, [message: "create article", code: ecode(:create_fails)]}
531531
end
532532

lib/groupher_server/cms/models/blog.ex

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ defmodule GroupherServer.CMS.Model.Blog do
1515

1616
@required_fields ~w(title digest)a
1717
@article_cast_fields general_article_cast_fields()
18-
@optional_fields ~w(link_addr digest length)a ++ @article_cast_fields
18+
@optional_fields ~w(link_addr digest)a ++ @article_cast_fields
1919

2020
@type t :: %Blog{}
2121
schema "cms_blogs" do
2222
field(:link_addr, :string)
23-
field(:length, :integer)
2423

2524
article_tags_field(:blog)
2625
article_communities_field(:blog)

lib/groupher_server/cms/models/job.ex

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defmodule GroupherServer.CMS.Model.Job do
1212
alias CMS.Model.Embeds
1313

1414
@timestamps_opts [type: :utc_datetime_usec]
15-
@required_fields ~w(title company digest length)a
15+
@required_fields ~w(title company digest)a
1616
@article_cast_fields general_article_cast_fields()
1717
@optional_fields @article_cast_fields ++ ~w(desc company_link link_addr copy_right)a
1818

@@ -24,7 +24,6 @@ defmodule GroupherServer.CMS.Model.Job do
2424

2525
field(:link_addr, :string)
2626
field(:copy_right, :string)
27-
field(:length, :integer)
2827

2928
article_tags_field(:job)
3029
article_communities_field(:job)

lib/groupher_server/cms/models/post.ex

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule GroupherServer.CMS.Model.Post do
1515

1616
@timestamps_opts [type: :utc_datetime_usec]
1717

18-
@required_fields ~w(title digest length)a
18+
@required_fields ~w(title digest)a
1919
@article_cast_fields general_article_cast_fields()
2020
@optional_fields ~w(link_addr copy_right is_question is_solved solution_digest)a ++
2121
@article_cast_fields
@@ -24,7 +24,6 @@ defmodule GroupherServer.CMS.Model.Post do
2424
schema "cms_posts" do
2525
field(:link_addr, :string)
2626
field(:copy_right, :string)
27-
field(:length, :integer)
2827

2928
field(:is_question, :boolean, default: false)
3029
field(:is_solved, :boolean, default: false)

lib/groupher_server_web/schema/Helper/fields.ex

-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ defmodule GroupherServerWeb.Schema.Helper.Fields do
168168
defmacro article_filter_fields do
169169
quote do
170170
field(:when, :when_enum)
171-
field(:length, :length_enum)
172171
field(:article_tag, :string)
173172
field(:article_tags, list_of(:string))
174173
field(:community, :string)

lib/groupher_server_web/schema/cms/cms_metrics.ex

-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ defmodule GroupherServerWeb.Schema.CMS.Metrics do
161161
# field(:sort, :sort_input)
162162
field(:when, :when_enum)
163163
field(:sort, :sort_enum)
164-
field(:length, :length_enum)
165164
# @desc "Matching a tag"
166165
# @desc "Added to the menu after this date"
167166
# field(:added_after, :datetime)

lib/groupher_server_web/schema/cms/cms_types.ex

-6
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
5858
general_article_fields()
5959
comments_fields()
6060

61-
field(:length, :integer)
6261
field(:link_addr, :string)
6362
field(:copy_right, :string)
6463

@@ -74,7 +73,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
7473
field(:desc, :string)
7574
field(:company, :string)
7675
field(:company_link, :string)
77-
field(:length, :integer)
7876
field(:link_addr, :string)
7977
field(:copy_right, :string)
8078

@@ -87,7 +85,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
8785
general_article_fields()
8886
comments_fields()
8987

90-
field(:length, :integer)
9188
field(:link_addr, :string)
9289

9390
timestamp_fields(:article)
@@ -99,7 +96,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
9996
general_article_fields()
10097
comments_fields()
10198

102-
field(:length, :integer)
10399
field(:link_addr, :string)
104100

105101
timestamp_fields(:article)
@@ -111,7 +107,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
111107
general_article_fields()
112108
comments_fields()
113109

114-
field(:length, :integer)
115110
field(:link_addr, :string)
116111

117112
timestamp_fields(:article)
@@ -123,7 +118,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
123118
general_article_fields()
124119
comments_fields()
125120

126-
field(:length, :integer)
127121
field(:link_addr, :string)
128122

129123
timestamp_fields(:article)

lib/groupher_server_web/schema/cms/mutations/blog.ex

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Blog do
1111
arg(:title, non_null(:string))
1212
arg(:body, non_null(:string))
1313
arg(:digest, non_null(:string))
14-
arg(:length, :integer)
1514
arg(:community_id, non_null(:id))
1615
arg(:link_addr, :string)
1716
arg(:thread, :thread, default_value: :blog)
@@ -29,7 +28,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Blog do
2928
arg(:title, :string)
3029
arg(:body, :string)
3130
arg(:digest, :string)
32-
arg(:length, :integer)
3331
arg(:link_addr, :string)
3432

3533
arg(:article_tags, list_of(:id))

lib/groupher_server_web/schema/cms/mutations/job.ex

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Job do
3434
arg(:title, :string)
3535
arg(:body, :string)
3636
arg(:digest, :string)
37-
arg(:length, :integer)
3837
arg(:copy_right, :string)
3938
arg(:desc, :string)
4039
arg(:link_addr, :string)

test/groupher_server/cms/articles/drink_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ defmodule GroupherServer.Test.Articles.Drink do
169169
assert article_doc.body == drink_doc.body
170170
end
171171

172-
@tag :wip
173172
test "delete drink should also delete related document", ~m(user community drink_attrs)a do
174173
{:ok, drink} = CMS.create_article(community, :drink, drink_attrs, user)
175174
{:ok, _article_doc} = ORM.find_by(ArticleDocument, %{article_id: drink.id, thread: "DRINK"})

test/groupher_server/cms/articles/guide_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ defmodule GroupherServer.Test.Articles.Guide do
169169
assert article_doc.body == guide_doc.body
170170
end
171171

172-
@tag :wip
173172
test "delete guide should also delete related document", ~m(user community guide_attrs)a do
174173
{:ok, guide} = CMS.create_article(community, :guide, guide_attrs, user)
175174
{:ok, _article_doc} = ORM.find_by(ArticleDocument, %{article_id: guide.id, thread: "GUIDE"})

test/groupher_server/cms/articles/meetup_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ defmodule GroupherServer.Test.Articles.Meetup do
171171
assert article_doc.body == meetup_doc.body
172172
end
173173

174-
@tag :wip
175174
test "delete meetup should also delete related document", ~m(user community meetup_attrs)a do
176175
{:ok, meetup} = CMS.create_article(community, :meetup, meetup_attrs, user)
177176

test/groupher_server/cms/articles/radar_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ defmodule GroupherServer.Test.Articles.Radar do
169169
assert article_doc.body == radar_doc.body
170170
end
171171

172-
@tag :wip
173172
test "delete radar should also delete related document", ~m(user community radar_attrs)a do
174173
{:ok, radar} = CMS.create_article(community, :radar, radar_attrs, user)
175174
{:ok, _article_doc} = ORM.find_by(ArticleDocument, %{article_id: radar.id, thread: "RADAR"})

test/groupher_server/cms/articles/works_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ defmodule GroupherServer.Test.Articles.Works do
169169
assert article_doc.body == works_doc.body
170170
end
171171

172-
@tag :wip
173172
test "delete works should also delete related document", ~m(user community works_attrs)a do
174173
{:ok, works} = CMS.create_article(community, :works, works_attrs, user)
175174
{:ok, _article_doc} = ORM.find_by(ArticleDocument, %{article_id: works.id, thread: "WORKS"})

test/groupher_server_web/mutation/cms/articles/job_test.exs

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
8787
assert exist_in?(%{id: article_tag.id}, job.article_tags)
8888
end
8989

90+
@tag :wip
9091
test "create job should excape xss attracts" do
9192
{:ok, user} = db_insert(:user)
9293
user_conn = simu_conn(:user, user)

test/groupher_server_web/mutation/cms/articles/meetup_test.exs

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ defmodule GroupherServer.Test.Mutation.Articles.Meetup do
8585
assert exist_in?(%{id: article_tag.id}, meetup.article_tags)
8686
end
8787

88-
@tag :wip
8988
test "create meetup should excape xss attracts" do
9089
{:ok, user} = db_insert(:user)
9190
user_conn = simu_conn(:user, user)

0 commit comments

Comments
 (0)