dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcidnodoi/oaf/PublicationToOaf.java

@@ -554,7 +554,7 @@ public class PublicationToOaf implements Serializable {
 	private KeyValue createCollectedFrom() {
 		KeyValue cf = new KeyValue();
 		cf.setValue(ModelConstants.ORCID.toUpperCase());
-		cf.setKey("10|" + OPENAIRE_PREFIX + SEPARATOR + "806360c771262b4d6770e7cdf04b5c5a");
+		cf.setKey("10|" + OPENAIRE_PREFIX + SEPARATOR + "cd0f74b5955dc87fd0605745c4b49ee8");
 		return cf;
 	}
 

dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala

@@ -391,6 +391,28 @@ object DoiBoostMappingUtil {
     di
   }
 
+  def createSubject(value: String, classId: String, schemeId: String): Subject = {
+    val s = new Subject
+    s.setQualifier(OafMapperUtils.qualifier(classId, classId, schemeId, schemeId))
+    s.setValue(value)
+    s
+
+  }
+
+  def createSubject(
+    value: String,
+    classId: String,
+    className: String,
+    schemeId: String,
+    schemeName: String
+  ): Subject = {
+    val s = new Subject
+    s.setQualifier(OafMapperUtils.qualifier(classId, className, schemeId, schemeName))
+    s.setValue(value)
+    s
+
+  }
+
   def createSP(
     value: String,
     classId: String,

dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala

@@ -201,7 +201,7 @@ case object Crossref2Oaf {
 
     if (subjectList.nonEmpty) {
       result.setSubject(
-        subjectList.map(s => createSP(s, "keywords", ModelConstants.DNET_SUBJECT_TYPOLOGIES)).asJava
+        subjectList.map(s => createSubject(s, "keyword", ModelConstants.DNET_SUBJECT_TYPOLOGIES)).asJava
       )
     }
 
@@ -370,10 +370,40 @@ case object Crossref2Oaf {
       case dataset: Dataset         => convertDataset(dataset)
     }
 
+    val doisReference: List[String] = for {
+      JObject(reference_json)          <- json \ "reference"
+      JField("DOI", JString(doi_json)) <- reference_json
+    } yield doi_json
+
+    if (doisReference != null && doisReference.nonEmpty) {
+      val citation_relations: List[Relation] = generateCitationRelations(doisReference, result)
+      resultList = resultList ::: citation_relations
+    }
     resultList = resultList ::: List(result)
     resultList
   }
 
+  private def createCiteRelation(source: Result, targetPid: String, targetPidType: String): List[Relation] = {
+
+    val targetId = IdentifierFactory.idFromPid("50", targetPidType, targetPid, true)
+
+    val from = new Relation
+    from.setSource(source.getId)
+    from.setTarget(targetId)
+    from.setRelType(ModelConstants.RESULT_RESULT)
+    from.setRelClass(ModelConstants.CITES)
+    from.setSubRelType(ModelConstants.CITATION)
+    from.setCollectedfrom(source.getCollectedfrom)
+    from.setDataInfo(source.getDataInfo)
+    from.setLastupdatetimestamp(source.getLastupdatetimestamp)
+
+    List(from)
+  }
+
+  def generateCitationRelations(dois: List[String], result: Result): List[Relation] = {
+    dois.flatMap(d => createCiteRelation(result, d, "doi"))
+  }
+
   def mappingFunderToRelations(
     funders: List[mappingFunder],
     sourceId: String,

dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/mag/MagDataModel.scala

@@ -2,7 +2,7 @@ package eu.dnetlib.doiboost.mag
 
 import eu.dnetlib.dhp.schema.common.ModelConstants
 import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory
-import eu.dnetlib.dhp.schema.oaf.{Instance, Journal, Publication, StructuredProperty}
+import eu.dnetlib.dhp.schema.oaf.{Instance, Journal, Publication, StructuredProperty, Subject}
 import eu.dnetlib.doiboost.DoiBoostMappingUtil
 import eu.dnetlib.doiboost.DoiBoostMappingUtil._
 import org.json4s
@@ -210,8 +210,8 @@ case object ConversionUtil {
       val className = "Microsoft Academic Graph classification"
       val classid = "MAG"
 
-      val p: List[StructuredProperty] = fieldOfStudy.subjects.flatMap(s => {
+      val p: List[Subject] = fieldOfStudy.subjects.flatMap(s => {
-        val s1 = createSP(
+        val s1 = createSubject(
           s.DisplayName,
           classid,
           className,
@@ -219,10 +219,10 @@ case object ConversionUtil {
           ModelConstants.DNET_SUBJECT_TYPOLOGIES
         )
         val di = DoiBoostMappingUtil.generateDataInfo(s.Score.toString)
-        var resList: List[StructuredProperty] = List(s1)
+        var resList: List[Subject] = List(s1)
         if (s.MainType.isDefined) {
           val maintp = s.MainType.get
-          val s2 = createSP(
+          val s2 = createSubject(
             s.MainType.get,
             classid,
             className,
@@ -232,7 +232,7 @@ case object ConversionUtil {
           s2.setDataInfo(di)
           resList = resList ::: List(s2)
           if (maintp.contains(".")) {
-            val s3 = createSP(
+            val s3 = createSubject(
               maintp.split("\\.").head,
               classid,
               className,

dhp-workflows/dhp-doiboost/src/test/resources/eu/dnetlib/doiboost/crossref/publication_license_embargo.json

@@ -94,7 +94,6 @@
       "family": "Stein",
       "sequence": "first",
       "affiliation": [
-
       ]
     },
     {
@@ -104,7 +103,6 @@
       "family": "Velzen",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -114,7 +112,6 @@
       "family": "Kowalski",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -122,7 +119,6 @@
       "family": "Franckowiak",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -132,7 +128,6 @@
       "family": "Gezari",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -142,7 +137,6 @@
       "family": "Miller-Jones",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -150,7 +144,6 @@
       "family": "Frederick",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -160,7 +153,6 @@
       "family": "Sfaradi",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -168,7 +160,6 @@
       "family": "Bietenholz",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -178,7 +169,6 @@
       "family": "Horesh",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -186,7 +176,6 @@
       "family": "Fender",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -196,7 +185,6 @@
       "family": "Garrappa",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -206,7 +194,6 @@
       "family": "Ahumada",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -214,7 +201,6 @@
       "family": "Andreoni",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -222,7 +208,6 @@
       "family": "Belicki",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -232,7 +217,6 @@
       "family": "Bellm",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -240,7 +224,6 @@
       "family": "Böttcher",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -248,7 +231,6 @@
       "family": "Brinnel",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -256,7 +238,6 @@
       "family": "Burruss",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -266,7 +247,6 @@
       "family": "Cenko",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -276,7 +256,6 @@
       "family": "Coughlin",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -286,7 +265,6 @@
       "family": "Cunningham",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -294,7 +272,6 @@
       "family": "Drake",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -302,7 +279,6 @@
       "family": "Farrar",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -310,7 +286,6 @@
       "family": "Feeney",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -318,7 +293,6 @@
       "family": "Foley",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -328,7 +302,6 @@
       "family": "Gal-Yam",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -336,7 +309,6 @@
       "family": "Golkhou",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -346,7 +318,6 @@
       "family": "Goobar",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -356,7 +327,6 @@
       "family": "Graham",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -364,7 +334,6 @@
       "family": "Hammerstein",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -374,7 +343,6 @@
       "family": "Helou",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -384,7 +352,6 @@
       "family": "Hung",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -392,7 +359,6 @@
       "family": "Kasliwal",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -402,7 +368,6 @@
       "family": "Kilpatrick",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -412,7 +377,6 @@
       "family": "Kong",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -422,7 +386,6 @@
       "family": "Kupfer",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -432,7 +395,6 @@
       "family": "Laher",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -442,7 +404,6 @@
       "family": "Mahabal",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -452,7 +413,6 @@
       "family": "Masci",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -462,7 +422,6 @@
       "family": "Necker",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -472,7 +431,6 @@
       "family": "Nordin",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -480,7 +438,6 @@
       "family": "Perley",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -490,7 +447,6 @@
       "family": "Rigault",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -500,7 +456,6 @@
       "family": "Reusch",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -508,7 +463,6 @@
       "family": "Rodriguez",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -518,7 +472,6 @@
       "family": "Rojas-Bravo",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -528,7 +481,6 @@
       "family": "Rusholme",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -538,7 +490,6 @@
       "family": "Shupe",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -548,7 +499,6 @@
       "family": "Singer",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -558,7 +508,6 @@
       "family": "Sollerman",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -566,7 +515,6 @@
       "family": "Soumagnac",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -574,7 +522,6 @@
       "family": "Stern",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -582,7 +529,6 @@
       "family": "Taggart",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -590,7 +536,6 @@
       "family": "van Santen",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -598,7 +543,6 @@
       "family": "Ward",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -606,7 +550,6 @@
       "family": "Woudt",
       "sequence": "additional",
       "affiliation": [
-
       ]
     },
     {
@@ -616,7 +559,6 @@
       "family": "Yao",
       "sequence": "additional",
       "affiliation": [
-
       ]
     }
   ],
@@ -1412,7 +1354,6 @@
     "Nature Astronomy"
   ],
   "original-title": [
-
   ],
   "language": "en",
   "link": [
@@ -1448,10 +1389,8 @@
   },
   "score": 1.0,
   "subtitle": [
-
   ],
   "short-title": [
-
   ],
   "issued": {
     "date-parts": [
@@ -1480,7 +1419,6 @@
   "URL": "http://dx.doi.org/10.1038/s41550-020-01295-8",
   "relation": {
     "cites": [
-
     ]
   },
   "ISSN": [

dhp-workflows/dhp-doiboost/src/test/scala/eu/dnetlib/dhp/doiboost/crossref/CrossrefMappingTest.scala

@@ -1,9 +1,14 @@
 package eu.dnetlib.dhp.doiboost.crossref
 
+import eu.dnetlib.dhp.schema.common.ModelConstants
 import eu.dnetlib.dhp.schema.oaf._
 import eu.dnetlib.dhp.utils.DHPUtils
 import eu.dnetlib.doiboost.crossref.Crossref2Oaf
 import org.codehaus.jackson.map.{ObjectMapper, SerializationConfig}
+import org.json4s
+import org.json4s.JsonAST.{JField, JObject, JString}
+import org.json4s.{DefaultFormats, JValue}
+import org.json4s.jackson.JsonMethods
 import org.junit.jupiter.api.Assertions._
 import org.junit.jupiter.api.Test
 import org.slf4j.{Logger, LoggerFactory}
@@ -109,6 +114,47 @@ class CrossrefMappingTest {
 
   }
 
+  private def parseJson(input: String): JValue = {
+    implicit lazy val formats: DefaultFormats.type = org.json4s.DefaultFormats
+    lazy val json: json4s.JValue = JsonMethods.parse(input)
+
+    json
+  }
+
+  @Test
+  def testCitationRelations(): Unit = {
+    val json = Source
+      .fromInputStream(getClass.getResourceAsStream("/eu/dnetlib/doiboost/crossref/publication_license_embargo.json"))
+      .mkString
+
+    assertNotNull(json)
+    assertFalse(json.isEmpty)
+
+    val result: List[Oaf] = Crossref2Oaf.convert(json)
+
+    assertTrue(result.nonEmpty)
+
+    val j = parseJson(json)
+
+    val doisReference: List[String] = for {
+      JObject(reference_json)          <- j \ "reference"
+      JField("DOI", JString(doi_json)) <- reference_json
+    } yield doi_json
+
+    val relationList: List[Relation] = result
+      .filter(s => s.isInstanceOf[Relation])
+      .map(r => r.asInstanceOf[Relation])
+      .filter(r => r.getSubRelType.equalsIgnoreCase(ModelConstants.CITATION))
+
+    assertNotNull(relationList)
+    assertFalse(relationList.isEmpty)
+
+    assertEquals(doisReference.size, relationList.size)
+
+    mapper.getSerializationConfig.enable(SerializationConfig.Feature.INDENT_OUTPUT)
+    relationList.foreach(p => println(mapper.writeValueAsString(p)))
+  }
+
   @Test
   def testEmptyTitle(): Unit = {
     val json = Source