Merge pull request 'fix import of ORPs' (#390) from import_orps_fix into beta

Reviewed-on: #390

dhp-workflows/dhp-graph-mapper/src/main/scala/eu/dnetlib/dhp/oa/graph/raw/CopyHdfsOafSparkApplication.scala

@@ -93,8 +93,8 @@ object CopyHdfsOafSparkApplication {
       hasSource != null && hasTarget != null
     } else {
       val hasId = (json \ "id").extractOrElse[String](null)
-      val resultType = (json \ "resulttype" \ "classid").extractOrElse[String](null)
+      val resultType = (json \ "resulttype" \ "classid").extractOrElse[String]("")
-      hasId != null && oafType.equalsIgnoreCase(resultType)
+      hasId != null && oafType.startsWith(resultType)
     }
 
   }

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/CopyHdfsOafSparkApplicationTest.java

@@ -59,7 +59,19 @@ public class CopyHdfsOafSparkApplicationTest {
 								.getResourceAsStream(
 									"/eu/dnetlib/dhp/oa/graph/raw/publication_2_unknownProperty.json")),
 					"publication"));
+	}
 
+	@Test
+	void isOafType_Datacite_ORP() throws IOException {
+		assertTrue(
+				CopyHdfsOafSparkApplication
+						.isOafType(
+								IOUtils
+										.toString(
+												getClass()
+														.getResourceAsStream(
+																"/eu/dnetlib/dhp/oa/graph/raw/datacite_orp.json")),
+								"otherresearchproduct"));
 	}
 
 }