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
cdfcc47a
Commit
cdfcc47a
authored
3 years ago
by
Kumar Gauraw
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-29323 fix: Fixed for visibility parent object
parent
381527dd
s-debug
AmiableAnil-patch-1
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
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-kube
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.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
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
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
search-api/search-actors/src/main/java/org/sunbird/actors/SearchActor.java
+1
-1
...-actors/src/main/java/org/sunbird/actors/SearchActor.java
search-api/search-service/app/controllers/SearchController.scala
+14
-8
...api/search-service/app/controllers/SearchController.scala
with
15 additions
and
9 deletions
+15
-9
search-api/search-actors/src/main/java/org/sunbird/actors/SearchActor.java
+
1
−
1
View file @
cdfcc47a
...
...
@@ -515,7 +515,7 @@ public class SearchActor extends SearchBaseActor {
properties
.
add
(
property
);
}
if
(
request
!=
null
&&
!
StringUtils
.
equalsIgnoreCase
((
String
)
request
.
getContext
().
getOrDefault
(
"setDefaultVisibility"
,
""
),
"
fals
e"
)
&&
setDefaultVisibility
(
filters
))
{
if
(
request
!=
null
&&
StringUtils
.
equalsIgnoreCase
((
String
)
request
.
getContext
().
getOrDefault
(
"setDefaultVisibility"
,
""
),
"
tru
e"
)
&&
setDefaultVisibility
(
filters
))
{
Map
<
String
,
Object
>
property
=
getFilterProperty
(
"visibility"
,
SearchConstants
.
SEARCH_OPERATION_EQUAL
,
Arrays
.
asList
(
new
String
[]
{
"Default"
}));
properties
.
add
(
property
);
}
...
...
This diff is collapsed.
Click to expand it.
search-api/search-service/app/controllers/SearchController.scala
+
14
−
8
View file @
cdfcc47a
...
...
@@ -9,6 +9,10 @@ import org.sunbird.search.util.SearchConstants
import
play.api.mvc.ControllerComponents
import
utils.
{
ActorNames
,
ApiId
}
import
java.util
import
org.apache.commons.lang3.StringUtils
import
org.sunbird.common.Platform
import
scala.collection.JavaConverters._
import
scala.concurrent.ExecutionContext
...
...
@@ -22,17 +26,19 @@ class SearchController @Inject()(@Named(ActorNames.SEARCH_ACTOR) searchActor: Ac
val
internalReq
=
getRequest
(
ApiId
.
APPLICATION_SEARCH
)
setHeaderContext
(
internalReq
)
val
filters
=
internalReq
.
getRequest
.
getOrDefault
(
SearchConstants
.
filters
,
new
java
.
util
.
HashMap
()).
asInstanceOf
[
java.util.Map
[
String
,
Object
]]
val
visibility
Object
=
filters
.
getOrDefault
(
"visibility"
,
""
)
va
r
visibility
:
util.
List
[
String
]
=
null
if
(
visibility
Object
!=
null
)
{
if
(
visibility
Object
.
isInstanceOf
[
util.ArrayList
[
_
]])
visibility
=
visibilityObject
.
asInstanceOf
[
util.Array
List
[
String
]]
else
if
(
visibilityObject
.
isInstanceOf
[
String
])
visibility
=
util
.
Arrays
.
asList
(
visibilityObject
.
asInstanceOf
[
String
]
)
val
visibility
Req
=
filters
.
getOrDefault
(
"visibility"
,
new
util
.
ArrayList
[
String
]()
)
va
l
visibility
:
List
[
String
]
=
visibilityReq
match
{
case
visibility
Req
:
util.List
[
_
]
=>
visibilityReq
.
asInstanceOf
[
util.List
[
String
]].
asScala
.
toList
.
map
(
x
=>
if
(
StringUtils
.
isNotBlank
(
x
))
x
.
toLowerCase
).
asInstanceOf
[
List
[
String
]]
case
visibility
Req
:
String
=>
List
(
visibilityReq
).
map
(
x
=>
if
(
StringUtils
.
isNotBlank
(
x
))
x
.
toLowerCase
)
.
asInstanceOf
[
List
[
String
]]
case
_
=>
List
(
)
}
if
(
visibility
.
contains
(
"Private"
))
{
if
(
visibility
.
nonEmpty
&&
visibility
.
contains
(
"private"
))
getErrorResponse
(
ApiId
.
APPLICATION_SEARCH
,
apiVersion
,
SearchConstants
.
ERR_ACCESS_DENIED
,
"Cannot access private content through public search api"
)
}
else
{
internalReq
.
getContext
.
put
(
SearchConstants
.
setDefaultVisibility
,
"true"
)
val
searchableVisibility
:
List
[
String
]
=
Platform
.
getStringList
(
"object.searchableVisibility"
,
util
.
Arrays
.
asList
(
"Default"
,
"Parent"
,
"Protected"
)).
asScala
.
toList
.
map
(
x
=>
x
.
toLowerCase
)
val
setDefaultVisibility
:
String
=
if
(
visibility
.
nonEmpty
&&
searchableVisibility
.
containsSlice
(
visibility
))
"false"
else
"true"
internalReq
.
getContext
.
put
(
SearchConstants
.
setDefaultVisibility
,
setDefaultVisibility
)
getResult
(
mgr
.
search
(
internalReq
,
searchActor
),
ApiId
.
APPLICATION_SEARCH
)
}
}
...
...
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