Enable API Resources APIs for organization level #6002
Conversation
ShanChathusanda93
force-pushed
the
org-path-api-res-branch
branch
2 times, most recently
from
8a510db
to
39fa1e2
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6002 +/- ##
============================================
+ Coverage 39.62% 40.08% +0.46%
+ Complexity 14299 14183 -116
============================================
Files 1733 1736 +3
Lines 119948 117466 -2482
Branches 19808 19516 -292
============================================
- Hits 47525 47086 -439
+ Misses 65115 63129 -1986
+ Partials 7308 7251 -57
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
ShanChathusanda93
force-pushed
the
org-path-api-res-branch
branch
from
39fa1e2
to
1dba26c
Compare
| return filterQueryBuilder.getFilterAttributeValue().get(1).contains("internal") || | ||
| filterQueryBuilder.getFilterAttributeValue().get(1).contains("console"); |
There was a problem hiding this comment.
Don't we have an existing constant for internal and console?
| @@ -445,6 +475,18 @@ public List<Scope> getScopesByTenantId(Integer tenantId, List<ExpressionNode> ex | |||
| appendFilterQuery(expressionNodes, filterQueryBuilder, true); | |||
| String query = SQLConstants.GET_SCOPES_BY_TENANT_ID + filterQueryBuilder.getFilterQuery() + | |||
| SQLConstants.GET_SCOPES_BY_TENANT_ID_TAIL; | |||
| try { | |||
| if (OrganizationManagementUtil.isOrganization(tenantId) && !isInternalFiltering(filterQueryBuilder)) { | |||
There was a problem hiding this comment.
According to the logic in isInternalFiltering method, internal_org.. scopes also get considered , is that means internal_org.. scopes can't be searched ?
ShanChathusanda93
force-pushed
the
org-path-api-res-branch
branch
from
1dba26c
to
ce692d6
Compare
| @@ -49,6 +49,14 @@ | |||
| description="Delete API resources"/> | |||
| </Scopes> | |||
| </APIResource> | |||
| <APIResource name="API Resource Management API" identifier="/o/api/server/v1/api-resources" | |||
There was a problem hiding this comment.
shall we update the xml files as well for consistency
| @@ -65,10 +65,18 @@ public class SQLConstants { | |||
| "DESCRIPTION, TENANT_ID, TYPE, REQUIRES_AUTHORIZATION FROM API_RESOURCE WHERE "; | |||
| public static final String GET_API_RESOURCES_TAIL = | |||
| " (TENANT_ID = %d OR TENANT_ID IS NULL) ORDER BY CURSOR_KEY %s LIMIT %d"; | |||
| public static final String GET_API_RESOURCES_TAIL_FOR_ORGANIZATIONS = | |||
| " (TENANT_ID = %d OR TENANT_ID IS NULL) AND TYPE != 'TENANT' AND TYPE != 'SYSTEM' " + | |||
There was a problem hiding this comment.
Shall we use the equal conditions for types rather than not equal conditions because if we add another type for root organization those will be reflected in organization API responses.
There was a problem hiding this comment.
Also can we go for this pattern for more readability TYPE NOT IN ('TENANT', 'SYSTEM') or
TYPE IN ('<X>', '<Y>')
Proposed changes in this pull request
Follow up actions