ta meg endringene til johnny fra forrige commit

navikt · Oct 10, 2023 · 106a179 · 106a179
1 parent 6911d21
commit 106a179
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/client/src/test/kotlin/no/nav/su/se/bakover/client/skatteetaten/SkatteClientTest.kt b/client/src/test/kotlin/no/nav/su/se/bakover/client/skatteetaten/SkatteClientTest.kt
@@ -13,7 +13,6 @@ import no.nav.su.se.bakover.common.SU_SE_BAKOVER_CONSUMER_ID
 import no.nav.su.se.bakover.common.auth.AzureAd
 import no.nav.su.se.bakover.common.infrastructure.config.ApplicationConfig
 import no.nav.su.se.bakover.common.person.Fnr
-import no.nav.su.se.bakover.domain.person.PersonOppslag
 import no.nav.su.se.bakover.domain.skatt.KunneIkkeHenteSkattemelding
 import no.nav.su.se.bakover.domain.skatt.SamletSkattegrunnlagForÅr
 import no.nav.su.se.bakover.domain.skatt.SamletSkattegrunnlagForÅrOgStadie
@@ -26,6 +25,7 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.slf4j.MDC
+import person.domain.PersonOppslag
 import java.time.LocalDate
 import java.time.Year
 

diff --git a/service/src/main/kotlin/no/nav/su/se/bakover/service/skatt/SkattDokumentServiceImpl.kt b/service/src/main/kotlin/no/nav/su/se/bakover/service/skatt/SkattDokumentServiceImpl.kt
@@ -14,7 +14,6 @@ import no.nav.su.se.bakover.common.persistence.TransactionContext
 import no.nav.su.se.bakover.common.tid.Tidspunkt
 import no.nav.su.se.bakover.domain.grunnlag.EksterneGrunnlagSkatt
 import no.nav.su.se.bakover.domain.journalpost.JournalpostSkattUtenforSak
-import no.nav.su.se.bakover.domain.person.PersonOppslag
 import no.nav.su.se.bakover.domain.sak.Sakstype
 import no.nav.su.se.bakover.domain.skatt.DokumentSkattRepo
 import no.nav.su.se.bakover.domain.skatt.Skattedokument
@@ -23,6 +22,7 @@ import no.nav.su.se.bakover.domain.vedtak.KunneIkkeGenerereSkattedokument
 import no.nav.su.se.bakover.domain.vedtak.Stønadsvedtak
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import person.domain.PersonOppslag
 import java.time.Clock
 import java.util.UUID
 

diff --git a/service/src/test/kotlin/no/nav/su/se/bakover/service/skatt/SkattDokumentServiceImplTest.kt b/service/src/test/kotlin/no/nav/su/se/bakover/service/skatt/SkattDokumentServiceImplTest.kt
@@ -17,7 +17,6 @@ import no.nav.su.se.bakover.common.person.Fnr
 import no.nav.su.se.bakover.domain.brev.jsonRequest.PdfInnhold
 import no.nav.su.se.bakover.domain.grunnlag.EksterneGrunnlagSkatt
 import no.nav.su.se.bakover.domain.journalpost.JournalpostSkattUtenforSak
-import no.nav.su.se.bakover.domain.person.PersonOppslag
 import no.nav.su.se.bakover.domain.sak.Sakstype
 import no.nav.su.se.bakover.domain.skatt.DokumentSkattRepo
 import no.nav.su.se.bakover.test.TestSessionFactory
@@ -45,6 +44,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
+import person.domain.PersonOppslag
 import java.time.Clock
 
 internal class SkattDokumentServiceImplTest {

diff --git a/utenlandsopphold/domain/build.gradle.kts b/utenlandsopphold/domain/build.gradle.kts
@@ -1,6 +1,7 @@
 dependencies {
     implementation(project(":common:domain"))
     implementation(project(":hendelse:domain"))
+    implementation(project(":person:domain"))
 }
 
 tasks.named<Jar>("jar") {

diff --git a/web-regresjonstest/build.gradle.kts b/web-regresjonstest/build.gradle.kts
@@ -26,6 +26,8 @@ dependencies {
     implementation(project(":tilbakekreving:application"))
     implementation(project(":tilbakekreving:infrastructure"))
 
+    implementation(project(":person:domain"))
+
     implementation("io.ktor:ktor-client-java:$ktorVersion")
     implementation("io.ktor:ktor-server-test-host:$ktorVersion") {
         exclude(group = "junit")