From 625e4c29c417f1153cd2fe10e45a8dbf5d7f6c25 Mon Sep 17 00:00:00 2001
From: Sandro La Bruzzo <sandro.labruzzo@isti.cnr.it>
Date: Tue, 23 Mar 2021 09:39:56 +0100
Subject: [PATCH] added model constants

---
 .../dnetlib/doiboost/DoiBoostMappingUtil.scala   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala b/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala
index 03f6653c7..f2c63cee6 100644
--- a/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala
+++ b/dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/DoiBoostMappingUtil.scala
@@ -5,6 +5,7 @@ import eu.dnetlib.dhp.schema.oaf.{AccessRight, DataInfo, Dataset, Field, Instanc
 import eu.dnetlib.dhp.utils.DHPUtils
 import org.apache.commons.lang3.StringUtils
 import com.fasterxml.jackson.databind.ObjectMapper
+import eu.dnetlib.dhp.schema.common.ModelConstants
 import eu.dnetlib.dhp.schema.scholexplorer.OafUtils
 import org.json4s
 import org.json4s.DefaultFormats
@@ -112,18 +113,12 @@ object DoiBoostMappingUtil {
       result.getInstance().asScala.foreach(i => i.setInstancetype(instanceType.get.getInstancetype))
     }
     result.getInstance().asScala.foreach(i => {
-      i.setHostedby(getUnknownHostedBy())
+      i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY)
     })
     result
   }
 
-  def getUnknownHostedBy():KeyValue = {
-    val hb = new KeyValue
-    hb.setValue("Unknown Repository")
-    hb.setKey(s"10|$OPENAIRE_PREFIX::55045bd2a65019fd8e6741a755395c8c")
-    hb
 
-  }
 
 
   def getOpenAccessQualifier():AccessRight = {
@@ -155,7 +150,7 @@ object DoiBoostMappingUtil {
 
 
     publication.getInstance().asScala.foreach(i => {
-      val hb = new KeyValue
+      var hb = new KeyValue
       if (item != null) {
         hb.setValue(item.officialname)
         hb.setKey(generateDSId(item.id))
@@ -165,15 +160,14 @@ object DoiBoostMappingUtil {
         publication.setBestaccessright(OafUtils.createQualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename))
       }
       else {
-        hb.setValue("Unknown Repository")
-        hb.setKey(s"10|$OPENAIRE_PREFIX::55045bd2a65019fd8e6741a755395c8c")
+        hb = ModelConstants.UNKNOWN_REPOSITORY
       }
       i.setHostedby(hb)
     })
 
     val ar = publication.getInstance().asScala.filter(i => i.getInstancetype != null && i.getAccessright!= null && i.getAccessright.getClassid!= null).map(f=> f.getAccessright.getClassid)
     if (ar.nonEmpty) {
-      if(ar.contains("OPEN")){
+      if(ar.contains(ModelConstants.ACCESS_RIGHT_OPEN)){
         val ar = getOpenAccessQualifier()
         publication.setBestaccessright(OafUtils.createQualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename))
       }