From 9bc4fd3b69981716c6a6b96b1234871539bf2f79 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Fri, 30 Jul 2021 10:34:05 +0200
Subject: [PATCH] Patch FCT relations - fixed issue with join

---
 .../dhp/oa/graph/raw/PatchRelationsApplication.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/PatchRelationsApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/PatchRelationsApplication.java
index dddc53bc8..5bbc8a975 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/PatchRelationsApplication.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/PatchRelationsApplication.java
@@ -82,7 +82,7 @@ public class PatchRelationsApplication {
         log.info("relations: {}", rels.count());
         log.info("idMapping: {}", idMapping.count());
 
-        rels
+        Dataset<Relation> fj = rels
                 .joinWith(idMapping, rels.col("source").equalTo(idMapping.col("oldId")), "left")
                 .map((MapFunction<Tuple2<Relation, RelationIdMapping>, Relation>) t -> {
                     final Relation r = t._1();
@@ -90,8 +90,9 @@ public class PatchRelationsApplication {
                             .map(RelationIdMapping::getNewId)
                             .ifPresent(r::setSource);
                     return r;
-                }, Encoders.bean(Relation.class))
-                .joinWith(idMapping, rels.col("target").equalTo(idMapping.col("oldId")), "left")
+                }, Encoders.bean(Relation.class));
+
+        fj.joinWith(idMapping, fj.col("target").equalTo(idMapping.col("oldId")), "left")
                 .map((MapFunction<Tuple2<Relation, RelationIdMapping>, Relation>) t -> {
                     final Relation r = t._1();
                     Optional.ofNullable(t._2())