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
9a221702
Commit
9a221702
authored
4 years ago
by
rheafernandes
Browse files
Options
Download
Patches
Plain Diff
Added changes for answers and handling update hierarchy
parent
482b9b4b
schema-updates
3.9.0-prod-fix
4.1.0_fixes
AmiableAnil-patch-1
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
actors-test
bulk-upload-comptenecy-mapping
bulk-upload-excelsheet
bulk-upload-test_excel
bulk_upload
code-cleanup
csp-migration
dependabot/maven/platform-core/platform-telemetry/ch.qos.logback-logback-core-1.2.9
dependabot/maven/search-api/search-core/org.apache.httpcomponents-httpclient-4.5.13
knowlg-friday
knowlg-oneclick
local-setup-fix
local-setup-kube
m-4.2.0
master
master-data
org-target-enhancement
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
release-3.6.0
release-3.6.0.1
release-3.7.0
release-3.8.0
release-3.9.0
release-4.0.0
release-4.1.0
release-4.10.0
release-4.10.1
release-4.2.0
release-4.3.0
release-4.4.0
release-4.5.0
release-4.6.0
release-4.7.0
release-4.7.0-debug
release-4.8.0
release-4.8.0-debug
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.1
release-5.1.0
release-5.1.0-content
release-5.2.0
release-5.3.0
revert-718-visiblity-private-api
revert-719-assessment-private-read-api
revert-720-visiblity-public-search-api
revert-721-visiblity-private-search-api
review-4.1.0
s-debug
schema-update-4.0
release-5.2.0_RC2
release-5.2.0_RC1
release-5.1.0_RC1
release-5.0.0_RC2
release-5.0.0_RC1
release-4.10.0_RC2
release-4.10.0_RC1
release-4.9.1_RC1
release-4.9.0_RC8
release-4.9.0_RC7
release-4.9.0_RC6
release-4.9.0_RC5
release-4.9.0_RC4
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
release-4.8.0_RC5
release-4.8.0_RC4
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0_RC2
release-4.5.0_RC1
release-4.4.0_RC6
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0_RC10
release-4.3.0_RC9
release-4.3.0_RC8
release-4.3.0_RC7
release-4.3.0_RC6
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0_RC13
release-4.2.0_RC12
release-4.2.0_RC11
release-4.2.0_RC10
release-4.2.0_RC9
release-4.2.0_RC8
release-4.2.0_RC7
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.0_RC13
release-4.1.0_RC12
release-4.1.0_RC11
release-4.1.0_RC10
release-4.1.0_RC9
release-4.1.0_RC8
release-4.1.0_RC7
release-4.1.0_RC6
release-4.1.0_RC5
release-4.1.0_RC4
release-4.1.0_RC3
release-4.1.0_RC2
release-4.1.0_RC1
release-4.0.0_RC9
release-4.0.0_RC8
release-4.0.0_RC7
release-4.0.0_RC6
release-4.0.0_RC5
release-4.0.0_RC4
release-4.0.0_RC3
release-4.0.0_RC2
release-4.0.0_RC1
release-3.9.0_RC12
release-3.9.0_RC11
release-3.9.0_RC10
release-3.9.0_RC9
release-3.9.0_RC8
release-3.9.0_RC7
release-3.9.0_RC6
release-3.9.0_RC5
release-3.9.0_RC4
release-3.9.0_RC3
release-3.9.0_RC2
release-3.9.0_RC1
release-3.8.0_RC9
release-3.8.0_RC8
release-3.8.0_RC7
release-3.8.0_RC6
release-3.8.0_RC5
release-3.8.0_RC4
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC1
release-3.6.0_RC5
release-3.6.0_RC4
release-3.6.0_RC3
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+4
-4
...rc/main/scala/org/sunbird/managers/HierarchyManager.scala
schemas/question/1.0/config.json
+3
-0
schemas/question/1.0/config.json
with
7 additions
and
4 deletions
+7
-4
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+
4
−
4
View file @
9a221702
...
...
@@ -151,7 +151,7 @@ object HierarchyManager {
if
(
MapUtils
.
isEmpty
(
metadata
))
{
ResponseHandler
.
ERROR
(
ResponseCode
.
RESOURCE_NOT_FOUND
,
ResponseCode
.
RESOURCE_NOT_FOUND
.
name
(),
"bookmarkId "
+
bookmarkId
+
" does not exist"
)
}
else
{
ResponseHandler
.
OK
.
put
(
"
content
"
,
metadata
)
ResponseHandler
.
OK
.
put
(
"
question
"
,
metadata
)
}
})
}).
flatMap
(
f
=>
f
)
...
...
@@ -173,7 +173,7 @@ object HierarchyManager {
updateLatestLeafNodes
(
children
,
leafNodesMap
)
hierarchy
.
put
(
"children"
,
children
)
})
ResponseHandler
.
OK
.
put
(
"
content
"
,
hierarchy
)
ResponseHandler
.
OK
.
put
(
"
question
"
,
hierarchy
)
}
else
ResponseHandler
.
ERROR
(
ResponseCode
.
RESOURCE_NOT_FOUND
,
ResponseCode
.
RESOURCE_NOT_FOUND
.
name
(),
"rootId "
+
request
.
get
(
"rootId"
)
+
" does not exist"
)
})
...
...
@@ -403,7 +403,7 @@ object HierarchyManager {
if
(
StringUtils
.
isNotEmpty
(
hierarchy
.
getOrDefault
(
"status"
,
""
).
asInstanceOf
[
String
])
&&
statusList
.
contains
(
hierarchy
.
getOrDefault
(
"status"
,
""
).
asInstanceOf
[
String
]))
{
//TODO: Remove mapping
//val hierarchyMap = mapPrimaryCategories(hierarchy)
rootHierarchy
.
put
(
"
content
"
,
hierarchy
)
rootHierarchy
.
put
(
"
question
"
,
hierarchy
)
RedisCache
.
set
(
hierarchyPrefix
+
request
.
get
(
"rootId"
),
JsonUtils
.
serialize
(
hierarchy
))
Future
(
rootHierarchy
)
}
else
{
...
...
@@ -422,7 +422,7 @@ object HierarchyManager {
if
(!
bookmarkHierarchy
.
isEmpty
)
{
//TODO: Remove mapping
//val hierarchyMap = mapPrimaryCategories(bookmarkHierarchy)
rootHierarchy
.
put
(
"
content
"
,
hierarchy
)
rootHierarchy
.
put
(
"
question
"
,
hierarchy
)
RedisCache
.
set
(
hierarchyPrefix
+
request
.
get
(
"rootId"
),
JsonUtils
.
serialize
(
hierarchy
))
rootHierarchy
}
else
{
...
...
This diff is collapsed.
Click to expand it.
schemas/question/1.0/config.json
+
3
−
0
View file @
9a221702
...
...
@@ -27,6 +27,9 @@
},
"editorState"
:
{
"type"
:
"blob"
},
"answer"
:
{
"type"
:
"blob"
}
},
"primaryKey"
:
[
"identifier"
]
...
...
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