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

Enhanced version to start implemented content moderation feature

This commit is contained in:
Luca Frosini 2021-05-10 16:16:18 +02:00
parent 6fad1ba8d1
commit 7051a5b952
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -2,8 +2,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for gCube Catalogue (gCat) Service # Changelog for gCube Catalogue (gCat) Service
## [v2.1.0-SNAPSHOT]
-
## [v2.0.0] ## [v2.0.0]
- Fixed retrieving of filename from content-disposition http header used to persist a resource [#21216]
- Fixed author and maintainer name and email [#21059] [#21189] - Fixed author and maintainer name and email [#21059] [#21189]
- Improved check on controlled vocabulary to match corner cases [#20742] - Improved check on controlled vocabulary to match corner cases [#20742]
- Added PATCH method on Item collection [#19768] - Added PATCH method on Item collection [#19768]

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.data-catalogue</groupId> <groupId>org.gcube.data-catalogue</groupId>
<artifactId>gcat</artifactId> <artifactId>gcat</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.0.0</version> <version>2.1.0-SNAPSHOT</version>
<name>gCube Catalogue (gCat) Service</name> <name>gCube Catalogue (gCat) Service</name>
<description> <description>
This service allows any client to publish on the gCube Catalogue. This service allows any client to publish on the gCube Catalogue.

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

@ -118,8 +118,10 @@ public class CKANPackage extends CKAN {
protected String itemID; protected String itemID;
protected ScopeBean currentScopeBean; protected final ScopeBean currentScopeBean;
protected String currentContext; protected final String currentContext;
protected final CKANUser ckanUser;
protected String currentOrganizationName; protected String currentOrganizationName;
protected Set<String> supportedOrganizations; protected Set<String> supportedOrganizations;
@ -134,13 +136,17 @@ public class CKANPackage extends CKAN {
DELETE = ITEM_DELETE; DELETE = ITEM_DELETE;
PURGE = ITEM_PURGE; PURGE = ITEM_PURGE;
managedResources = new ArrayList<CKANResource>(); managedResources = new ArrayList<CKANResource>();
getCurrentContext(); currentContext = ContextUtility.getCurrentContext();
currentScopeBean = new ScopeBean(currentContext);
ckanUser = CKANUserCache.getCurrrentCKANUser();
getSupportedOrganizationsFromIS(); getSupportedOrganizationsFromIS();
} }
protected Set<String> getSupportedOrganizationsFromIS() { protected Set<String> getSupportedOrganizationsFromIS() {
if(supportedOrganizations == null) { if(supportedOrganizations == null) {
// TODO Add a VRE based cache
supportedOrganizations = new HashSet<>(); supportedOrganizations = new HashSet<>();
SimpleQuery query = ICFactory.queryFor(GenericResource.class); SimpleQuery query = ICFactory.queryFor(GenericResource.class);
@ -172,12 +178,11 @@ public class CKANPackage extends CKAN {
} }
CKANUser ckanUser = CKANUserCache.getCurrrentCKANUser();
for(String supportedOrganization : supportedOrganizations) { for(String supportedOrganization : supportedOrganizations) {
ckanUser.addUserToOrganization(supportedOrganization); ckanUser.addUserToOrganization(supportedOrganization);
} }
logger.debug("Supported CKAN Organization for current Context ({}) are {}", getCurrentContext(), logger.debug("Supported CKAN Organization for current Context ({}) are {}", currentContext,
supportedOrganizations); supportedOrganizations);
return supportedOrganizations; return supportedOrganizations;
} }
@ -190,14 +195,6 @@ public class CKANPackage extends CKAN {
return contextName.toLowerCase().replace(" ", "_"); return contextName.toLowerCase().replace(" ", "_");
} }
protected String getCurrentContext() {
if(currentContext == null) {
currentContext = ContextUtility.getCurrentContext();
currentScopeBean = new ScopeBean(currentContext);
}
return currentContext;
}
protected String getOrganizationName() { protected String getOrganizationName() {
if(currentOrganizationName == null) { if(currentOrganizationName == null) {
this.currentOrganizationName = CKANPackage.getOrganizationName(currentScopeBean); this.currentOrganizationName = CKANPackage.getOrganizationName(currentScopeBean);
@ -308,9 +305,6 @@ public class CKANPackage extends CKAN {
objectNode.remove(CAPACITY_KEY); objectNode.remove(CAPACITY_KEY);
} }
CKANUser ckanUser = CKANUserCache.getCurrrentCKANUser();
String authorName = ckanUser.getPortalUser().getFullName(); String authorName = ckanUser.getPortalUser().getFullName();
if(authorName==null || authorName.compareTo("")==0) { if(authorName==null || authorName.compareTo("")==0) {
authorName = ckanUser.getName(); authorName = ckanUser.getName();