Commitcec6713

committed

subscribe typo

1 parentaae6232 commitcec6713Copy full SHA for cec6713

File tree

+15

-15

lines changed

lib
- mastani_server_web
  - resolvers
    - accounts_resolver.ex
  - schema/account
    - account_queries.ex
- mastani_server/accounts
  - accounts.ex
test
- mastani_server_web/query
  - account_test.exs
- mastani_server/cms
  - cms_test.exs

+15

-15

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ defmodule MastaniServer.Accounts do`
`31`	`31`	`end`
`32`	`32`	`end`
`33`	`33`
`34`		`-defsubscried_communities(%User{id:id},%{page:page,size:size}=filter)do`
	`34`	`+defsubscribed_communities(%User{id:id},%{page:page,size:size}=filter)do`
`35`	`35`	`CMS.CommunitySubscriber`
`36`	`36`	`\|>where([c],c.user_id==^id)`
`37`	`37`	`\|>join(:inner,[c],ccinassoc(c,:community))`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`defmoduleMastaniServerWeb.Resolvers.Accountsdo`
	`2`	`+importShortMaps`
	`3`	`+`
`2`	`4`	`aliasMastaniServer.Accounts`
`3`	`5`	`aliasHelper.ORM`
`4`	`6`
`@@ -8,8 +10,8 @@ defmodule MastaniServerWeb.Resolvers.Accounts do`
`8`	`10`	`Accounts.github_signin(github_user)`
`9`	`11`	`end`
`10`	`12`
`11`		`-defsubscried_communities(_root,%{id:id,filter:filter},_info)do`
`12`		`-Accounts.subscried_communities(%Accounts.User{id:id},filter)`
	`13`	`+defsubscribed_communities(_root,~m(user_idfilter)a,_info)do`
	`14`	`+Accounts.subscribed_communities(%Accounts.User{id:user_id},filter)`
`13`	`15`	`end`
`14`	`16`
`15`	`17`	`# def create_user(_root, args, %{context: %{cur_user: %{root: true}}}) do`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,13 @@ defmodule MastaniServerWeb.Schema.Account.Queries do`
`23`	`23`	`resolve(&Resolvers.Accounts.user/3)`
`24`	`24`	`end`
`25`	`25`
`26`		`-@desc"get login user's subscried communities"`
`27`		`-field:subscried_communities,:paged_communitiesdo`
`28`		`-# TODO`
`29`		`-arg(:id,non_null(:id))`
	`26`	`+@desc"anyone can get anyone's subscribed communities"`
	`27`	`+field:subscribed_communities,:paged_communitiesdo`
	`28`	`+arg(:user_id,non_null(:id))`
`30`	`29`	`arg(:filter,non_null(:paged_filter))`
`31`	`30`
`32`	`31`	`middleware(M.PageSizeProof)`
`33`		`-resolve(&Resolvers.Accounts.subscried_communities/3)`
	`32`	`+resolve(&Resolvers.Accounts.subscribed_communities/3)`
`34`	`33`	`middleware(M.FormatPagination)`
`35`	`34`	`end`
`36`	`35`	`end`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,11 +173,10 @@ defmodule MastaniServer.Test.CMSTest do`
`173`	`173`
`174`	`174`	`describe"[cms community subscribe]"do`
`175`	`175`	`test"user can subscribe a community",~m(user community)ado`
`176`		`-{:ok,subscriber}=`
	`176`	`+{:ok,record}=`
`177`	`177`	`CMS.subscribe_community(%Accounts.User{id:user.id},%CMS.Community{id:community.id})`
`178`	`178`
`179`		`-assertuser.id==subscriber.user_id`
`180`		`-assertcommunity.id==subscriber.community_id`
	`179`	`+assertcommunity.id==record.id`
`181`	`180`	`end`
`182`	`181`
`183`	`182`	`test"user can get paged-subscribers of a community",~m(community)ado`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ defmodule MastaniServer.Test.Query.AccountTest do`
`84`	`84`	`end`
`85`	`85`
`86`	`86`	`@query"""`
`87`		`- querysubscriedCommunities($id: ID!, $filter: PagedFilter!) {`
`88`		`-subscriedCommunities(id: $id, filter: $filter) {`
	`87`	`+ querysubscribedCommunities($userId: ID!, $filter: PagedFilter!) {`
	`88`	`+subscribedCommunities(userId: $userId, filter: $filter) {`
`89`	`89`	`entries {`
`90`	`90`	`title`
`91`	`91`	`}`
`@@ -104,8 +104,8 @@ defmodule MastaniServer.Test.Query.AccountTest do`
`104`	`104`	`&CMS.subscribe_community(%Accounts.User{id:user.id},%CMS.Community{id:&1.id})`
`105`	`105`	`)`
`106`	`106`
`107`		`-variables=%{id:user.id,filter:%{page:1,size:10}}`
`108`		`-results=guest_conn\|>query_result(@query,variables,"subscriedCommunities")`
	`107`	`+variables=%{userId:user.id,filter:%{page:1,size:10}}`
	`108`	`+results=guest_conn\|>query_result(@query,variables,"subscribedCommunities")`
`109`	`109`
`110`	`110`	`assertresults\|>is_valid_pagination?`
`111`	`111`	`end`

Comments

(0)