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
3d8ab935
Commit
3d8ab935
authored
4 years ago
by
Mahesh Kumar Gangula
Browse files
Options
Download
Patches
Plain Diff
Issue #000 fix: add "Default visibility" for Content, Collection, Question and QuestionSet.
parent
fa0694fe
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
release-3.6.0_RC2
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
+23
-1
...-actors/src/main/java/org/sunbird/actors/SearchActor.java
search-api/search-actors/src/test/java/org/sunbird/actors/SearchActorTest.java
+2
-1
...ors/src/test/java/org/sunbird/actors/SearchActorTest.java
with
25 additions
and
2 deletions
+25
-2
search-api/search-actors/src/main/java/org/sunbird/actors/SearchActor.java
+
23
−
1
View file @
3d8ab935
...
...
@@ -514,13 +514,35 @@ public class SearchActor extends SearchBaseActor {
Map
<
String
,
Object
>
property
=
getFilterProperty
(
"status"
,
SearchConstants
.
SEARCH_OPERATION_EQUAL
,
Arrays
.
asList
(
new
String
[]
{
"Live"
}));
properties
.
add
(
property
);
}
if
(!
filters
.
containsKey
(
"visibility"
))
{
if
(
setDefaultVisibility
(
filters
))
{
Map
<
String
,
Object
>
property
=
getFilterProperty
(
"visibility"
,
SearchConstants
.
SEARCH_OPERATION_EQUAL
,
Arrays
.
asList
(
new
String
[]
{
"Default"
}));
properties
.
add
(
property
);
}
return
properties
;
}
private
List
<
String
>
getObjectTypesWithVisibility
()
{
List
<
String
>
objectTypes
=
Platform
.
getStringList
(
"object.withVisibility"
,
Arrays
.
asList
(
"content"
,
"collection"
,
"question"
,
"questionset"
));
if
(
CollectionUtils
.
isEmpty
(
objectTypes
))
{
return
new
ArrayList
<
String
>();
}
else
{
List
<
String
>
finalObjectTypes
=
new
ArrayList
<
String
>(
objectTypes
);
finalObjectTypes
.
addAll
(
objectTypes
.
stream
().
map
(
s
->
s
+
"image"
).
collect
(
Collectors
.
toList
()));
return
finalObjectTypes
;
}
}
private
boolean
setDefaultVisibility
(
Map
<
String
,
Object
>
filters
)
{
boolean
hasVisibility
=
filters
.
containsKey
(
"visibility"
);
if
(!
hasVisibility
)
{
List
<
String
>
objectTypes
=
((
List
<
String
>)
filters
.
getOrDefault
(
SearchConstants
.
objectType
,
new
ArrayList
<
String
>()))
.
stream
().
map
(
s
->
s
.
toLowerCase
()).
collect
(
Collectors
.
toList
());
List
<
String
>
configObjectTypes
=
getObjectTypesWithVisibility
();
return
CollectionUtils
.
containsAny
(
configObjectTypes
,
objectTypes
);
}
else
return
false
;
}
private
Map
<
String
,
Object
>
getFilterProperty
(
String
propName
,
String
operation
,
Object
value
)
{
return
new
HashMap
<
String
,
Object
>()
{{
put
(
SearchConstants
.
operation
,
operation
);
...
...
This diff is collapsed.
Click to expand it.
search-api/search-actors/src/test/java/org/sunbird/actors/SearchActorTest.java
+
2
−
1
View file @
3d8ab935
...
...
@@ -779,8 +779,9 @@ public class SearchActorTest extends SearchBaseActorTest {
req
.
put
(
"searchResult"
,
result
);
Response
resp
=
getSearchResponse
(
req
);
result
=
resp
.
getResult
();
System
.
out
.
println
(
"Result: "
+
result
);
Assert
.
assertNotNull
(
result
.
get
(
"content"
));
List
<
Object
>
contents
=
(
List
<
Object
>)
result
.
getOrDefault
(
"content"
,
new
ArrayList
<
Object
>());
Assert
.
assertEquals
(
contents
.
size
(),
35
);
}
@Test
...
...
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