Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
aca9027e
Commit
aca9027e
authored
5 years ago
by
Pradyumna Nagendra
Browse files
Options
Download
Patches
Plain Diff
Issue #devcon fix: School API fix
parent
06d16494
devcon-2020
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
learning-api/content-service/app/controllers/v3/TeacherController.scala
+1
-1
...ontent-service/app/controllers/v3/TeacherController.scala
learning-api/orchestrator/src/main/java/org/sunbird/actors/SchoolActor.java
+2
-2
...strator/src/main/java/org/sunbird/actors/SchoolActor.java
with
3 additions
and
3 deletions
+3
-3
learning-api/content-service/app/controllers/v3/TeacherController.scala
+
1
−
1
View file @
aca9027e
...
...
@@ -54,7 +54,7 @@ class TeacherController @Inject()(@Named(ActorNames.SCHOOL_ACTOR) schoolActor: A
val
body
=
requestBody
()
val
content
=
body
.
getOrElse
(
"teacher"
,
new
java
.
util
.
HashMap
()).
asInstanceOf
[
java.util.Map
[
String
,
Object
]]
content
.
putAll
(
headers
)
content
.
putAll
(
Map
(
"se
ssion
Id"
->
identifier
))
content
.
putAll
(
Map
(
"
u
se
r
Id"
->
identifier
))
val
contentRequest
=
getRequest
(
content
,
headers
,
"getUserData"
)
setRequestContext
(
contentRequest
,
version
,
objectType
,
schemaName
)
getResult
(
"api.teacher.profile"
,
schoolActor
,
contentRequest
)
...
...
This diff is collapsed.
Click to expand it.
learning-api/orchestrator/src/main/java/org/sunbird/actors/SchoolActor.java
+
2
−
2
View file @
aca9027e
...
...
@@ -65,7 +65,7 @@ public class SchoolActor extends BaseActor {
String
objectType
=
(
String
)
request
.
getContext
().
get
(
"objectType"
);
String
sessionid
=
""
;
if
(
StringUtils
.
equalsIgnoreCase
(
"Teacher"
,
objectType
))
{
sessionid
=
"teacher_"
+
request
.
get
(
"se
ssion
Id"
);
sessionid
=
"teacher_"
+
request
.
get
(
"
u
se
r
Id"
);
}
else
{
sessionid
=
"attendance_"
+
request
.
get
(
"sessionId"
);
}
...
...
@@ -84,7 +84,7 @@ public class SchoolActor extends BaseActor {
String
objectType
=
(
String
)
request
.
getContext
().
get
(
"objectType"
);
String
sessionid
=
""
;
if
(
StringUtils
.
equalsIgnoreCase
(
"Teacher"
,
objectType
))
{
sessionid
=
"teacher_"
+
request
.
get
(
"se
ssion
Id"
);
sessionid
=
"teacher_"
+
request
.
get
(
"
u
se
r
Id"
);
}
else
{
sessionid
=
"attendance_"
+
request
.
get
(
"sessionId"
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets