From 291b542d61b875b93917453411bc3788084b59c8 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Thu, 1 Dec 2016 21:41:24 +0000
Subject: [PATCH] stock_name and fishery_name cannot be null

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135198 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../grsf_publish_ws/json/input/FisheryRecord.java         | 3 ++-
 .../grsf_publish_ws/json/input/StockRecord.java           | 6 ++++--
 .../services/GrsfPublisherFisheryService.java             | 8 +++++++-
 .../services/GrsfPublisherStockService.java               | 6 ++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
index f3d44a5..588f86c 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField;
 import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group;
@@ -23,7 +24,7 @@ public class FisheryRecord extends Common{
 
 	@JsonProperty("fishery_name")
 	@NotNull(message="fishery_name cannot be null")
-	//	@Size(min=1, message="fishery_name cannot be empty")
+	@Size(min=1, message="fishery_name cannot be empty")
 	@CustomField(key="Fishery Name")
 	private String fisheryName;
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java
index bd0f7eb..dfb447f 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java
@@ -3,6 +3,8 @@ package org.gcube.data_catalogue.grsf_publish_ws.json.input;
 import java.util.List;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.CustomField;
 import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Group;
@@ -22,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class StockRecord extends Common{
 
 	@JsonProperty("stock_name")
-	//	@NotNull(message="stock_name cannot be null")
-	//	@Size(min=2, message="stock_name cannot be empty")
+	@NotNull(message="stock_name cannot be null")
+	@Size(min=2, message="stock_name cannot be empty")
 	@CustomField(key="Stock Name")
 	private String stockName;
 
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 42d38a6..e5ba991 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
@@ -185,12 +185,18 @@ public class GrsfPublisherFisheryService {
 						record.setProductType(Record_Type.FISHERY.getOrigName());
 
 						// evaluate the tags of the product
-						Set<String> tags = new HashSet<String>();
+						Set<String> tags = new HashSet<String>();						
 						CommonUtils.getTags(tags, record);
 
 						// evaluate the groups
 						Set<String> groups = new HashSet<String>();
 						CommonUtils.getGroups(groups, record);
+						
+						// add the tag and group for the other sources
+						if(!sourceInPath.equals(Sources.GRSF)){
+							tags.add(sourceInPath.getOrigName());
+							groups.add(sourceInPath.getOrigName());
+						}
 
 						// evaluate the custom fields
 						Map<String, List<String>> customFields = record.getExtrasFields();
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 311afaa..cfd236b 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
@@ -181,6 +181,12 @@ public class GrsfPublisherStockService {
 						// evaluate the groups
 						Set<String> groups = new HashSet<String>();
 						CommonUtils.getGroups(groups, record);
+						
+						// add the tag and group for the other sources
+						if(!sourceInPath.equals(Sources.GRSF)){
+							tags.add(sourceInPath.getOrigName());
+							groups.add(sourceInPath.getOrigName());
+						}
 
 						// evaluate the custom fields
 						Map<String, List<String>> customFields = record.getExtrasFields();