remove service that updates statuses (#143)

* remove service that updates statuses * remove more stuff
navikt · Jul 24, 2023 · 82027c1 · 82027c1
1 parent 626ae02
commit 82027c1
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 367 deletions.
diff --git a/naiserator-dev.yaml b/naiserator-dev.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     team: teamsykmelding
 spec:
-  leaderElection: true
   gcp:
     sqlInstances:
       - name: syfosmmanuell-backend-instance

diff --git a/naiserator-prod.yaml b/naiserator-prod.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     team: teamsykmelding
 spec:
-  leaderElection: true
   gcp:
     sqlInstances:
       - name: syfosmmanuell-backend-instance

diff --git a/src/main/kotlin/no/nav/syfo/Bootstrap.kt b/src/main/kotlin/no/nav/syfo/Bootstrap.kt
@@ -21,11 +21,8 @@ import no.nav.syfo.clients.HttpClients
 import no.nav.syfo.clients.KafkaConsumers
 import no.nav.syfo.clients.KafkaProducers
 import no.nav.syfo.db.Database
-import no.nav.syfo.elector.LeaderElector
-import no.nav.syfo.elector.LeadershipHandling
 import no.nav.syfo.oppgave.kafka.OppgaveHendelseConsumer
 import no.nav.syfo.oppgave.service.OppgaveService
-import no.nav.syfo.oppgave.service.UpdateStatusService
 import no.nav.syfo.persistering.MottattSykmeldingService
 import no.nav.syfo.service.ManuellOppgaveService
 import no.nav.syfo.util.TrackableException
@@ -109,15 +106,8 @@ fun main() {
     createListener(applicationState) {
         oppgaveHendelseConsumer.start()
     }
-    val leaderElectorService = LeadershipHandling(
-        updateService = UpdateStatusService(
-            database = database,
-            oppgaveClient = httpClients.oppgaveClient,
-        ),
-        LeaderElector(httpClient = httpClients.httpClient, env.electorPath),
-    )
-    leaderElectorService.start()
-    ApplicationServer(applicationEngine, applicationState, leaderElectorService).start()
+
+    ApplicationServer(applicationEngine, applicationState).start()
 }
 
 @DelicateCoroutinesApi

diff --git a/src/main/kotlin/no/nav/syfo/Environment.kt b/src/main/kotlin/no/nav/syfo/Environment.kt
@@ -26,7 +26,6 @@ data class Environment(
     val dbName: String = getEnvVar("DB_DATABASE"),
     val cluster: String = getEnvVar("NAIS_CLUSTER_NAME"),
     val oppgaveHendelseTopic: String = getEnvVar("OPPGAVE_HENDELSE_TOPIC"),
-    val electorPath: String = getEnvVar("ELECTOR_PATH"),
 )
 
 fun getEnvVar(varName: String, defaultValue: String? = null) =

diff --git a/src/main/kotlin/no/nav/syfo/application/ApplicationServer.kt b/src/main/kotlin/no/nav/syfo/application/ApplicationServer.kt
@@ -1,20 +1,17 @@
 package no.nav.syfo.application
 
 import io.ktor.server.engine.ApplicationEngine
-import no.nav.syfo.elector.LeadershipHandling
 import java.util.concurrent.TimeUnit
 
 class ApplicationServer(
     private val applicationServer: ApplicationEngine,
     private val applicationState: ApplicationState,
-    private val leaderElectorService: LeadershipHandling,
 ) {
 
     init {
         Runtime.getRuntime().addShutdownHook(
             Thread {
                 this.applicationState.ready = false
-                leaderElectorService.stop()
                 this.applicationServer.stop(TimeUnit.SECONDS.toMillis(10), TimeUnit.SECONDS.toMillis(10))
             },
         )

diff --git a/src/main/kotlin/no/nav/syfo/elector/LeaderElector.kt b/src/main/kotlin/no/nav/syfo/elector/LeaderElector.kt
diff --git a/src/main/kotlin/no/nav/syfo/elector/LeadershipHandling.kt b/src/main/kotlin/no/nav/syfo/elector/LeadershipHandling.kt
diff --git a/src/main/kotlin/no/nav/syfo/oppgave/service/UpdateStatusService.kt b/src/main/kotlin/no/nav/syfo/oppgave/service/UpdateStatusService.kt
diff --git a/src/test/kotlin/no/nav/syfo/api/AuthenticateTest.kt b/src/test/kotlin/no/nav/syfo/api/AuthenticateTest.kt
@@ -102,7 +102,6 @@ class AuthenticateTest : FunSpec({
             dbPort = "",
             cluster = "dev-gcp",
             oppgaveHendelseTopic = "oppgavehendlese",
-            electorPath = "Electorpath",
         )
         with(TestApplicationEngine()) {
             start()

diff --git a/src/test/kotlin/no/nav/syfo/elector/LeadershipHandlingTest.kt b/src/test/kotlin/no/nav/syfo/elector/LeadershipHandlingTest.kt
diff --git a/src/test/kotlin/no/nav/syfo/oppgave/service/UpdateStatusServiceDbTest.kt b/src/test/kotlin/no/nav/syfo/oppgave/service/UpdateStatusServiceDbTest.kt