Skip to content

Commit 38530a1

Browse files
avoldsundkristoivgustavli
committed
Gjer app klar for prod
Co-authored-by: kristoiv <[email protected]> Co-authored-by: gustavli <[email protected]>
1 parent bac92fa commit 38530a1

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

src/main/kotlin/no/nav/hjelpemidler/Application.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,18 @@ fun main() {
123123

124124
// Publish the received json to our rapid
125125
try {
126-
rapidApp!!.publish(ordrelinje.fnrBruker, mapper.writeValueAsString(melding))
127-
SensuMetrics().meldingTilRapidSuksess()
126+
if (Configuration.application["APP_PROFILE"] != "prod") {
127+
logg.info { "Publiserer ordrelinje til rapid i miljø ${Configuration.application["APP_PROFILE"]}" }
128+
rapidApp!!.publish(ordrelinje.fnrBruker, mapper.writeValueAsString(melding))
129+
SensuMetrics().meldingTilRapidSuksess()
130+
} else {
131+
ordrelinje.fnrBruker = "MASKERT"
132+
sikkerlogg.info { "Ordrelinje mottatt i prod som ikkje blir sendt til rapid: ${mapper.writeValueAsString(ordrelinje)}" }
133+
}
128134
} catch (e: Exception) {
129-
SensuMetrics().meldingTilRapidFeilet()
135+
if (Configuration.application["APP_PROFILE"] != "prod") {
136+
SensuMetrics().meldingTilRapidFeilet()
137+
}
130138
sikkerlogg.error("Sending til rapid feilet, exception: $e")
131139
call.respond(HttpStatusCode.InternalServerError, "Feil under prosessering")
132140
return@post

src/main/kotlin/no/nav/hjelpemidler/configuration/Configuration.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ internal object Configuration {
4949
"OEBSTOKEN" to "abc",
5050

5151
"kafka.reset.policy" to "earliest",
52-
"application.profile" to "LOCAL",
5352
"KAFKA_TRUSTSTORE_PATH" to "",
5453
"KAFKA_CREDSTORE_PASSWORD" to "",
5554
"KAFKA_KEYSTORE_PATH" to "",

src/main/kotlin/no/nav/hjelpemidler/model/OrdrelinjeOebs.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ data class OrdrelinjeOebs(
5959
val antall: Int,
6060

6161
@JsonProperty("AccountNumber")
62-
val fnrBruker: String,
62+
// FIXME: Skift til var for testing
63+
var fnrBruker: String,
6364

6465
@JsonFormat(shape = JsonFormat.Shape.STRING)
6566
@JsonProperty("LastUpdateDate")

0 commit comments

Comments
 (0)