search-api: Include url to nodes in search

NDLANO · Feb 21, 2025 · 92f56b9 · 92f56b9
1 parent d56b5e6
commit 92f56b9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/article-api/src/main/scala/no/ndla/articleapi/ArticleApiProperties.scala b/article-api/src/main/scala/no/ndla/articleapi/ArticleApiProperties.scala
@@ -107,12 +107,6 @@ class ArticleApiProperties extends BaseProps with DatabaseProps {
     ).getOrElse(Environment, "https://h5p.ndla.no")
   )
 
-  def ndlaFrontendUrl: String = Environment match {
-    case "local" => "http://localhost:30017"
-    case "prod"  => "https://ndla.no"
-    case _       => s"https://$Environment.ndla.no"
-  }
-
   private def BrightcoveAccountId: String = prop("NDLA_BRIGHTCOVE_ACCOUNT_ID")
   private def BrightcovePlayerId: String  = prop("NDLA_BRIGHTCOVE_PLAYER_ID")
 

diff --git a/common/src/main/scala/no/ndla/common/configuration/BaseProps.scala b/common/src/main/scala/no/ndla/common/configuration/BaseProps.scala
@@ -58,6 +58,12 @@ trait BaseProps {
   def TaxonomyUrl: String        = s"http://$TaxonomyApiHost"
   def disableWarmup: Boolean     = booleanPropOrElse("DISABLE_WARMUP", default = false)
 
+  def ndlaFrontendUrl: String = Environment match {
+    case "local" => "http://localhost:30017"
+    case "prod"  => "https://ndla.no"
+    case _       => s"https://$Environment.ndla.no"
+  }
+
   def MAX_SEARCH_THREADS: Int    = intPropOrDefault("MAX_SEARCH_THREADS", 100)
   def SEARCH_INDEX_SHARDS: Int   = intPropOrDefault("SEARCH_INDEX_SHARDS", 1)
   def SEARCH_INDEX_REPLICAS: Int = intPropOrDefault("SEARCH_INDEX_REPLICAS", 1)

diff --git a/common/src/main/scala/no/ndla/common/model/api/search/MultiSearchSummaryDTO.scala b/common/src/main/scala/no/ndla/common/model/api/search/MultiSearchSummaryDTO.scala
@@ -45,6 +45,10 @@ object MultiSummaryBaseDTO {
 case class NodeHitDTO(
     @description("The unique id of the taxonomy node")
     id: String,
+    @description("The title of the taxonomy node")
+    title: String,
+    @description("The url to the frontend page of the taxonomy node")
+    url: Option[String],
     @description("Subject page summary if the node is connected to a subject page")
     subjectPage: Option[SubjectPageSummaryDTO]
 ) extends MultiSummaryBaseDTO

diff --git a/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableNode.scala b/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableNode.scala
@@ -16,6 +16,7 @@ case class SearchableNode(
     nodeId: String,
     title: SearchableLanguageValues,
     contentUri: Option[String],
+    url: Option[String],
     nodeType: NodeType,
     subjectPage: Option[SearchableSubjectPage]
 )

diff --git a/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala b/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala
@@ -123,10 +123,14 @@ trait SearchConverterService {
 
     def nodeHitAsMultiSummary(hit: SearchHit, language: String): Try[NodeHitDTO] = {
       val searchableNode = CirceUtil.tryParseAs[SearchableNode](hit.sourceAsString).?
+      val title          = searchableNode.title.getLanguageOrDefault(language).getOrElse("")
+      val url            = searchableNode.url.map(urlPath => s"${props.ndlaFrontendUrl}$urlPath")
 
       Success(
         NodeHitDTO(
           id = searchableNode.nodeId,
+          title = title,
+          url = url,
           subjectPage = searchableNode.subjectPage.map(subjectPageToSummary(_, language))
         )
       )
@@ -1136,6 +1140,7 @@ trait SearchConverterService {
         SearchableNode(
           nodeId = node.id,
           title = getSearchableLanguageValues(node.name, node.translations),
+          url = node.url,
           contentUri = node.contentUri,
           nodeType = node.nodeType,
           subjectPage = frontpage