Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Koin test #596

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Koin test #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df9c00f
Koin test
mettok Sep 15, 2024
3bf203c
Koin test
mettok Sep 16, 2024
5b8a2c0
Koin test
mettok Sep 16, 2024
e576edb
Koin test
mettok Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ val kotlinxSerializationVersion: String by project
val bakgrunnsjobbVersion: String by project
val pdlClientVersion: String by project
val tokenProviderVersion: String by project

plugins {
kotlin("jvm")
kotlin("plugin.serialization")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ hagUtilsVersion=0.7.0
kotlinxSerializationVersion=1.6.0
bakgrunnsjobbVersion=1.0.4
pdlClientVersion=0.6.2
tokenProviderVersion=0.3.0
tokenProviderVersion=0.3.0
131 changes: 79 additions & 52 deletions src/main/kotlin/no/nav/syfo/koin/DevKoinProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,49 +69,57 @@ fun devConfig(config: ApplicationConfig) =

single {
JoarkInntektsmeldingHendelseProsessor(
get(),
get(),
get(),
get(),
om = get(),
metrikk = get(),
inntektsmeldingBehandler = get(),
oppgaveClient = get(),
)
}

single {
InntektsmeldingBehandler(
get(),
get(),
get(),
get(),
get(),
get(),
journalpostService = get(),
metrikk = get(),
inntektsmeldingService = get(),
inntektsmeldingAivenProducer = get(),
utsattOppgaveService = get(),
pdlClient = get(),
)
}

single { InngaaendeJournalConsumer(get()) }
single { BehandleInngaaendeJournalConsumer(get()) }
single { JournalConsumer(get(), get(), get()) }
single { InngaaendeJournalConsumer(safJournalpostClient = get()) }
single { BehandleInngaaendeJournalConsumer(dokArkivClient = get()) }
single { JournalConsumer(safDokumentClient = get(), safJournalpostClient = get(), pdlClient = get()) }
single { Metrikk() }
single { BehandlendeEnhetConsumer(get(), get(), get()) }
single { JournalpostService(get(), get(), get(), get(), get()) }
single { InntektsmeldingRepositoryImp(get()) } bind InntektsmeldingRepository::class
single { InntektsmeldingService(get(), get()) }
single { ArbeidsgiverperiodeRepositoryImp(get()) } bind ArbeidsgiverperiodeRepository::class
single { BehandlendeEnhetConsumer(pdlClient = get(), norg2Client = get(), metrikk = get()) }
single {
JournalpostService(
inngaaendeJournalConsumer = get(),
behandleInngaaendeJournalConsumer = get(),
journalConsumer = get(),
behandlendeEnhetConsumer = get(),
metrikk = get(),
)
}
single { InntektsmeldingRepositoryImp(ds = get()) } bind InntektsmeldingRepository::class
single { InntektsmeldingService(repository = get(), objectMapper = get()) }
single { ArbeidsgiverperiodeRepositoryImp(ds = get()) } bind ArbeidsgiverperiodeRepository::class

single {
JournalpostHendelseConsumer(
joarkAivenProperties(),
config.getString("kafka_joark_hendelse_topic"),
get(),
get(),
props = joarkAivenProperties(),
topicName = config.getString("kafka_joark_hendelse_topic"),
bakgrunnsjobbRepo = get(),
om = get(),
)
}
single {
UtsattOppgaveConsumer(
utsattOppgaveAivenProperties(),
config.getString("kafka_utsatt_oppgave_topic"),
get(),
get(),
get(),
props = utsattOppgaveAivenProperties(),
topicName = config.getString("kafka_utsatt_oppgave_topic"),
om = get(),
utsattOppgaveService = get(),
bakgrunnsjobbRepo = get(),
)
}

Expand All @@ -122,63 +130,82 @@ fun devConfig(config: ApplicationConfig) =
}

single { UtsattOppgaveDAO(UtsattOppgaveRepositoryImp(get())) }
single { UtsattOppgaveService(get(), get(), get(), get(), get(), get()) }
single { FeiletUtsattOppgaveMeldingProsessor(get(), get()) }
single {
UtsattOppgaveService(
utsattOppgaveDAO = get(),
oppgaveClient = get(),
behandlendeEnhetConsumer = get(),
inntektsmeldingRepository = get(),
om = get(),
metrikk = get(),
)
}
single { FeiletUtsattOppgaveMeldingProsessor(om = get(), oppgaveService = get()) }

single {
FjernInntektsmeldingByBehandletProcessor(
InntektsmeldingRepositoryImp(get()),
config.getString("lagringstidMåneder").toInt(),
)
}
single { FinnAlleUtgaandeOppgaverProcessor(get(), get(), get(), get(), get(), get()) }
single {
FinnAlleUtgaandeOppgaverProcessor(
utsattOppgaveDAO = get(),
oppgaveClient = get(),
behandlendeEnhetConsumer = get(),
metrikk = get(),
inntektsmeldingRepository = get(),
om = get(),
)
}

