-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rename package and add new egenreg service with kompendium openapi spec
- Loading branch information
1 parent
d04e846
commit bb21ed9
Showing
14 changed files
with
260 additions
and
188 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
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 +1 @@ | ||
rootProject.name = "matrikkel-bygning-egenregistering" | ||
rootProject.name = "matrikkel-bygning-egenregistrering" |
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
20 changes: 6 additions & 14 deletions
20
src/main/kotlin/no/kartverket/matrikkel/bygning/models/Bygning.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,22 +1,14 @@ | ||
package no.kartverket.matrikkel.bygning.models | ||
|
||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class Bygning( | ||
val id: String, | ||
val byggeaar: Int, | ||
val areal: Double, | ||
val energikilder: List<Energikilde>, | ||
val oppvarming: List<Oppvarming>, | ||
val vann: Boolean, | ||
val avlop: Boolean, | ||
val egenregistreringer: MutableList<BygningsRegistrering> | ||
) | ||
|
||
enum class Oppvarming { | ||
VARMEPUMPE | ||
} | ||
data class Bruksenhet( | ||
val id: String, | ||
val bygningId: String, | ||
val egenregistreringer: MutableList<BruksenhetRegistrering> | ||
) | ||
|
||
enum class Energikilde { | ||
GEOTERMISK, | ||
} |
86 changes: 86 additions & 0 deletions
86
src/main/kotlin/no/kartverket/matrikkel/bygning/models/Egenregistrering.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.kartverket.matrikkel.bygning.models | ||
|
||
import kotlinx.serialization.Serializable | ||
|
||
|
||
enum class MetadataStatus { | ||
Gjeldende, Slettet, Uenighet | ||
} | ||
|
||
// TODO Hent fra kodelister i stedet for å definere selv | ||
enum class OppvarmingsKode { | ||
Elektrisk, Sentralvarme, Annen | ||
} | ||
|
||
enum class EnergikildeKode { | ||
Biobrensel, Elektrisitet, Fjernvarme, Gass, Oljeparafin, Solenergi, Varmepumpe, Annen | ||
} | ||
|
||
enum class AvlopKode { | ||
OffentligKloakk, PrivatKloakk, Ingen, | ||
} | ||
|
||
enum class VannforsyningKode { | ||
OffentligVannverk, TilknyttetPrivatVannverk, AnnenPrivatInnlagtVann, AnnenPrivatIkkeInnlagtVann, | ||
} | ||
|
||
@Serializable | ||
data class RegistreringMetadata( | ||
val registrerer: String, | ||
val registreringstidspunkt: Long, | ||
val gyldigFra: Long, | ||
val gyldigTil: Long?, | ||
val status: MetadataStatus, | ||
) | ||
|
||
@Serializable | ||
data class ByggeaarRegistrering( | ||
val byggeaar: Int, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class BruksarealRegistrering( | ||
val bruksareal: Double, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class VannforsyningsRegistrering( | ||
val vannforsyning: VannforsyningKode, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class AvlopRegistrering( | ||
val avlop: AvlopKode, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class EnergikildeRegistrering( | ||
val energikilde: EnergikildeKode, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class OppvarmingRegistrering( | ||
val oppvarming: OppvarmingsKode, val registreringMetadata: RegistreringMetadata | ||
) | ||
|
||
@Serializable | ||
data class BygningsRegistrering( | ||
val bygningsId: String, | ||
val bruksarealRegistrering: BruksarealRegistrering, | ||
val byggeaarRegistrering: ByggeaarRegistrering, | ||
val vannforsyningsRegistrering: VannforsyningsRegistrering, | ||
val avlopRegistrering: AvlopRegistrering | ||
) | ||
|
||
@Serializable | ||
data class BruksenhetRegistrering( | ||
val bruksenhetId: String, | ||
val bruksarealRegistrering: BruksarealRegistrering, | ||
val energikildeRegistreringer: List<EnergikildeRegistrering>, | ||
val oppvarmingRegistreringer: List<OppvarmingRegistrering> | ||
) | ||
|
||
@Serializable | ||
data class Egenregistrering( | ||
val bygningsRegistrering: BygningsRegistrering, val bruksenhetRegistreringer: List<BruksenhetRegistrering> | ||
) |
10 changes: 5 additions & 5 deletions
10
src/main/kotlin/no/kartverket/matrikkel/bygning/routes/v1/BaseRoutes.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,18 +1,18 @@ | ||
package no.kartverket.matrikkel.bygning.routes.v1 | ||
|
||
import io.bkbn.kompendium.core.routes.swagger | ||
import io.ktor.server.application.* | ||
import io.ktor.server.plugins.swagger.* | ||
import io.ktor.server.routing.* | ||
import no.kartverket.matrikkel.bygning.services.BygningService | ||
import no.kartverket.matrikkel.bygning.services.EgenregistreringsService | ||
|
||
fun Application.baseRoutesV1( | ||
bygningService: BygningService | ||
egenregistreringsService: EgenregistreringsService | ||
) { | ||
routing { | ||
swaggerUI(path = "swagger", swaggerFile = "openapi/documentation.yaml") | ||
swagger() | ||
|
||
route("/v1") { | ||
bygningRouting(bygningService) | ||
egenregistreringRouting(egenregistreringsService) | ||
} | ||
} | ||
} |
29 changes: 0 additions & 29 deletions
29
src/main/kotlin/no/kartverket/matrikkel/bygning/routes/v1/BygningRoutes.kt
This file was deleted.
Oops, something went wrong.
67 changes: 67 additions & 0 deletions
67
src/main/kotlin/no/kartverket/matrikkel/bygning/routes/v1/EgenregisteringRoutes.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,67 @@ | ||
package no.kartverket.matrikkel.bygning.routes.v1 | ||
|
||
import io.bkbn.kompendium.core.metadata.PostInfo | ||
import io.bkbn.kompendium.core.plugin.NotarizedRoute | ||
import io.bkbn.kompendium.json.schema.definition.TypeDefinition | ||
import io.bkbn.kompendium.oas.payload.Parameter | ||
import io.ktor.http.* | ||
import io.ktor.server.application.* | ||
import io.ktor.server.request.* | ||
import io.ktor.server.response.* | ||
import io.ktor.server.routing.* | ||
import no.kartverket.matrikkel.bygning.models.Egenregistrering | ||
import no.kartverket.matrikkel.bygning.services.EgenregistreringsService | ||
|
||
fun Route.egenregistreringRouting(egenregistreringsService: EgenregistreringsService) { | ||
route("/egenregistrering") { | ||
route("{bygningId}") { | ||
egenregistreringBygningIdDoc() | ||
post { | ||
val egenregistrering = call.receive<Egenregistrering>() | ||
|
||
|
||
if (egenregistreringsService.addEgenregistreringToBygning(egenregistrering)) { | ||
call.respondText( | ||
"Egenregistrering registrert på bygning ${egenregistrering.bygningsRegistrering.bygningsId}", | ||
status = HttpStatusCode.OK | ||
) | ||
} else { | ||
call.respondText( | ||
"Det ble forsøkt registrert egenregistreringer på bruksenheter som ikke har tilknytning til bygningen", | ||
status = HttpStatusCode.BadRequest | ||
) | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
private fun Route.egenregistreringBygningIdDoc() { | ||
install(NotarizedRoute()) { | ||
parameters = listOf( | ||
Parameter( | ||
name = "id", `in` = Parameter.Location.path, schema = TypeDefinition.STRING | ||
) | ||
) | ||
post = PostInfo.builder { | ||
summary("Legg til en egenregistrering på en bygning") | ||
description("Legger til en egenregistrering på en bygning og tilhørende bruksenheter, hvis noen") | ||
request { | ||
requestType<Egenregistrering>() | ||
required(true) | ||
description("Egeneregistrert data") | ||
} | ||
response { | ||
responseCode(HttpStatusCode.OK) | ||
responseType<String>() | ||
description("Bygninger og eventuelle bruksenheter registrert") | ||
} | ||
|
||
canRespond { | ||
responseCode(HttpStatusCode.BadRequest) | ||
responseType<String>() | ||
description("Alle bruksenheter som kom i request tilhørte ikke bygningen") | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.