@@ -32,21 +32,6 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
3232def read_community ( % { raw: raw } = clauses ) , do: do_read_community ( clauses , raw )
3333def read_community ( % { title: title } = clauses ) , do: do_read_community ( clauses , title )
3434
35- defp do_read_community ( clauses , aka ) do
36- case ORM . read_by ( Community , clauses , inc: :views ) do
37- { :ok , community } -> { :ok , community }
38- { :error , _ } -> ORM . find_by ( Community , aka: aka )
39- end
40- end
41-
42- defp viewer_has_states ( { :ok , community } , % User { id: user_id } ) do
43- viewer_has_states = % { viewer_has_subscribed: user_id in community . meta . subscribed_user_ids }
44-
45- { :ok , Map . merge ( community , viewer_has_states ) }
46- end
47-
48- defp viewer_has_states ( { :error , reason } , _user ) , do: { :error , reason }
49-
5035@ doc """
5136 create a community
5237 """
@@ -220,6 +205,21 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
220205end
221206end
222207
208+ defp do_read_community ( clauses , aka ) do
209+ case ORM . read_by ( Community , clauses , inc: :views ) do
210+ { :ok , community } -> { :ok , community }
211+ { :error , _ } -> ORM . find_by ( Community , aka: aka )
212+ end
213+ end
214+
215+ defp viewer_has_states ( { :ok , community } , % User { id: user_id } ) do
216+ viewer_has_states = % { viewer_has_subscribed: user_id in community . meta . subscribed_user_ids }
217+
218+ { :ok , Map . merge ( community , viewer_has_states ) }
219+ end
220+
221+ defp viewer_has_states ( { :error , reason } , _user ) , do: { :error , reason }
222+
223223defp load_community_members ( % Community { id: id } , queryable , % { page: page , size: size } = filters )
224224when not is_nil ( id ) do
225225queryable