single { PostgresBakgrunnsjobbRepository(get()) } bind BakgrunnsjobbRepository::class
single { BakgrunnsjobbService(get(), bakgrunnsvarsler = MetrikkVarsler()) }
single { PostgresBakgrunnsjobbRepository(dataSource = get()) } bind BakgrunnsjobbRepository::class
single { BakgrunnsjobbService(bakgrunnsjobbRepository = get(), bakgrunnsvarsler = MetrikkVarsler()) }

single {
OppgaveClient(
config.getString("oppgavebehandling_url"),
get(),
get(),
get<AccessTokenProvider>(qualifier = named(AccessScope.OPPGAVE))::getToken,
oppgavebehandlingUrl = config.getString("oppgavebehandling_url"),
httpClient = get(),
metrikk = get(),
getAccessToken = get<AccessTokenProvider>(qualifier = named(AccessScope.OPPGAVE))::getToken,
)
}

single {
Norg2Client(
config.getString("norg2_url"),
get(),
url = config.getString("norg2_url"),
httpClient = get(),
)
}

single {
SafJournalpostClient(
get(),
config.getString("saf_journal_url"),
get<AccessTokenProvider>(qualifier = named(AccessScope.SAF))::getToken,
httpClient = get(),
basePath = config.getString("saf_journal_url"),
getAccessToken = get<AccessTokenProvider>(qualifier = named(AccessScope.SAF))::getToken,
)
}

single {
SafDokumentClient(
config.getString("saf_dokument_url"),
get(),
get<AccessTokenProvider>(qualifier = named(AccessScope.SAF))::getToken,
url = config.getString("saf_dokument_url"),
httpClient = get(),
getAccessToken = get<AccessTokenProvider>(qualifier = named(AccessScope.SAF))::getToken,
)
}

single {
DokArkivClient(
config.getString("dokarkiv_url"),
get(),
get<AccessTokenProvider>(qualifier = named(AccessScope.DOKARKIV))::getToken,
url = config.getString("dokarkiv_url"),
httpClient = get(),
getAccessToken = get<AccessTokenProvider>(qualifier = named(AccessScope.DOKARKIV))::getToken,
)
}

// TODO: trekk ut topic og consumerConfig-properties
single {
InntektsmeldingConsumer(
props =
commonAivenProperties() +
mapOf(
ConsumerConfig.AUTO_OFFSET_RESET_CONFIG to "earliest",
Expand All @@ -189,11 +216,11 @@ fun devConfig(config: ApplicationConfig) =
ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG to StringDeserializer::class.java,
ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG to StringDeserializer::class.java,
),
"helsearbeidsgiver.inntektsmelding",
get(),
get(),
get(),
get(),
topicName = "helsearbeidsgiver.inntektsmelding",
inntektsmeldingService = get(),
inntektsmeldingAivenProducer = get(),
utsattOppgaveService = get(),
pdlClient = get(),
)
}
}
6 changes: 4 additions & 2 deletions src/main/kotlin/no/nav/syfo/koin/KoinProfiles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import io.ktor.http.ContentType
import io.ktor.serialization.jackson.JacksonConverter
import io.ktor.serialization.jackson.jackson
import io.ktor.server.config.ApplicationConfig
import no.nav.syfo.util.AppEnv.DEV
import no.nav.syfo.util.AppEnv.PROD
import no.nav.syfo.util.KubernetesProbeManager
import no.nav.syfo.util.customObjectMapper
import org.koin.core.module.Module
Expand All @@ -25,8 +27,8 @@ import org.koin.dsl.module
fun selectModuleBasedOnProfile(config: ApplicationConfig): List<Module> {
val envModule =
when (config.property("koin.profile").getString()) {
"PROD" -> prodConfig(config)
"DEV" -> devConfig(config)
PROD.name -> prodConfig(config)
DEV.name -> devConfig(config)
else -> localDevConfig(config)
}
return listOf(common, envModule)
Expand Down
95 changes: 68 additions & 27 deletions src/main/kotlin/no/nav/syfo/koin/LocalKoinProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,37 +62,78 @@ fun localDevConfig(config: ApplicationConfig) =
} bind DataSource::class
single { UtsattOppgaveRepositoryImp(get()) } bind UtsattOppgaveRepository::class

single { FinnAlleUtgaandeOppgaverProcessor(get(), get(), get(), get(), get(), get()) }
single {
FinnAlleUtgaandeOppgaverProcessor(
utsattOppgaveDAO = get(),
oppgaveClient = get(),
behandlendeEnhetConsumer = get(),
metrikk = get(),
inntektsmeldingRepository = get(),
om = get(),
)
}

