mer

NDLANO · Jan 7, 2025 · dce81f1 · dce81f1
1 parent 56ec985
commit dce81f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/search-api/src/main/scala/no/ndla/searchapi/integration/ZipUtil.scala b/search-api/src/main/scala/no/ndla/searchapi/integration/ZipUtil.scala
@@ -25,6 +25,8 @@ object ZipUtil {
         .continually(zis.read(buffer))
         .takeWhile(_ != -1)
         .foreach(fout.write(buffer, 0, _))
+
+      fout.close()
     }
 
     if (deleteArchive) zipFile.delete()

diff --git a/typescript/types-backend/search-api.ts b/typescript/types-backend/search-api.ts
@@ -1,6 +1,6 @@
 // DO NOT EDIT: generated file by scala-tsi
 
-export type GrepResultDTO = (IGrepKompetansemaalDTO | IGrepKjerneelementDTO | IGrepLaererplanDTO | IGrepKompetansemaalSettDTO | IGrepTverrfagligTemaDTO)
+export type GrepResultDTO = (IGrepKjerneelementDTO | IGrepKompetansemaalDTO | IGrepTverrfagligTemaDTO | IGrepKompetansemaalSettDTO | IGrepLaererplanDTO)
 
 export type GrepSort = ("-relevance" | "relevance" | "-title" | "title" | "-code" | "code")
 
@@ -131,6 +131,8 @@ export interface IGrepKompetansemaalDTO {
   title: ITitleDTO
   laereplan: IGrepLaererplanDTO
   kompetansemaalSett: IGrepKompetansemaalSettDTO
+  tverrfagligeTemaer: IGrepTverrfagligTemaDTO[]
+  kjerneelementer: IGrepReferencedKjerneelementDTO[]
   grepType: "kompetansemaal"
   type: "GrepKompetansemaalDTO"
 }
@@ -147,6 +149,11 @@ export interface IGrepLaererplanDTO {
   grepType: "laererplan"
 }
 
+export interface IGrepReferencedKjerneelementDTO {
+  code: string
+  title: string
+}
+
 export interface IGrepSearchInputDTO {
   prefixFilter?: string[]
   codes?: string[]
@@ -169,7 +176,6 @@ export interface IGrepTverrfagligTemaDTO {
   code: string
   title: ITitleDTO
   grepType: "tverrfaglig-tema"
-  type: "GrepTverrfagligTemaDTO"
 }
 
 export interface IGroupSearchResultDTO {