D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

national_admin_functions #1

Manually merged
michele.artini merged 75 commits from national_admin_functions into master 2020-10-26 08:32:19 +01:00
Conversation 0 Commits 75 Files Changed 566 +10 -1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 637a683723 - Show all commits

8
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/OpenaireDuplicate.java
View File

@ -29,6 +29,14 @@ public class OpenaireDuplicate implements Serializable {
@Column(name = "reltype")
private String relType;
public OpenaireDuplicate() {}
public OpenaireDuplicate(final String localId, final String oaOriginalId, final String relType) {
this.localId = localId;
this.oaOriginalId = oaOriginalId;
this.relType = relType;
}
public String getLocalId() {
return localId;
}

3
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
View File

@ -410,9 +410,10 @@ public class DatabaseUtils {
final List<OpenaireDuplicate> newDuplicates = ids.stream()
.map(openaireDuplicateRepository::findByLocalId)
.flatMap(l -> l.stream())
.filter(d -> d.getRelType().equals(SimilarityType.is_similar.toString()))
.map(d -> new OpenaireDuplicate(masterId, d.getOaOriginalId(), d.getRelType()))
.collect(Collectors.toList());
newDuplicates.forEach(d -> d.setLocalId(masterId));
saveDuplicates(newDuplicates, user);
final OffsetDateTime now = OffsetDateTime.now();