Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit9cb321b

Browse files
committed
travis: remove warning && add apollo:push
1 parentac3f8fd commit9cb321b

File tree

10 files changed

+62
-28
lines changed

10 files changed

+62
-28
lines changed

‎.travis.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ addons:
88
postgresql:"9.4"
99
before_script:
1010
-MIX_ENV=test mix deps.get
11+
-nvm install 8.10 && nvm use 8.10
12+
-npm install -g apollo
1113
after_script:
1214
-MIX_ENV=test mix inch.report
15+
-apollo schema:publish
1316
script:
17+
-MIX_ENV=test mix compile --warnings-as-errors
1418
-mix test && MIX_ENV=test mix coveralls.travis
19+
cache:
20+
directories:
21+
-$HOME/.cargo
22+
-deps
23+
-_build

‎config/tmp.exs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
useMix.Config
2+
3+
config:mastani_server,MastaniServerWeb.Endpoint,
4+
http:[port:4001],
5+
debug_errors:true,
6+
code_reloader:true,
7+
check_origin:false,
8+
watchers:[]
9+
10+
config:logger,:console,format:"[$level] $message\n"
11+
12+
config:phoenix,:stacktrace_depth,20
13+
14+
# Configure your database
15+
config:mastani_server,MastaniServer.Repo,
16+
adapter:Ecto.Adapters.Postgres,
17+
username:"postgres",
18+
password:"postgres",
19+
database:"mastani_server_tmp",
20+
hostname:"localhost",
21+
pool_size:10
22+
23+
config:mastani_server,:github_oauth,
24+
client_id:"3b4281c5e54ffd801f85",
25+
client_secret:"68462fdbab195251bb71662eb2bc9dd2cb083305"

‎lib/helper/error_code.ex‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ defmodule Helper.ErrorCode do
2020
defecode(:already_did),do:@default_base+4
2121
defecode(:self_conflict),do:@default_base+5
2222
defecode(:react_fails),do:@default_base+6
23-
2423
# throttle
2524
defecode(:throttle_inverval),do:@throttle_base+1
2625
defecode(:throttle_hour),do:@throttle_base+2
2726
defecode(:throttle_day),do:@throttle_base+3
28-
2927
defecode,do:@default_base
30-
defecode(_),do:@default_base
28+
#def ecode(_), do: @default_base
3129
end

‎lib/mastani_server/accounts/delegates/achievements.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule MastaniServer.Accounts.Delegate.Achievements do
1515

1616
@favorite_weightget_config(:general,:user_achieve_favorite_weight)
1717
@star_weightget_config(:general,:user_achieve_star_weight)
18-
@watch_weightget_config(:general,:user_achieve_watch_weight)
18+
#@watch_weight get_config(:general, :user_achieve_watch_weight)
1919
@follow_weightget_config(:general,:user_achieve_follow_weight)
2020

