From 0327320b53820f268eafe8614dbe0a5d998dfd5b Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Fri, 10 Feb 2023 16:50:19 +0100
Subject: [PATCH] [UsageCount] Added measure at the level of the OafEntity

---
 .../eu/dnetlib/dhp/schema/oaf/OafEntity.java  | 25 +++++++++++++++++++
 .../eu/dnetlib/dhp/schema/oaf/Result.java     | 23 ++---------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
index 0411821..be3bf83 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
@@ -21,6 +21,29 @@ public abstract class OafEntity extends Oaf implements Serializable {
 
 	private OAIProvenance oaiprovenance;
 
+	/**
+	 * The Measures.
+	 */
+	private List<Measure> measures;
+
+	/**
+	 * Gets measures.
+	 *
+	 * @return the measures
+	 */
+	public List<Measure> getMeasures() {
+		return measures;
+	}
+
+	/**
+	 * Sets measures.
+	 *
+	 * @param measures the measures
+	 */
+	public void setMeasures(List<Measure> measures) {
+		this.measures = measures;
+	}
+
 	public String getId() {
 		return id;
 	}
@@ -94,6 +117,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
 
 		if (e.getOaiprovenance() != null && compareTrust(this, e) < 0)
 			oaiprovenance = e.getOaiprovenance();
+
+		measures = mergeLists(measures, e.getMeasures());
 	}
 
 	@SafeVarargs
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 ff0246b..0027fc4 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -30,10 +30,7 @@ public class Result extends OafEntity implements Serializable {
 	 */
 	private Field<String> processingchargecurrency;
 
-	/**
-	 * The Measures.
-	 */
-	private List<Measure> measures;
+
 
 	/**
 	 * The Author.
@@ -147,23 +144,7 @@ public class Result extends OafEntity implements Serializable {
 	 */
 	private List<EoscIfGuidelines> eoscifguidelines;
 
-	/**
-	 * Gets measures.
-	 *
-	 * @return the measures
-	 */
-	public List<Measure> getMeasures() {
-		return measures;
-	}
 
-	/**
-	 * Sets measures.
-	 *
-	 * @param measures the measures
-	 */
-	public void setMeasures(List<Measure> measures) {
-		this.measures = measures;
-	}
 
 	public Field<String> getProcessingchargeamount() {
 		return processingchargeamount;
@@ -759,7 +740,7 @@ public class Result extends OafEntity implements Serializable {
 			processingchargecurrency = r.getProcessingchargecurrency();
 		}
 
-		measures = mergeLists(measures, r.getMeasures());
+
 
 		eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());