single {
JournalpostHendelseConsumer(
joarkLocalProperties(),
config.getString("kafka_joark_hendelse_topic"),
get(),
get(),
props = joarkLocalProperties(),
topicName = config.getString("kafka_joark_hendelse_topic"),
bakgrunnsjobbRepo = get(),
om = get(),
)
}
single {
UtsattOppgaveConsumer(utsattOppgaveLocalProperties(), config.getString("kafka_utsatt_oppgave_topic"), get(), get(), get())
UtsattOppgaveConsumer(
props = utsattOppgaveLocalProperties(),
topicName = config.getString("kafka_utsatt_oppgave_topic"),
om = get(),
utsattOppgaveService = get(),
bakgrunnsjobbRepo = get(),
)
}
single { PostgresBakgrunnsjobbRepository(get()) } bind BakgrunnsjobbRepository::class
single { BakgrunnsjobbService(get()) }
single { BehandlendeEnhetConsumer(get(), get(), get()) }
single { UtsattOppgaveDAO(UtsattOppgaveRepositoryMockk()) }
single { OppgaveClient(config.getString("oppgavebehandling_url"), get(), get()) { "local token" } }
single { UtsattOppgaveService(get(), get(), get(), get(), get(), get()) }
single { FeiletUtsattOppgaveMeldingProsessor(get(), get()) }
single { PostgresBakgrunnsjobbRepository(dataSource = get()) } bind BakgrunnsjobbRepository::class
single { BakgrunnsjobbService(bakgrunnsjobbRepository = get()) }
single { BehandlendeEnhetConsumer(pdlClient = get(), norg2Client = get(), metrikk = get()) }
single { UtsattOppgaveDAO(utsattOppgaveRepository = UtsattOppgaveRepositoryMockk()) }
single { OppgaveClient(oppgavebehandlingUrl = config.getString("oppgavebehandling_url"), httpClient = get(), metrikk = get()) { "local token" } }
single {
UtsattOppgaveService(
utsattOppgaveDAO = get(),
oppgaveClient = get(),
behandlendeEnhetConsumer = get(),
inntektsmeldingRepository = get(),
om = get(),
metrikk = get(),
)
}
single { FeiletUtsattOppgaveMeldingProsessor(om = get(), oppgaveService = get()) }

single { FjernInntektsmeldingByBehandletProcessor(get(), 1) }
single { FjernInntektsmeldingByBehandletProcessor(repository = get(), lagringstidMåneder = 1) }

single { InntektsmeldingBehandler(get(), get(), get(), get(), get(), get()) }
single { InngaaendeJournalConsumer(get()) }
single { BehandleInngaaendeJournalConsumer(get()) }
single { JournalConsumer(get(), get(), get()) }
single {
InntektsmeldingBehandler(
journalpostService = get(),
metrikk = get(),
inntektsmeldingService = get(),
inntektsmeldingAivenProducer = get(),
utsattOppgaveService = get(),
pdlClient = get(),
)
}
single { InngaaendeJournalConsumer(safJournalpostClient = get()) }
single { BehandleInngaaendeJournalConsumer(dokArkivClient = get()) }
single { JournalConsumer(safDokumentClient = get(), safJournalpostClient = get(), pdlClient = get()) }
single { Metrikk() } bind Metrikk::class
single { JournalpostService(get(), get(), get(), get(), get()) }
single { InntektsmeldingService(InntektsmeldingRepositoryImp(get()), get()) }
single { JoarkInntektsmeldingHendelseProsessor(get(), get(), get(), get()) }
single {
JournalpostService(
inngaaendeJournalConsumer = get(),
behandleInngaaendeJournalConsumer = get(),
journalConsumer = get(),
behandlendeEnhetConsumer = get(),
metrikk = get(),
)
}
single { InntektsmeldingService(InntektsmeldingRepositoryImp(ds = get()), get()) }
single { JoarkInntektsmeldingHendelseProsessor(om = get(), metrikk = get(), inntektsmeldingBehandler = get(), oppgaveClient = get()) }

single {
InntektsmeldingAivenProducer(producerLocalProperties(config.getString("kafka_bootstrap_servers")))
Expand Down Expand Up @@ -126,12 +167,12 @@ fun localDevConfig(config: ApplicationConfig) =

single {
InntektsmeldingConsumer(
inntektsmeldingFraSimbaLocalProperties(),
"inntektsmelding",
get(),
get(),
get(),
get(),
props = inntektsmeldingFraSimbaLocalProperties(),
topicName = "inntektsmelding",
inntektsmeldingService = get(),
inntektsmeldingAivenProducer = get(),
utsattOppgaveService = get(),
pdlClient = get(),
)
}
}
Expand Down
Loading
Loading