Skip to content

Commit d7fa85c

Browse files
committed
Add nodetype case.
1 parent e55e560 commit d7fa85c

File tree

7 files changed

+19
-4
lines changed

7 files changed

+19
-4
lines changed

common/src/main/scala/no/ndla/common/model/taxonomy/Node.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ object NodeType extends Enum[NodeType] with CirceEnum[NodeType] {
2222
case object TOPIC extends NodeType
2323
case object RESOURCE extends NodeType
2424
case object PROGRAMME extends NodeType
25+
case object CASE extends NodeType
2526

2627
val values: IndexedSeq[NodeType] = findValues
2728

network/src/main/scala/no/ndla/network/clients/TaxonomyApiClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TaxonomyApiClient(taxonomyBaseUrl: String)(using ndlaClient: NdlaClient) e
3535
s"$TaxonomyApiEndpoint/nodes/",
3636
headers = getVersionHashHeader(shouldUsePublishedTax),
3737
Seq(
38-
"nodeType" -> List(NodeType.NODE, NodeType.SUBJECT, NodeType.TOPIC).mkString(","),
38+
"nodeType" -> List(NodeType.NODE, NodeType.SUBJECT, NodeType.TOPIC, NodeType.CASE).mkString(","),
3939
"includeContexts" -> "true",
4040
"isVisible" -> getIsVisibleParam(shouldUsePublishedTax),
4141
),

search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,7 @@ class SearchConverterService(using
11821182
case NodeType.NODE => List("node")
11831183
case NodeType.SUBJECT => List("fag", "subject")
11841184
case NodeType.TOPIC => List("emne", "topic")
1185+
case NodeType.CASE => List("case", "case")
11851186
case NodeType.RESOURCE => List("ressurs", "resource")
11861187
case NodeType.PROGRAMME => List("programfag", "program", "programme")
11871188
}

search-api/src/test/scala/no/ndla/searchapi/TestData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ object TestData {
13231323
Some("/e/engler-og-demoner/asdf1241"),
13241324
invisibleMetadata,
13251325
List.empty,
1326-
NodeType.TOPIC,
1326+
NodeType.CASE,
13271327
List("asdf1241"),
13281328
None,
13291329
List.empty,

search-api/src/test/scala/no/ndla/searchapi/service/search/MultiDraftSearchServiceAtomicTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ class MultiDraftSearchServiceAtomicTest extends ElasticsearchIntegrationSuite wi
586586
Some("/e/t4/asdf1260"),
587587
visibleMetadata,
588588
List.empty,
589-
NodeType.TOPIC,
589+
NodeType.CASE,
590590
List("asdf1260"),
591591
None,
592592
List.empty,

search-api/src/test/scala/no/ndla/searchapi/service/search/MultiSearchServiceAtomicTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ class MultiSearchServiceAtomicTest extends ElasticsearchIntegrationSuite with Te
613613
Some("/e/top5/asdf2361"),
614614
hiddenMeta,
615615
List.empty,
616-
NodeType.TOPIC,
616+
NodeType.CASE,
617617
List("asdf2361"),
618618
None,
619619
List.empty,

search-api/src/test/scala/no/ndla/searchapi/service/search/SearchConverterServiceTest.scala

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,19 @@ class SearchConverterServiceTest extends UnitSuite with TestEnvironment {
104104
None,
105105
List.empty,
106106
),
107+
Node(
108+
"urn:case:1",
109+
"Case1",
110+
Some("urn:article:10"),
111+
Some("/subject:1/case:10"),
112+
Some("/e/case1/asdf3457"),
113+
visibleMetadata,
114+
List.empty,
115+
NodeType.CASE,
116+
List("asdf3459"),
117+
None,
118+
List.empty,
119+
),
107120
)
108121

109122
val emptyBundle: TaxonomyBundle = TaxonomyBundle(nodes = nodes)

0 commit comments

Comments
 (0)