From 8134c46a6bfe56499c8858e3b2a12e2a7d837c8d Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Mon, 30 Oct 2023 16:20:56 +0100
Subject: [PATCH] fixed sorting for KPIs on ScoreCard
---
.../de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt | 4 +++-
.../repository/controller/RepositoryController.kt | 5 ++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
index 6ca4f6ee..793a9bae 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
@@ -36,6 +36,7 @@ class KPIService(
displayValue = it.kpi.displayValue,
emptyList(),
it.kpi.isEmpty,
+ order = it.kpi.order
),
it.weight
)
@@ -48,7 +49,8 @@ class KPIService(
isRoot = true,
displayValue = kpiTreeResponseDto.displayValue,
children = children,
- isEmpty = kpiTreeResponseDto.isEmpty
+ isEmpty = kpiTreeResponseDto.isEmpty,
+ order = kpiTreeResponseDto.order
)
}
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
index a51198ca..4bcef475 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.server.ResponseStatusException
-import java.util.*
@RestController
class RepositoryController(
@@ -62,9 +61,9 @@ class RepositoryController(
}
@GetMapping(ApiPaths.SCORE_CARD_BY_REPOSITORY_ID)
- suspend fun getScoreCardByRepositoryId(@PathVariable id: UUID): ScoreCardResponseDto {
+ suspend fun getScoreCardByRepositoryId(@PathVariable id: Long): ScoreCardResponseDto {
logger.info("Get repository score card with id $id")
- val repositoryEntity = this.repositoryService.findRepoByID(id) ?: throw ResponseStatusException(
+ val repositoryEntity = this.repositoryService.findRepoById(id) ?: throw ResponseStatusException(
HttpStatus.NOT_FOUND, "repository not found"
)
--
GitLab