From d56343164b914867c9068b7e7c2976fcf03453a9 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Fri, 13 Oct 2023 09:08:00 +0200
Subject: [PATCH] added fields required by the Irish tender

---
 .../dhp/schema/oaf/OpenAccessColor.java       | 11 ++++
 .../eu/dnetlib/dhp/schema/oaf/Result.java     | 55 +++++++++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessColor.java

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessColor.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessColor.java
new file mode 100644
index 0000000..3e4b250
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessColor.java
@@ -0,0 +1,11 @@
+
+package eu.dnetlib.dhp.schema.oaf;
+
+/**
+ * The OpenAccess color meant to be used on the result level
+ */
+public enum OpenAccessColor {
+
+	gold, hybrid, bronze
+
+}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index 9ea7801..8964f11 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -21,17 +21,13 @@ public class Result extends OafEntity implements Serializable {
 	/**
 	 * ( article | book ) processing charges.
  	 */
-
 	private Field<String> processingchargeamount;
 
-
 	/**
 	 * currency - alphabetic code describe in ISO-4217.
 	 */
 	private Field<String> processingchargecurrency;
 
-
-
 	/**
 	 * The Author.
 	 */
@@ -144,7 +140,13 @@ public class Result extends OafEntity implements Serializable {
 	 */
 	private List<EoscIfGuidelines> eoscifguidelines;
 
+	private Boolean isGreen;
 
+	private OpenAccessColor openAccessColor;
+
+	private Boolean isInDiamondJournal;
+
+	private Boolean publiclyFunded;
 
 	public Field<String> getProcessingchargeamount() {
 		return processingchargeamount;
@@ -548,6 +550,38 @@ public class Result extends OafEntity implements Serializable {
 		this.eoscifguidelines = eoscifguidelines;
 	}
 
+	public Boolean getGreen() {
+		return isGreen;
+	}
+
+	public void setGreen(Boolean green) {
+		isGreen = green;
+	}
+
+	public OpenAccessColor getOpenAccessColor() {
+		return openAccessColor;
+	}
+
+	public void setOpenAccessColor(OpenAccessColor openAccessColor) {
+		this.openAccessColor = openAccessColor;
+	}
+
+	public Boolean getInDiamondJournal() {
+		return isInDiamondJournal;
+	}
+
+	public void setInDiamondJournal(Boolean inDiamondJournal) {
+		isInDiamondJournal = inDiamondJournal;
+	}
+
+	public Boolean getPubliclyFunded() {
+		return publiclyFunded;
+	}
+
+	public void setPubliclyFunded(Boolean publiclyFunded) {
+		this.publiclyFunded = publiclyFunded;
+	}
+
 	/**
 	 * Is an enrichment boolean.
 	 *
@@ -560,7 +594,6 @@ public class Result extends OafEntity implements Serializable {
 				&& ModelConstants.PROVENANCE_ENRICH.equalsIgnoreCase(e.getDataInfo().getProvenanceaction().getClassid());
 	}
 
-
 	/**
 	 * Normalize pid string.
 	 *
@@ -684,11 +717,11 @@ public class Result extends OafEntity implements Serializable {
 
 		//ENRICH measures
 		if (enrichment.getMeasures()!=null)
-			if (currentInstance.getMeasures() == null)
+			if (currentInstance.getMeasures() == null) {
 				currentInstance.setMeasures(enrichment.getMeasures());
-			else
+			} else {
 				enrichment.getMeasures().forEach(currentInstance.getMeasures()::add);
-
+			}
 	}
 
 
@@ -712,11 +745,11 @@ public class Result extends OafEntity implements Serializable {
 
 		toEnrichInstances.forEach(i -> {
 			final List<Instance> e = findEnrichmentsByPID(i.getPid(), ri);
-			if (e!= null && e.size()> 0) {
+			if (e!= null && !e.isEmpty()) {
 				e.forEach(enr -> applyEnrichment(i, enr));
 			} else {
 				final List<Instance> a = findEnrichmentsByPID(i.getAlternateIdentifier(), ri);
-				if (a!= null && a.size()> 0) {
+				if (a!= null && !a.isEmpty()) {
 					a.forEach(enr -> applyEnrichment(i, enr));
 				}
 			}
@@ -740,8 +773,6 @@ public class Result extends OafEntity implements Serializable {
 			processingchargecurrency = r.getProcessingchargecurrency();
 		}
 
-
-
 		eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());
 
 		if( !isAnEnrichment(this) && !isAnEnrichment(e))