gCubeSystem
/
gcat
16
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Implemented count on items

This commit is contained in:
Luca Frosini 2021-02-03 16:48:42 +01:00
parent 7a434f999a
commit 4e479f0db0
4 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
View File

@ -326,6 +326,29 @@ public class CKANPackage extends CKAN {
}
}
public int count() {
Map<String,String> parameters = new HashMap<>();
if(uriInfo != null) {
MultivaluedMap<String,String> queryParameters = uriInfo.getQueryParameters();
parameters = checkListParameters(queryParameters, parameters);
}
int limit = 1;
parameters.put(ROWS_KEY, String.valueOf(limit));
int offset = 0;
parameters.put(START_KEY, String.valueOf(offset * limit));
if(!parameters.containsKey(GCatConstants.Q_KEY)) {
String filter = getFilterForOrganizations();
parameters.put(GCatConstants.Q_KEY, filter);
}
sendGetRequest(LIST, parameters);
int count = result.get(GCatConstants.COUNT_KEY).asInt();
return count;
}
@Override
public String list(int limit, int offset) {
Map<String,String> parameters = new HashMap<>();
@ -347,6 +370,11 @@ public class CKANPackage extends CKAN {
parameters = checkListParameters(queryParameters, parameters);
}
if(!parameters.containsKey(GCatConstants.Q_KEY)) {
String filter = getFilterForOrganizations();
parameters.put(GCatConstants.Q_KEY, filter);
}
return list(parameters);
}

31
src/main/java/org/gcube/gcat/rest/Item.java
View File

@ -33,6 +33,15 @@ public class Item extends REST<CKANPackage> implements org.gcube.gcat.api.interf
super(ITEMS, ITEM_ID_PARAMETER, CKANPackage.class);
}
/*
* Not used as REST method, implemented to respect {@link org.gcube.gcat.api.interfaces.Item} interface
*/
@Override
public int count() throws WebServiceException {
CKANPackage ckan = getInstance();
return ckan.count();
}
/*
* Not used as REST method, implemented to respect {@link org.gcube.gcat.api.interfaces.Item} interface
*/
@ -44,6 +53,28 @@ public class Item extends REST<CKANPackage> implements org.gcube.gcat.api.interf
@GET
@Produces(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8)
public String list(@QueryParam(GCatConstants.LIMIT_PARAMETER) @DefaultValue("10") int limit,
@QueryParam(GCatConstants.OFFSET_PARAMETER) @DefaultValue("0") int offset,
@QueryParam(GCatConstants.COUNT_ONLY_PARAMETER) @DefaultValue("false") Boolean countOnly) {
String ret = null;
if(countOnly) {
int count = count();
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("{\"");
stringBuilder.append(GCatConstants.COUNT_KEY);
stringBuilder.append("\":");
stringBuilder.append(count);
stringBuilder.append("}");
ret = stringBuilder.toString();
}else {
ret = list(limit, offset);
}
return ret;
}
/*
* Not used as REST method, implemented to respect {@link org.gcube.gcat.api.interfaces.Item} interface
*/
@Override
public String list(@QueryParam(GCatConstants.LIMIT_PARAMETER) @DefaultValue("10") int limit,
@QueryParam(GCatConstants.OFFSET_PARAMETER) @DefaultValue("0") int offset) {

19
src/test/java/org/gcube/gcat/ContextTest.java
View File

@ -48,11 +48,20 @@ public class ContextTest {
DEFAULT_TEST_SCOPE_NAME = "/gcube/devsec/devVRE";
}
public static String getCurrentScope(String token) throws ObjectNotFound, Exception {
public static String getCurrentContextFullName() {
String token = SecurityTokenProvider.instance.get();
AuthorizationEntry authorizationEntry = null;
try {
authorizationEntry = Constants.authorizationService().get(token);
} catch(Exception e) {
return ScopeProvider.instance.get();
}
return authorizationEntry.getContext();
}
public static String getContextFullName(String token) throws ObjectNotFound, Exception {
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
String context = authorizationEntry.getContext();
logger.info("Context of token {} is {}", token, context);
return context;
return authorizationEntry.getContext();
}
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
@ -68,7 +77,7 @@ public class ContextTest {
String qualifier = authorizationEntry.getQualifier();
Caller caller = new Caller(clientInfo, qualifier);
AuthorizationProvider.instance.set(caller);
ScopeProvider.instance.set(getCurrentScope(token));
ScopeProvider.instance.set(getContextFullName(token));
}
@BeforeClass

7
src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
View File

@ -45,6 +45,13 @@ public class CKANPackageTest extends ContextTest {
private static final String LICENSE_VALUE = "CC-BY-SA-4.0";
private static final String EXTRAS_TYPE_VALUE_VALUE = "TestEmptyProfile";
@Test
public void count() throws Exception {
CKANPackage ckanPackage = new CKANPackage();
int count = ckanPackage.count();
logger.debug("Number of items in {} is {}", ContextTest.getCurrentContextFullName(), count);
}
@Test
public void list() throws Exception {
CKANPackage ckanPackage = new CKANPackage();