diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/modell/Sokemotor.kt b/backend/src/main/kotlin/no/nav/helse/sprik/modell/Sokemotor.kt index d497d11..dbf7f39 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/modell/Sokemotor.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/modell/Sokemotor.kt @@ -8,12 +8,18 @@ class Sokemotor { private val feilmeldingRepository = FeilmeldingRepository() fun sok(s: String): List { + val feilmeldinger = feilmeldingRepository.hentAlleFeilmeldinger() val resultat = ArrayList() + val processed = s.lowercase() + for (i in feilmeldinger) { - if (i.tittel.equals(s) or i.beskrivelse.equals(s)) { + if (i.tittel.lowercase().contains(processed) or i.beskrivelse.lowercase().contains(processed) or processed.equals("")) { + println(i.toString() + " matcher" + processed) resultat.add(i) + }else{ + println(i.toString() + " matcher ikke") } } diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt index 9011de1..d2d1a96 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt @@ -14,11 +14,13 @@ import io.ktor.server.request.* import no.nav.helse.sprik.Test import no.nav.helse.sprik.db.FeilmeldingRepository import no.nav.helse.sprik.modell.Feilmelding +import no.nav.helse.sprik.modell.Sokemotor import java.time.LocalDateTime fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngineEnvironment { //Repositories for handlinger mot database: val feilmeldingRepository = FeilmeldingRepository() + val sokemotor = Sokemotor() module { install(CORS) { @@ -57,6 +59,10 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin val testMelding = feilmeldingRepository.hentAlleFeilmeldinger() call.respond(status = HttpStatusCode.Created, message = testMelding) } + post("/api/hentsok"){ + val sokestreng = call.receive() + call.respond(status = HttpStatusCode.Created, message = sokestreng + ": " + sokemotor.sok(sokestreng)) + } } } connector { diff --git a/frontend/src/const.ts b/frontend/src/const.ts index a6688d6..0cc1826 100644 --- a/frontend/src/const.ts +++ b/frontend/src/const.ts @@ -2,5 +2,5 @@ * Konstanter vi bruker i diverse filer i applikasjonen */ -//export const backendURL = "http://localhost:8080" -export const backendURL = "https://helse-sprik.intern.dev.nav.no" \ No newline at end of file +export const backendURL = "http://localhost:8080" +//export const backendURL = "https://helse-sprik.intern.dev.nav.no" \ No newline at end of file diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index e1717be..57a2efe 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -5,11 +5,26 @@ import Header from "./components/Header"; import { PlusIcon } from "@navikt/aksel-icons"; import Filtermeny from "./components/Filtermeny"; import { useNavigate } from "react-router-dom"; +import axios from "axios"; +import { backendURL } from "./const"; export default function Home() { - const navigate = useNavigate() + const handleChange = (soeketekst: string) => { + console.log("search changed") + + axios.post(backendURL + "/api/hentsok", soeketekst, { + headers: { + 'Content-Type': 'application/json' + } + }).then((response) => { + console.log(response.data); + }).catch((error) => { + console.log(error); + }) + } + return (
@@ -17,7 +32,12 @@ export default function Home() {
- + handleChange(soeketekst)} + />