Merge branch 'OY-4836' into MERGE__OY-4799__OY-4780__OY-4797__OK-415__OY-4836

Author: msiukola

src/main/scala/fi/vm/sade/hakurekisteri/integration/henkilo/oppijaNumeroRekisteri.scala

@@ -34,12 +34,7 @@ case class LinkedHenkiloOids(
 
 trait IOppijaNumeroRekisteri {
   def fetchLinkedHenkiloOidsMap(henkiloOids: Set[String]): Future[LinkedHenkiloOids]
-
-  def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
-    fetchLinkedHenkiloOidsMap(henkiloOids)
-      .map(_.oidToLinkedOids)
-      .map(PersonOidsWithAliases(henkiloOids, _))
-  }
+  def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases]
 
   def getByHetu(hetu: String): Future[Henkilo]
   def fetchHenkilotInBatches(henkiloOids: Set[String]): Future[Map[String, Henkilo]]
@@ -90,6 +85,12 @@ class OppijaNumeroRekisteri(client: VirkailijaRestClient, val system: ActorSyste
     }
   }
 
+  override def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
+    fetchLinkedHenkiloOidsMap(henkiloOids)
+      .map(_.oidToLinkedOids)
+      .map(PersonOidsWithAliases(henkiloOids, _))
+  }
+
   override def fetchLinkedHenkiloOidsMap(henkiloOids: Set[String]): Future[LinkedHenkiloOids] = {
 
     if (henkiloOids.isEmpty) {
@@ -187,6 +188,17 @@ object MockOppijaNumeroRekisteri extends IOppijaNumeroRekisteri {
   val henkiloOid = "1.2.246.562.24.58099330694"
   val linkedTestPersonOids = Seq(henkiloOid, masterOid)
 
+  implicit val ec: ExecutionContext = ExecutorUtil.createExecutor(
+    1,
+    getClass.getSimpleName
+  )
+
+  override def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
+    fetchLinkedHenkiloOidsMap(henkiloOids)
+      .map(_.oidToLinkedOids)
+      .map(PersonOidsWithAliases(henkiloOids, _))
+  }
+
   def fetchLinkedHenkiloOidsMap(henkiloOids: Set[String]): Future[LinkedHenkiloOids] = {
     Future.successful({
       val oidToLinkedOids = henkiloOids.map { queriedOid =>

src/test/scala/fi/vm/sade/hakurekisteri/rest/OppijaResourceSpec.scala

@@ -15,7 +15,8 @@ import fi.vm.sade.hakurekisteri.integration.henkilo.{
   Henkilo,
   IOppijaNumeroRekisteri,
   LinkedHenkiloOids,
-  MockPersonAliasesProvider
+  MockPersonAliasesProvider,
+  PersonOidsWithAliases
 }
 import fi.vm.sade.hakurekisteri.integration.tarjonta._
 import fi.vm.sade.hakurekisteri.integration.valintarekisteri.{
@@ -91,6 +92,13 @@ class OppijaResourceSpec
         )
       )
     }
+
+    override def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
+      fetchLinkedHenkiloOidsMap(henkiloOids)
+        .map(_.oidToLinkedOids)
+        .map(PersonOidsWithAliases(henkiloOids, _))
+    }
+
     override def getByHetu(hetu: String): Future[Henkilo] = {
       throw new UnsupportedOperationException("Not implemented")
     }

src/test/scala/fi/vm/sade/hakurekisteri/rest/VirtaSuoritusResourceSpec.scala

@@ -10,7 +10,8 @@ import fi.vm.sade.hakurekisteri.integration.hakemus.{
 import fi.vm.sade.hakurekisteri.integration.henkilo.{
   Henkilo,
   IOppijaNumeroRekisteri,
-  LinkedHenkiloOids
+  LinkedHenkiloOids,
+  PersonOidsWithAliases
 }
 import fi.vm.sade.hakurekisteri.integration.virta.{
   VirtaClient,
@@ -143,6 +144,12 @@ class VirtaSuoritusResourceSpec extends ScalatraFunSuite with DispatchSupport wi
       }
     }
 
+    override def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
+      fetchLinkedHenkiloOidsMap(henkiloOids)
+        .map(_.oidToLinkedOids)
+        .map(PersonOidsWithAliases(henkiloOids, _))
+    }
+
     override def getByOids(oids: Set[String]): Future[Map[String, Henkilo]] = Future.successful(
       Map(
         (