-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #339 from navikt/unique_mottak
Unique oversendelse
- Loading branch information
Showing
10 changed files
with
133 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
src/main/kotlin/no/nav/klage/oppgave/exceptions/OppgaveExceptions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 6 additions & 1 deletion
7
src/main/kotlin/no/nav/klage/oppgave/repositories/MottakRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,14 @@ | ||
package no.nav.klage.oppgave.repositories | ||
|
||
import no.nav.klage.oppgave.domain.klage.Mottak | ||
import no.nav.klage.oppgave.domain.kodeverk.Fagsystem | ||
import org.springframework.data.jpa.repository.JpaRepository | ||
import org.springframework.stereotype.Repository | ||
import java.util.* | ||
|
||
@Repository | ||
interface MottakRepository : JpaRepository<Mottak, UUID> | ||
interface MottakRepository : JpaRepository<Mottak, UUID> { | ||
|
||
fun existsByKildesystemAndKildeReferanse(kildesystem: Fagsystem, kildeReferanse: String): Boolean | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ALTER TABLE klage.mottak | ||
ADD CONSTRAINT unique_mottak UNIQUE (kildesystem, kilde_referanse); |
86 changes: 86 additions & 0 deletions
86
src/test/kotlin/no/nav/klage/oppgave/service/DuplicateOversendelseTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
package no.nav.klage.oppgave.service | ||
|
||
import com.ninjasquad.springmockk.MockkBean | ||
import io.micrometer.core.instrument.MeterRegistry | ||
import io.mockk.every | ||
import no.nav.klage.oppgave.api.view.* | ||
import no.nav.klage.oppgave.clients.norg2.Norg2Client | ||
import no.nav.klage.oppgave.db.TestPostgresqlContainer | ||
import no.nav.klage.oppgave.domain.kodeverk.Tema | ||
import no.nav.klage.oppgave.domain.kodeverk.Type | ||
import no.nav.klage.oppgave.exceptions.DuplicateOversendelseException | ||
import no.nav.klage.oppgave.repositories.EnhetRepository | ||
import org.junit.jupiter.api.MethodOrderer | ||
import org.junit.jupiter.api.Test | ||
import org.junit.jupiter.api.TestMethodOrder | ||
import org.junit.jupiter.api.assertThrows | ||
import org.springframework.beans.factory.annotation.Autowired | ||
import org.springframework.boot.autoconfigure.domain.EntityScan | ||
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase | ||
import org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureDataJpa | ||
import org.springframework.boot.test.context.SpringBootTest | ||
import org.springframework.data.jpa.repository.config.EnableJpaRepositories | ||
import org.springframework.test.context.ActiveProfiles | ||
import org.testcontainers.junit.jupiter.Container | ||
import org.testcontainers.junit.jupiter.Testcontainers | ||
import java.time.LocalDate | ||
|
||
|
||
@ActiveProfiles("local") | ||
@SpringBootTest(classes = [MottakService::class]) | ||
@EnableJpaRepositories(basePackages = ["no.nav.klage.oppgave.repositories"]) | ||
@EntityScan("no.nav.klage.oppgave.domain") | ||
@AutoConfigureDataJpa | ||
@Testcontainers | ||
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) | ||
@TestMethodOrder(MethodOrderer.OrderAnnotation::class) | ||
internal class DuplicateOversendelseTest { | ||
|
||
companion object { | ||
@Container | ||
@JvmField | ||
val postgreSQLContainer: TestPostgresqlContainer = TestPostgresqlContainer.instance | ||
} | ||
|
||
@MockkBean(relaxed = true) | ||
lateinit var dokumentService: DokumentService | ||
|
||
@MockkBean(relaxed = true) | ||
lateinit var norg2Client: Norg2Client | ||
|
||
@MockkBean(relaxed = true) | ||
lateinit var enhetRepository: EnhetRepository | ||
|
||
@MockkBean(relaxed = true) | ||
lateinit var meterReqistry: MeterRegistry | ||
|
||
@Autowired | ||
lateinit var mottakService: MottakService | ||
|
||
@Test | ||
fun `duplicate oversendelse throws exception`() { | ||
val saksbehandler = "Z123456" | ||
every { enhetRepository.getAnsatteIEnhet(any()) } returns listOf(saksbehandler) | ||
|
||
val oversendtKlage = OversendtKlage( | ||
avsenderEnhet = "4455", | ||
avsenderSaksbehandlerIdent = saksbehandler, | ||
innsendtTilNav = LocalDate.now(), | ||
mottattFoersteinstans = LocalDate.now(), | ||
tema = Tema.OMS, | ||
type = Type.KLAGE, | ||
klager = OversendtKlager( | ||
id = OversendtPartId( | ||
type = OversendtPartIdType.PERSON, | ||
verdi = "01043137677" | ||
) | ||
), | ||
kilde = KildeFagsystem.K9, | ||
kildeReferanse = "abc" | ||
) | ||
|
||
mottakService.createMottakForKlage(oversendtKlage) | ||
|
||
assertThrows<DuplicateOversendelseException> { mottakService.createMottakForKlage(oversendtKlage) } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters