From cb3157d0087d73cea89dc49f8831da2ea78ebd2a Mon Sep 17 00:00:00 2001 From: Sindre Kjelsrud Date: Tue, 1 Aug 2023 09:57:21 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Legger=20til=20PK,?= =?UTF-8?q?=20arbeidsstatus=20og=20haster=20i=20database?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Amalie Erdal Mansåker --- .../no/nav/helse/sprik/db/FeilmeldingRepository.kt | 8 +++++++- .../kotlin/no/nav/helse/sprik/db/FeilmeldingTable.kt | 2 ++ .../kotlin/no/nav/helse/sprik/modell/Feilmelding.kt | 3 ++- .../db/migration/V4__leggerTilStatusOgPK.sql | 10 ++++++++++ backend/src/test/kotlin/LocalApp.kt | 12 ++++++------ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql 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 cb5a975..85bca6c 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 @@ -1,8 +1,10 @@ package no.nav.helse.sprik.db import com.typesafe.config.ConfigException.Null +import no.nav.helse.sprik.db.FeilmeldingTable.arbeidsstatus import no.nav.helse.sprik.db.FeilmeldingTable.beskrivelse import no.nav.helse.sprik.db.FeilmeldingTable.dato +import no.nav.helse.sprik.db.FeilmeldingTable.haster import no.nav.helse.sprik.db.FeilmeldingTable.tittel import no.nav.helse.sprik.modell.Feilmelding import org.jetbrains.exposed.sql.* @@ -18,6 +20,8 @@ class FeilmeldingRepository { it[FeilmeldingTable.tittel] = feilmelding.tittel it[FeilmeldingTable.beskrivelse] = feilmelding.beskrivelse it[FeilmeldingTable.dato] = feilmelding.dato + it[FeilmeldingTable.arbeidsstatus] = feilmelding.arbeidsstatus + it[FeilmeldingTable.haster] = feilmelding.haster } } } @@ -26,7 +30,9 @@ class FeilmeldingRepository { private fun radTilFeilmelding(rad: ResultRow) = Feilmelding( tittel = rad[tittel], beskrivelse = rad[beskrivelse], - dato = rad[dato] + dato = rad[dato], + arbeidsstatus = rad[arbeidsstatus], + haster = rad[haster] ) fun hentAlleFeilmeldinger(): List = transaction { diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingTable.kt b/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingTable.kt index 8a15d01..13a2c35 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingTable.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/db/FeilmeldingTable.kt @@ -7,4 +7,6 @@ object FeilmeldingTable : Table("feilmelding") { val tittel = text("tittel") val beskrivelse = text("beskrivelse") val dato = datetime("dato") + val arbeidsstatus = integer("arbeidsstatus") + val haster = bool("haster") } \ No newline at end of file diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/modell/Feilmelding.kt b/backend/src/main/kotlin/no/nav/helse/sprik/modell/Feilmelding.kt index 4334ab2..7f14fe6 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/modell/Feilmelding.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/modell/Feilmelding.kt @@ -17,7 +17,8 @@ class Feilmelding( val tittel: String, val beskrivelse: String, val dato: LocalDateTime, //Krever en spesiallaget serialiserer i KotlinX - //val tags: ArrayList = arrayListOf() + val arbeidsstatus: Int, + val haster: Boolean //val bilde: String, ) { override fun toString(): String { diff --git a/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql b/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql new file mode 100644 index 0000000..b88afca --- /dev/null +++ b/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql @@ -0,0 +1,10 @@ +DROP TABLE feilmelding + +CREATE TABLE feilmelding ( + id SERIAL PRIMARY KEY , + tittel VARCHAR NOT NULL, + beskrivelse VARCHAR NOT NULL, + dato TIMESTAMP NOT NULL, + arbeidsstatus SMALLINT NOT NULL DEFAULT 0, + haster BOOLEAN NOT NULL DEFAULT false +) \ No newline at end of file diff --git a/backend/src/test/kotlin/LocalApp.kt b/backend/src/test/kotlin/LocalApp.kt index ae42cc6..b3c8999 100644 --- a/backend/src/test/kotlin/LocalApp.kt +++ b/backend/src/test/kotlin/LocalApp.kt @@ -22,10 +22,10 @@ fun main() { private fun oppretteMockData() { val feilmeldingRepository = FeilmeldingRepository() - feilmeldingRepository.lagre(Feilmelding("Mangel på hensyn til tariffoppgjør", "Det har vært ett tariffoppgjør og speil sier sykepengene må tilbakekreves, noe som er feil. (sier vi.. har ikke domenekunnskap)", LocalDateTime.of(2023, 1, 1, 8, 0, 0))) - feilmeldingRepository.lagre(Feilmelding("Speil sier NAV må tilbakekreve sykepenger på feil grunnlag", "Beskrivelse Test2", LocalDateTime.of(2023, 2, 1, 8, 0, 0))) - feilmeldingRepository.lagre(Feilmelding("Feil A", "Lorem Ipsum", LocalDateTime.of(2023, 3, 1, 8, 0, 0))) - feilmeldingRepository.lagre(Feilmelding("Feil B", "Lorem Ipsum", LocalDateTime.of(2023, 4, 1, 8, 0, 0))) - feilmeldingRepository.lagre(Feilmelding("Feil C", "Lorem Ipsum", LocalDateTime.of(2023, 5, 1, 8, 0, 0))) - feilmeldingRepository.lagre(Feilmelding("Feil D", "Lorem Ipsum", LocalDateTime.of(2023, 6, 1, 8, 0, 0))) + feilmeldingRepository.lagre(Feilmelding("Mangel på hensyn til tariffoppgjør", "Det har vært ett tariffoppgjør og speil sier sykepengene må tilbakekreves, noe som er feil. (sier vi.. har ikke domenekunnskap)", LocalDateTime.of(2023, 1, 1, 8, 0, 0), 0, false)) + feilmeldingRepository.lagre(Feilmelding("Speil sier NAV må tilbakekreve sykepenger på feil grunnlag", "Beskrivelse Test2", LocalDateTime.of(2023, 2, 1, 8, 0, 0), 1, true)) + feilmeldingRepository.lagre(Feilmelding("Feil A", "Lorem Ipsum", LocalDateTime.of(2023, 3, 1, 8, 0, 0), 2, false)) + feilmeldingRepository.lagre(Feilmelding("Feil B", "Lorem Ipsum", LocalDateTime.of(2023, 4, 1, 8, 0, 0), 1, true)) + feilmeldingRepository.lagre(Feilmelding("Feil C", "Lorem Ipsum", LocalDateTime.of(2023, 5, 1, 8, 0, 0), 1, true)) + feilmeldingRepository.lagre(Feilmelding("Feil D", "Lorem Ipsum", LocalDateTime.of(2023, 6, 1, 8, 0, 0), 0, false)) } From a9c267e309279b9cabb73ce01b794f8f6ed7fbab Mon Sep 17 00:00:00 2001 From: Sindre Kjelsrud Date: Tue, 1 Aug 2023 10:03:27 +0200 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20Fikser=20glemt=20se?= =?UTF-8?q?mikolon=20+=20glemte=20felt=20i=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Amalie Erdal Mansåker --- .../main/resources/db/migration/V4__leggerTilStatusOgPK.sql | 4 ++-- backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql b/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql index b88afca..2079d6c 100644 --- a/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql +++ b/backend/src/main/resources/db/migration/V4__leggerTilStatusOgPK.sql @@ -1,4 +1,4 @@ -DROP TABLE feilmelding +DROP TABLE feilmelding; CREATE TABLE feilmelding ( id SERIAL PRIMARY KEY , @@ -7,4 +7,4 @@ CREATE TABLE feilmelding ( dato TIMESTAMP NOT NULL, arbeidsstatus SMALLINT NOT NULL DEFAULT 0, haster BOOLEAN NOT NULL DEFAULT false -) \ No newline at end of file +); \ No newline at end of file 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 b40f9ad..c1ed9b1 100644 --- a/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt +++ b/backend/src/test/kotlin/no/nav/helse/sprik/FeilmeldingTest.kt @@ -21,8 +21,8 @@ import org.jetbrains.exposed.sql.Database as ExposedDatabase class FeilmeldingTest { private val database = Database(dbconfig()).configureFlyway() private val feilmeldingRepository = FeilmeldingRepository() - private val feilmelding = Feilmelding("Test", "Testesen", LocalDateTime.of(2023,1,1,8,0)) - private val feilmelding2 = Feilmelding("Tittel", "Beskrivelse", LocalDateTime.of(2023,2,1,8,0)) + private val feilmelding = Feilmelding("Test", "Testesen", LocalDateTime.of(2023,1,1,8,0), 0, true) + private val feilmelding2 = Feilmelding("Tittel", "Beskrivelse", LocalDateTime.of(2023,2,1,8,0), 1, false) @BeforeAll fun setup() { From aa756f266db63e49962d1e4f67992e6670abf178 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Tue, 1 Aug 2023 10:16:33 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8D=B1=20Oppdaterer=20interface=20fro?= =?UTF-8?q?ntend=20for=20=C3=A5=20matche=20nye=20felt=20haster=20og=20arbe?= =?UTF-8?q?idsstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/FeilCard.tsx | 18 +++++++++++++++--- frontend/src/interface.ts | 7 ++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/FeilCard.tsx b/frontend/src/components/FeilCard.tsx index d71eded..d0e2383 100644 --- a/frontend/src/components/FeilCard.tsx +++ b/frontend/src/components/FeilCard.tsx @@ -31,10 +31,22 @@ export const FeilKort = (props: IFeilKort) => { active:bg-surface-active" onClick={() => setVisModal(true)} > - + - +
{/* TODO: HER KOMMER CONTENT */} @@ -60,7 +72,7 @@ export const FeilkortHeader = (props: IFeilmelding) => {

{props.dato.toDateString()}

{props.beskrivelse}

- + ) } diff --git a/frontend/src/interface.ts b/frontend/src/interface.ts index 4edcb50..4757bd0 100644 --- a/frontend/src/interface.ts +++ b/frontend/src/interface.ts @@ -6,14 +6,17 @@ export interface IFeilmelding { tittel: string, beskrivelse: string - // haster: boolean dato: Date + haster: boolean + arbeidsstatus: number } export class Feilmelding implements IFeilmelding { tittel: string = "default tittel" beskrivelse: string = "default beskrivelse" dato: Date = new Date() + haster: boolean = false + arbeidsstatus: number = 0 /** * Typescript 2.1 syntax som lar deg sende inn et JSON object og mappe det til class. @@ -24,6 +27,8 @@ export class Feilmelding implements IFeilmelding { tittel: string, beskrivelse: string, dato: Date + haster: boolean + arbeidsstatus: number }) { if (fields) Object.assign(this, fields); } From 0fbde2fa576ee511b6bec279cc3fd9b19404ea47 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Tue, 1 Aug 2023 10:28:09 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=90=9B=20Manglet=20nye=20props=20i=20?= =?UTF-8?q?cardcontainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/CardsContainer.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/CardsContainer.tsx b/frontend/src/components/CardsContainer.tsx index e2a9dbd..1e93578 100644 --- a/frontend/src/components/CardsContainer.tsx +++ b/frontend/src/components/CardsContainer.tsx @@ -10,15 +10,19 @@ interface ICardsContainer { * @returns grid med feilmeldinger */ const CardsContainer = (props: ICardsContainer) => { + {props.feilmeldinger.map((feilMelding) => console.log(feilMelding))} return (
+ {props.feilmeldinger.map((feilMelding) => ( )) } From 791c7093991a4893d1d83970f9532f96bfe74e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amalie=20Mans=C3=A5ker?= Date: Tue, 1 Aug 2023 10:32:15 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20S=C3=B8rger=20for=20at=20fei?= =?UTF-8?q?lmelding=20som=20blir=20sendt=20fra=20frontend=20matcher=20feil?= =?UTF-8?q?meldingsobjekt=20i=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sindre Kjelsrud --- frontend/src/pages/feil.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx index ee889c1..ac0de6d 100644 --- a/frontend/src/pages/feil.tsx +++ b/frontend/src/pages/feil.tsx @@ -18,7 +18,9 @@ export default function Feil() { const payload = { tittel: tittel, beskrivelse: beskrivelse, - dato: new Date().toISOString().replace('Z', '') + dato: new Date().toISOString().replace('Z', ''), // Litt wack fix, burde endres + arbeidsstatus: 0, + haster: false } axios.post("/api/nyfeil", payload, {