D-Net
/
dhp-schemas
9
1
Fork 0
Code Issues 1 Pull Requests 5 Projects Releases 1 Wiki Activity

merge logics changed to consider invisble in dataInfo

This commit is contained in:
Alessia Bardi 2022-02-10 18:57:16 +01:00
parent 9beef2e678
commit 78929fe658
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java
View File

@ -70,7 +70,8 @@ public abstract class Oaf implements Serializable {
} }
public void mergeOAFDataInfo(Oaf o) { public void mergeOAFDataInfo(Oaf o) {
if (o.getDataInfo() != null && compareTrust(this, o) < 0)
if (o.getDataInfo() != null && (compareTrust(this, o) < 0 || this.getDataInfo().getInvisible()))
dataInfo = o.getDataInfo(); dataInfo = o.getDataInfo();
} }

21
src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java
View File

@ -189,8 +189,10 @@ class MergeTest {
Result p1 = publications.get(1); Result p1 = publications.get(1);
Result p2 = publications.get(0); Result p2 = publications.get(0);
//merge visible record with OpenAPC
p1.mergeFrom(p2); p1.mergeFrom(p2);
assertFalse(p1.getDataInfo().getInvisible());
assertEquals("1721.47", p1.getProcessingchargeamount().getValue()); assertEquals("1721.47", p1.getProcessingchargeamount().getValue());
assertEquals("EUR", p1.getProcessingchargecurrency().getValue()); assertEquals("EUR", p1.getProcessingchargecurrency().getValue());
@ -204,7 +206,26 @@ class MergeTest {
assertEquals("EUR", p1.getInstance().stream().filter(i -> i.getProcessingchargeamount() != null) assertEquals("EUR", p1.getInstance().stream().filter(i -> i.getProcessingchargeamount() != null)
.collect(Collectors.toList()).get(0).getProcessingchargecurrency().getValue()); .collect(Collectors.toList()).get(0).getProcessingchargecurrency().getValue());
assertFalse(p1.getDataInfo().getInvisible());
System.out.println(new ObjectMapper().writeValueAsString(p1)); System.out.println(new ObjectMapper().writeValueAsString(p1));
//merge OpenAPC with visible record
p2.mergeFrom(p1);
assertFalse(p2.getDataInfo().getInvisible());
assertEquals("1721.47", p2.getProcessingchargeamount().getValue());
assertEquals("EUR", p2.getProcessingchargecurrency().getValue());
assertEquals(2 , p2.getInstance().size());
p2.getInstance().stream().anyMatch(i -> i.getProcessingchargeamount() != null);
p2.getInstance().stream().anyMatch(i -> i.getProcessingchargecurrency() != null);
assertEquals("1721.47", p2.getInstance().stream().filter(i -> i.getProcessingchargeamount() != null)
.collect(Collectors.toList()).get(0).getProcessingchargeamount().getValue());
assertEquals("EUR", p2.getInstance().stream().filter(i -> i.getProcessingchargeamount() != null)
.collect(Collectors.toList()).get(0).getProcessingchargecurrency().getValue());
} }
/** /**