From aae667e6b60281adb0932e7c4beec8d10b076a1c Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Fri, 4 Feb 2022 12:34:25 +0100
Subject: [PATCH] [APC at the result level] added the APC at the level of the
 result and modified test class

---
 .../dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java       | 4 ++++
 .../test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java  | 6 ++++++
 pom.xml                                                     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
index 526f45f6e..3e74bc5e0 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
@@ -347,6 +347,10 @@ public abstract class AbstractMdRecordToOafMapper {
 		r.setCoverage(prepareCoverages(doc, info));
 		r.setContext(prepareContexts(doc, info));
 		r.setExternalReference(new ArrayList<>()); // NOT PRESENT IN MDSTORES
+		r
+				.setProcessingchargeamount(field(doc.valueOf("//oaf:processingchargeamount"), info));
+		r
+				.setProcessingchargecurrency(field(doc.valueOf("//oaf:processingchargeamount/@currency"), info));
 
 		r.setInstance(instances);
 		r.setBestaccessright(OafMapperUtils.createBestAccessRights(instances));
diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
index 6a5fd33b0..bdb73abf5 100644
--- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
+++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
@@ -827,6 +827,12 @@ class MappersTest {
 		assertTrue(p.getInstance().size() > 0);
 
 		assertEquals("https://doi.org/10.1155/2015/439379", p.getInstance().get(0).getUrl().get(0));
+
+		assertTrue(p.getProcessingchargeamount() != null);
+		assertTrue(p.getProcessingchargecurrency() != null);
+
+		assertEquals("1721.47", p.getProcessingchargeamount().getValue());
+		assertEquals("EUR", p.getProcessingchargecurrency().getValue());
 	}
 
 	private void assertValidId(final String id) {
diff --git a/pom.xml b/pom.xml
index 489f712b0..a99162d26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -797,7 +797,7 @@
 		<mockito-core.version>3.3.3</mockito-core.version>
 		<mongodb.driver.version>3.4.2</mongodb.driver.version>
 		<vtd.version>[2.12,3.0)</vtd.version>
-		<dhp-schemas.version>[2.10.27]</dhp-schemas.version>
+		<dhp-schemas.version>[2.10.28-SNAPSHOT]</dhp-schemas.version>
 		<dnet-actionmanager-api.version>[4.0.3]</dnet-actionmanager-api.version>
 		<dnet-actionmanager-common.version>[6.0.5]</dnet-actionmanager-common.version>
 		<dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version>