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
59050909
Commit
59050909
authored
3 years ago
by
Mahesh Kumar Gangula
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-14581 feat: schema and code fix for restricting schema.
parent
5be08c84
s-debug
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
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
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
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
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
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+1
-1
...n/scala/org/sunbird/managers/UpdateHierarchyManager.scala
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+1
-0
...src/main/scala/org/sunbird/utils/HierarchyConstants.scala
content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+2
-2
...n/scala/org/sunbird/managers/UpdateHierarchyManager.scala
content-api/hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+1
-0
...src/main/scala/org/sunbird/utils/HierarchyConstants.scala
platform-core/schema-validator/src/main/java/org/sunbird/schema/dto/ValidationResult.java
+2
-0
...rc/main/java/org/sunbird/schema/dto/ValidationResult.java
schemas/questionset/1.0/schema.json
+6
-0
schemas/questionset/1.0/schema.json
with
13 additions
and
3 deletions
+13
-3
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+
1
−
1
View file @
59050909
...
...
@@ -160,7 +160,7 @@ object UpdateHierarchyManager {
if
(
StringUtils
.
equalsIgnoreCase
(
HierarchyConstants
.
DEFAULT
,
child
.
get
(
HierarchyConstants
.
VISIBILITY
).
asInstanceOf
[
String
]))
{
getQuestionNode
(
child
.
getOrDefault
(
HierarchyConstants
.
IDENTIFIER
,
""
).
asInstanceOf
[
String
],
HierarchyConstants
.
TAXONOMY_ID
).
map
(
node
=>
{
node
.
getMetadata
.
put
(
HierarchyConstants
.
DEPTH
,
child
.
get
(
HierarchyConstants
.
DEPTH
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
,
child
.
get
(
HierarchyConstants
.
PARENT
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
_KEY
,
child
.
get
(
HierarchyConstants
.
PARENT
_KEY
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
INDEX
,
child
.
get
(
HierarchyConstants
.
INDEX
))
node
.
setObjectType
(
HierarchyConstants
.
QUESTION_OBJECT_TYPE
)
node
.
getMetadata
.
put
(
HierarchyConstants
.
OBJECT_TYPE
,
HierarchyConstants
.
QUESTION_OBJECT_TYPE
)
...
...
This diff is collapsed.
Click to expand it.
assessment-api/qs-hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+
1
−
0
View file @
59050909
...
...
@@ -11,6 +11,7 @@ object HierarchyConstants {
val
IDENTIFIER
:
String
=
"identifier"
val
DEPTH
:
String
=
"depth"
val
PARENT
:
String
=
"Parent"
val
PARENT_KEY
:
String
=
"parent"
val
INDEX
:
String
=
"index"
val
CHILDREN
:
String
=
"children"
val
VISIBILITY
:
String
=
"visibility"
...
...
This diff is collapsed.
Click to expand it.
content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/UpdateHierarchyManager.scala
+
2
−
2
View file @
59050909
...
...
@@ -165,7 +165,7 @@ object UpdateHierarchyManager {
if
(
StringUtils
.
equalsIgnoreCase
(
HierarchyConstants
.
DEFAULT
,
child
.
get
(
HierarchyConstants
.
VISIBILITY
).
asInstanceOf
[
String
]))
{
getContentNode
(
child
.
getOrDefault
(
HierarchyConstants
.
IDENTIFIER
,
""
).
asInstanceOf
[
String
],
HierarchyConstants
.
TAXONOMY_ID
).
map
(
node
=>
{
node
.
getMetadata
.
put
(
HierarchyConstants
.
DEPTH
,
child
.
get
(
HierarchyConstants
.
DEPTH
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
,
child
.
get
(
HierarchyConstants
.
PARENT
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
_KEY
,
child
.
get
(
HierarchyConstants
.
PARENT
_KEY
))
node
.
getMetadata
.
put
(
HierarchyConstants
.
INDEX
,
child
.
get
(
HierarchyConstants
.
INDEX
))
//TODO: Remove the Populate category mapping before updating for backward
HierarchyBackwardCompatibilityUtil
.
setContentAndCategoryTypes
(
node
.
getMetadata
,
node
.
getObjectType
)
...
...
@@ -412,7 +412,7 @@ object UpdateHierarchyManager {
private
def
populateHierarchyRelatedData
(
tempNode
:
Node
,
depth
:
Int
,
index
:
Int
,
parent
:
String
)
=
{
tempNode
.
getMetadata
.
put
(
HierarchyConstants
.
DEPTH
,
depth
.
asInstanceOf
[
AnyRef
])
tempNode
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
,
parent
.
replaceAll
(
".img"
,
""
))
tempNode
.
getMetadata
.
put
(
HierarchyConstants
.
PARENT
_KEY
,
parent
.
replaceAll
(
".img"
,
""
))
tempNode
.
getMetadata
.
put
(
HierarchyConstants
.
INDEX
,
index
.
asInstanceOf
[
AnyRef
])
}
...
...
This diff is collapsed.
Click to expand it.
content-api/hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyConstants.scala
+
1
−
0
View file @
59050909
...
...
@@ -15,6 +15,7 @@ object HierarchyConstants {
val
IDENTIFIER
:
String
=
"identifier"
val
DEPTH
:
String
=
"depth"
val
PARENT
:
String
=
"Parent"
val
PARENT_KEY
:
String
=
"parent"
val
INDEX
:
String
=
"index"
val
CHILDREN
:
String
=
"children"
val
VISIBILITY
:
String
=
"visibility"
...
...
This diff is collapsed.
Click to expand it.
platform-core/schema-validator/src/main/java/org/sunbird/schema/dto/ValidationResult.java
+
2
−
0
View file @
59050909
...
...
@@ -25,6 +25,8 @@ public class ValidationResult {
this
.
relations
=
relations
;
this
.
externalData
=
externalData
;
}
else
{
System
.
out
.
println
(
"Metadata: "
+
metadata
);
System
.
out
.
println
(
"Validation Errors: "
+
messages
);
throw
new
ClientException
(
ResponseCode
.
CLIENT_ERROR
.
name
(),
"Validation Errors"
,
messages
);
}
}
...
...
This diff is collapsed.
Click to expand it.
schemas/questionset/1.0/schema.json
+
6
−
0
View file @
59050909
...
...
@@ -121,6 +121,12 @@
"depth"
:
{
"type"
:
"number"
},
"index"
:
{
"type"
:
"number"
},
"parent"
:
{
"type"
:
"string"
},
"downloadUrl"
:
{
"type"
:
"string"
,
"format"
:
"url"
...
...
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