diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index 8cd27e6..b8e21b0 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -202,7 +202,7 @@ public class GrsfPublisherFisheryService { List resources = HelperMethods.getResourcesFromBean(record, username); // if confirmed, set to visible TODO anyway if it is confirmed we should another method - boolean setPublic = record.getStatus() == org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status.Confirmed; + boolean setPublic = false; // check the license id String license = null; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index ce0cbd2..8b62e5f 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -25,6 +25,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseCreationBean import org.gcube.data_catalogue.grsf_publish_ws.utils.AssociationToGroupThread; import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods; import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue; +import org.gcube.datacatalogue.ckanutillibrary.models.ResourceBean; import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg; import org.gcube.datacatalogue.ckanutillibrary.utils.UtilMethods; import org.slf4j.LoggerFactory; @@ -88,18 +89,18 @@ public class GrsfPublisherStockService { ResponseCreationBean responseBean = new ResponseCreationBean(); Status status = Status.INTERNAL_SERVER_ERROR; String id = ""; - + // validate the bean logger.debug("Start validating bean..."); Response responseAfterValidation = HelperMethods.validateBeanAndResources(record); - + if(responseAfterValidation == null) logger.debug("Bean validation successful"); else{ - + logger.warn("Bean validation failed"); return responseAfterValidation; - + } try{ @@ -189,23 +190,10 @@ public class GrsfPublisherStockService { }else{ - // evaluate the resources TODO - // List resourcesRecord = record.getResources(); - // List resources = null; - // if(resourcesRecord != null && !resourcesRecord.isEmpty()){ - // resources = new ArrayList(); - // for (Resource res : resourcesRecord) { - // logger.debug("Trying to add resource " + res); - // if(res.getName() != null && res.getUrl() != null) - // resources.add(new ResourceBean(res.getUrl(), res.getName(), res.getDescription(), null, username, null, null)); - // else - // logger.warn("Unable to add resource because url or name is null"); - // } - // } + // evaluate the resources + List resources = HelperMethods.getResourcesFromBean(record, username); - - // if confirmed, set to visible TODO anyway if it is confirmed we should another method - boolean setPublic = record.getStatus() == org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status.Confirmed; + boolean setPublic = false; // check the license id String license = null; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java index b5c289d..ac72fce 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java @@ -23,7 +23,6 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group; import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag; import org.gcube.data_catalogue.grsf_publish_ws.json.input.Common; import org.gcube.data_catalogue.grsf_publish_ws.json.input.DatabaseSource; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.FisheryRecord; import org.gcube.data_catalogue.grsf_publish_ws.json.input.Resource; import org.gcube.data_catalogue.grsf_publish_ws.json.output.ResponseCreationBean; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Source; @@ -409,7 +408,7 @@ public abstract class HelperMethods { * @param record * @return */ - public static List getResourcesFromBean(FisheryRecord record, String username) { + public static List getResourcesFromBean(Common record, String username) { List toReturn = new ArrayList(); List databaseSources = record.getDatabaseSources();