Implement organization support in unified search and fix bugs identified via integration tests #12717
Conversation
RusJaI
requested review from
tharindu1st,
AnuGayan,
chamilaadhi,
Arshardh,
dushaniw and
tgtshanika
as code owners
...carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/APIConstants.java
Outdated
Show resolved
Hide resolved
RusJaI
force-pushed
the
org_visibility
branch
2 times, most recently
from
bdca0eb to
134262e
Compare
RusJaI
changed the title
| @@ -4200,13 +4225,6 @@ public Map<String, Object> searchPaginatedContent(String searchQuery, String org | |||
| List<APIDefinitionContentSearchResult> defSearchList = new ArrayList<>(); | |||
| int totalLength = 0; | |||
|
|
|||
| String userame = (userNameWithoutChange != null) ? userNameWithoutChange : username; | |||
There was a problem hiding this comment.
do we have to remove this section? maybe we could keep this code unchanged
There was a problem hiding this comment.
That code block is not removed. Instead preserved the previous logic as it is and introduced a separate function for org visibility enabled flow
| String artifactPath = GovernanceUtils.getArtifactPath(registry, apiId); | ||
|
|
||
| //get API | ||
| Resource apiResource = registry.get(artifactPath); |
There was a problem hiding this comment.
In this method, we do couple of registry get actions to get the API's organization. I think we could pass the organization visibility from the method calling location instead of doing multiple registry calls. For example, API artifact is already retrieved in https://github.com/wso2/carbon-apimgt/pull/12717/files#diff-e193f41af36b63c9f226e35c981eeae30ee45850c880876c502785b547dbe00cR2635. you could get the organization information there and pass it to this method
| devportalFilterQueryField = VISIBLE_ORGANIZATIONS; | ||
| devportalFilterQuery = keyVal[1]; | ||
| } else { | ||
| devportalFilterQuery += (" AND visible_organizations_ss:" + keyVal[1]); |
There was a problem hiding this comment.
lets use constants here.
Fixes wso2/api-manager#3406