From 2f58fb9df6f2712f3bd624cf23eb4be61828d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amalie=20Mans=C3=A5ker?= Date: Thu, 10 Aug 2023 09:31:27 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20Backend=20st=C3=B8tter=20muligh?= =?UTF-8?q?et=20for=20=C3=A5=20slette=20innmeldte=20feilmeldinger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sindre Kjelsrud --- .../kotlin/no/nav/helse/sprik/db/FeilmeldingRepository.kt | 4 ++++ .../src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt | 6 ++++++ .../src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingRepository.kt b/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingRepository.kt index 0c4a47a..2a112da 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingRepository.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingRepository.kt @@ -71,4 +71,8 @@ class FeilmeldingRepository { it[FeilmeldingTable.kommentar] = kommentar } } + + fun slettFeilmelding(id: Int) = transaction { + FeilmeldingTable.deleteWhere { FeilmeldingTable.id eq id } + } } 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 a269af0..408fa8f 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 @@ -73,6 +73,12 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin feilmeldingRepository.oppdaterKommentar(innkommendeKommentar.id, innkommendeKommentar.kommentar) call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert") } + delete("api/slettfeilmelding/{id}") { + val id = call.parameters["id"] + checkNotNull(id) {"Id kan ikke være null"} + feilmeldingRepository.slettFeilmelding(id.toInt()) + call.respond(status = HttpStatusCode.Created, message = "Feilmelding slettet") + } } } diff --git a/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt b/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt index 9325537..7cb0873 100644 --- a/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt +++ b/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt @@ -188,4 +188,12 @@ class FeilmeldingTest { val oppdatertKommentar = transaction { FeilmeldingTable.selectAll().single()[FeilmeldingTable.kommentar] } assertEquals("Oppdatert kommentar", oppdatertKommentar) } + + @Test + fun `Feilmelding slettes basert på id`() { + feilmeldingRepository.lagre(feilmelding) + feilmeldingRepository.slettFeilmelding(getId()) + val resultat = transaction { FeilmeldingTable.selectAll().map { it }.size } + assertEquals(0, resultat) + } } \ No newline at end of file From 2d9397b2702243eb0c4a458c3a802385e6bc3836 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 10 Aug 2023 09:31:48 +0200 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=A8=20Knapp=20i=20redigeringsverkt?= =?UTF-8?q?=C3=B8y=20for=20sletting=20av=20feil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/RedigeringsVerktoy.tsx | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index 8a99fa0..faec604 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/frontend/src/components/RedigeringsVerktoy.tsx @@ -1,4 +1,4 @@ -import { FloppydiskIcon, XMarkIcon } from "@navikt/aksel-icons" +import { FloppydiskIcon, TrashIcon, XMarkIcon } from "@navikt/aksel-icons" import { TextField, Textarea, RadioGroup, Radio, Button, Switch, Heading } from "@navikt/ds-react" import { useState } from "react" import { FeilmeldingsInnholdInterface } from "../interface" @@ -102,8 +102,28 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => { > Avbryt + ) } export default RedigeringsVerktoy; + + + + +const SlettFeilKnapp = (props: {id : number}) => { + const SlettFeil = () => { + axios.delete(`/api/slettfeil/${props.id}`) + } + + return( + + ) +} \ No newline at end of file From 42065587c010a60a03c9f164d38f44d04260e88f Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 10 Aug 2023 09:35:01 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20Fikset=20routing=20bug,=20De?= =?UTF-8?q?lete=20was=20not=20allowed,=20og=20feil=20endepunkt=20i=20front?= =?UTF-8?q?end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt | 1 + frontend/src/components/RedigeringsVerktoy.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 408fa8f..073dad3 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 @@ -28,6 +28,7 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin allowMethod(HttpMethod.Get) allowMethod(HttpMethod.Post) allowMethod(HttpMethod.Put) + allowMethod(HttpMethod.Delete) allowNonSimpleContentTypes = true } install(ContentNegotiation) { diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index faec604..2d42b84 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/frontend/src/components/RedigeringsVerktoy.tsx @@ -114,7 +114,7 @@ export default RedigeringsVerktoy; const SlettFeilKnapp = (props: {id : number}) => { const SlettFeil = () => { - axios.delete(`/api/slettfeil/${props.id}`) + axios.delete(`/api/slettfeilmelding/${props.id}`) } return( From 8c7f1a7b4772c67b6ce707b0a6fe9315e6a54830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amalie=20Mans=C3=A5ker?= Date: Thu, 10 Aug 2023 09:58:02 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20S=C3=B8rger=20for?= =?UTF-8?q?=20at=20http-statuskodene=20matcher=20request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/no/nav/helse/sprik/plugins/Routing.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 073dad3..ba5ed02 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 @@ -51,13 +51,13 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin } get("/api/hentallefeil"){ val testMelding = feilmeldingRepository.hentAlleFeilmeldinger() - call.respond(status = HttpStatusCode.Created, message = testMelding) + call.respond(status = HttpStatusCode.OK, message = testMelding) } get("/api/hentsok/{sokestreng}"){ val sokestreng = call.parameters["sokestreng"] ?: return@get call.respond(HttpStatusCode.BadRequest, "Sokestreng må være definert") val sokeresultat = feilmeldingRepository.hentSokteFeilmeldinger(sokestreng) - call.respond(status = HttpStatusCode.Created, message = sokeresultat) + call.respond(status = HttpStatusCode.OK, message = sokeresultat) } post("/api/nyfeil") { val feilmelding = call.receive() @@ -67,18 +67,18 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin put("/api/oppdaterfeil") { val oppdatertFeilmelding = call.receive() feilmeldingRepository.oppdaterFeilmelding(oppdatertFeilmelding) - call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert") + call.respond(status = HttpStatusCode.OK, message = "Feilmelding oppdatert") } put("/api/oppdaterkommentar") { val innkommendeKommentar = call.receive() feilmeldingRepository.oppdaterKommentar(innkommendeKommentar.id, innkommendeKommentar.kommentar) - call.respond(status = HttpStatusCode.Created, message = "Feilmelding oppdatert") + call.respond(status = HttpStatusCode.OK, message = "Feilmelding oppdatert") } delete("api/slettfeilmelding/{id}") { val id = call.parameters["id"] checkNotNull(id) {"Id kan ikke være null"} feilmeldingRepository.slettFeilmelding(id.toInt()) - call.respond(status = HttpStatusCode.Created, message = "Feilmelding slettet") + call.respond(status = HttpStatusCode.OK, message = "Feilmelding slettet") } } } From 3dbf5d7caa676a075bea50bfa3e84eaaada70e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amalie=20Mans=C3=A5ker?= Date: Thu, 10 Aug 2023 10:46:27 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Rydder=20opp=20i=20?= =?UTF-8?q?response-meldinger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/no/nav/helse/sprik/plugins/Routing.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 ba5ed02..d0ba4af 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 @@ -50,19 +50,19 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin call.respondText("READY") } get("/api/hentallefeil"){ - val testMelding = feilmeldingRepository.hentAlleFeilmeldinger() - call.respond(status = HttpStatusCode.OK, message = testMelding) + val feilmeldinger = feilmeldingRepository.hentAlleFeilmeldinger() + call.respond(status = HttpStatusCode.OK, message = feilmeldinger) } get("/api/hentsok/{sokestreng}"){ val sokestreng = call.parameters["sokestreng"] - ?: return@get call.respond(HttpStatusCode.BadRequest, "Sokestreng må være definert") + ?: return@get call.respond(HttpStatusCode.BadRequest, "Søkestreng må være definert") val sokeresultat = feilmeldingRepository.hentSokteFeilmeldinger(sokestreng) call.respond(status = HttpStatusCode.OK, message = sokeresultat) } post("/api/nyfeil") { val feilmelding = call.receive() feilmeldingRepository.lagre(feilmelding) - call.respond(status = HttpStatusCode.Created, message = "Feilmelding motatt og sendt til database") + call.respond(status = HttpStatusCode.Created, message = "Feilmelding motatt og lagret") } put("/api/oppdaterfeil") { val oppdatertFeilmelding = call.receive() @@ -72,7 +72,7 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin put("/api/oppdaterkommentar") { val innkommendeKommentar = call.receive() feilmeldingRepository.oppdaterKommentar(innkommendeKommentar.id, innkommendeKommentar.kommentar) - call.respond(status = HttpStatusCode.OK, message = "Feilmelding oppdatert") + call.respond(status = HttpStatusCode.OK, message = "Kommentar oppdatert") } delete("api/slettfeilmelding/{id}") { val id = call.parameters["id"]