Skip to content

Commit 2acbf8a

Browse files
Update user_controller.ex
1 parent 82605a9 commit 2acbf8a

File tree

1 file changed

+39
-1
lines changed

1 file changed

+39
-1
lines changed

lib/cadet_web/controllers/user_controller.ex

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ defmodule CadetWeb.UserController do
77
use PhoenixSwagger
88

99
import Cadet.Assessments
10+
import Cadet.Collectibles
1011

1112
def index(conn, _) do
1213
user = conn.assigns.current_user
@@ -15,14 +16,37 @@ defmodule CadetWeb.UserController do
1516
story = user_current_story(user)
1617
xp = user_total_xp(user)
1718

19+
collectibles = user_collectibles(user)
20+
1821
render(
1922
conn,
2023
"index.json",
2124
user: user,
2225
grade: grade,
2326
max_grade: max_grade,
2427
story: story,
25-
xp: xp
28+
xp: xp,
29+
collectibles: collectibles,
30+
)
31+
end
32+
33+
def addCollectibles(conn, pic_nickname, pic_name) do
34+
user = conn.assigns.current_user
35+
grade = user_total_grade(user)
36+
max_grade = user_max_grade(user)
37+
story = user_current_story(user)
38+
xp = user_total_xp(user)
39+
collectibles = add_user_collectibles(user, pic_nickname, pic_name)
40+
41+
render(
42+
conn,
43+
"index.json",
44+
user: user,
45+
grade: grade,
46+
max_grade: max_grade,
47+
story: story,
48+
xp: xp,
49+
collectibles: collectibles,
2650
)
2751
end
2852

@@ -39,6 +63,15 @@ defmodule CadetWeb.UserController do
3963
response(401, "Unauthorised")
4064
end
4165

66+
swagger_path :addCollectibles do
67+
post("/user")
68+
summary("add one collectible to the user")
69+
security([%{JWT: []}])
70+
response(200, "OK")
71+
response(400, "Invalid parameters")
72+
response(401, "Unauthorised")
73+
end
74+
4275
def swagger_definitions do
4376
%{
4477
UserInfo:
@@ -73,6 +106,11 @@ defmodule CadetWeb.UserController do
73106
:integer,
74107
"Amount of xp. Only provided for 'Student'." <> "Value will be 0 for non-students."
75108
)
109+
110+
collectibles(
111+
:map,
112+
"Collectibles users obtained in story." <> " Value will be empty map for non-students."
113+
)
76114
end
77115
end,
78116
UserStory:

0 commit comments

Comments
 (0)