2121
@doc"""
@@ -112,7 +112,7 @@ defmodule MastaniServer.Accounts.Delegate.Achievements do
112112
# end
113113

114114
@specsafe_minus(non_neg_integer(),non_neg_integer())::non_neg_integer()
115-
defpsafe_minus(count,unit\\1)whenis_integer(count)andis_integer(unit)andunit>0do
115+
defpsafe_minus(count,unit)whenis_integer(count)andis_integer(unit)andunit>0do
116116
casecount<=0do
117117
true->
118118
0

‎lib/mastani_server/accounts/delegates/billing.ex‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ defmodule MastaniServer.Accounts.Delegate.Billing do
5353
end
5454

5555
defpcan_purchase?(%User{}=_user,key)do
56-
casekeyinvalid_servicedo
56+
valid_service_options=valid_service()
57+
58+
casekeyinvalid_service_optionsdo
5759
true->{:ok,key}
5860
false->{:error,"AccountPurchase: purchase invalid service"}
5961
end

‎lib/mastani_server/accounts/utils/loader.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule MastaniServer.Accounts.Utils.Loader do
77
aliasHelper.QueryBuilder
88
aliasMastaniServer.{Accounts,CMS,Repo}
99

10-
aliasAccounts.{Achievement,UserFollower,UserFollowing}
10+
aliasAccounts.{UserFollower,UserFollowing}
1111

1212
defdata,do:Dataloader.Ecto.new(Repo,query:&query/2)
1313

@@ -48,11 +48,11 @@ defmodule MastaniServer.Accounts.Utils.Loader do
4848
CMS.JobFavorite|>count_cotents
4949
end
5050

51+
defquery(queryable,_args),do:queryable
52+
5153
defpcount_cotents(queryable)do
5254
queryable
5355
|>group_by([f],f.user_id)
5456
|>select([f],count(f.id))
5557
end
56-
57-
defquery(queryable,_args),do:queryable
5858
end

‎lib/mastani_server/cms/delegates/comment_curd.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ defmodule MastaniServer.CMS.Delegate.CommentCURD do
130130
|>ORM.next_count()
131131
end
132132

133-
defpdynamic_comment_where(:post,id),do:dynamic([c],c.post_id==^id)
134-
defpdynamic_comment_where(:job,id),do:dynamic([c],c.job_id==^id)
135-
136133
# for reply comment
137134
defpget_next_floor(thread,queryable,comment)do
138135
dynamic=dynamic_reply_where(thread,comment)
@@ -142,6 +139,9 @@ defmodule MastaniServer.CMS.Delegate.CommentCURD do
142139
|>ORM.next_count()
143140
end
144141

142+
defpdynamic_comment_where(:post,id),do:dynamic([c],c.post_id==^id)
143+
defpdynamic_comment_where(:job,id),do:dynamic([c],c.job_id==^id)
144+
145145
defpdynamic_reply_where(:post,comment),do:dynamic([c],c.post_id==^comment.post_id)
146146
defpdynamic_reply_where(:job,comment),do:dynamic([c],c.job_id==^comment.job_id)
147147
end

‎lib/mastani_server/cms/utils/loader.ex‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,6 @@ defmodule MastaniServer.CMS.Utils.Loader do
6262
forid<-post_ids,do:Map.get(results,id,[0])
6363
end
6464

65-
defbat_man(data)do
66-
# TODO refactor later
67-
data
68-
|>Enum.group_by(fn{x,_}->xend)
69-
|>Enum.map(fn{x,y}->
70-
{x,
71-
Enum.reduce(y,[],fnkv,acc->
72-
{_,v}=kv
73-
acc++[v]
74-
end)}
75-
end)
76-
|>Map.new()
77-
end
78-
7965
defrun_batch(PostComment,comment_query,:cp_users,post_ids,repo_opts)do
8066
# IO.inspect(comment_query, label: "# run_batch # comment_query")
8167

@@ -152,6 +138,19 @@ defmodule MastaniServer.CMS.Utils.Loader do
152138

153139
# TODO: use meta-programing to extract all query below
154140
# --------------------
141+
defbat_man(data)do
142+
# TODO refactor later
143+
data
144+
|>Enum.group_by(fn{x,_}->xend)
145+
|>Enum.map(fn{x,y}->
146+
{x,
147+
Enum.reduce(y,[],fnkv,acc->
148+
{_,v}=kv
149+
acc++[v]
150+
end)}
151+
end)
152+
|>Map.new()
153+
end
155154

156155
defquery(Author,_args)do
157156
# you cannot use preload with select together

‎lib/mastani_server/logs/user_activity.ex‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
defmoduleMastaniServer.Logs.UserActivitydo
2-
alias__MODULE__
2+
@moduledocfalse
3+
# alias __MODULE__
34

45
useEcto.Schema
56
importEcto.Changeset

‎lib/mastani_server_web/resolvers/accounts_resolver.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule MastaniServerWeb.Resolvers.Accounts do
77
aliasHelper.{Certification,ORM}
88
aliasMastaniServer.{Accounts,CMS}
99

10-
aliasAccounts.{Achievement,MentionMail,NotificationMail,SysNotificationMail,User}
10+
aliasAccounts.{MentionMail,NotificationMail,SysNotificationMail,User}
1111

1212
defuser(_root,%{id:id},_info),do:User|>ORM.find(id)
1313
defusers(_root,~m(filter)a,_info),do:User|>ORM.find_all(filter)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp