-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding API endpoint for getting current repo coverage
- Loading branch information
Showing
15 changed files
with
339 additions
and
89 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
server/server-api/src/main/kotlin/projektor/server/api/repository/Branch.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,3 @@ | ||
| package projektor.server.api.repository | ||
|
|
||
| data class BranchSearch(val branchName: String? = null, val branchType: BranchType? = null) |
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
4 changes: 2 additions & 2 deletions
4
server/server-app/src/main/kotlin/projektor/compare/PreviousTestRunRepository.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,10 +1,10 @@ | ||
| package projektor.compare | ||
|
|
||
| import projektor.server.api.PublicId | ||
| import projektor.server.api.repository.BranchType | ||
| import projektor.server.api.repository.BranchSearch | ||
|
|
||
| interface PreviousTestRunRepository { | ||
| suspend fun findPreviousMainBranchRunWithCoverage(publicId: PublicId): PublicId? | ||
|
|
||
| suspend fun findMostRecentRunWithCoverage(branchType: BranchType, repoName: String, projectName: String?): RecentTestRun? | ||
| suspend fun findMostRecentRunWithCoverage(repoName: String, projectName: String?, branch: BranchSearch?): RecentTestRun? | ||
| } |
6 changes: 3 additions & 3 deletions
6
server/server-app/src/main/kotlin/projektor/compare/PreviousTestRunService.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,12 +1,12 @@ | ||
| package projektor.compare | ||
|
|
||
| import projektor.server.api.PublicId | ||
| import projektor.server.api.repository.BranchType | ||
| import projektor.server.api.repository.BranchSearch | ||
|
|
||
| class PreviousTestRunService(private val previousTestRunRepository: PreviousTestRunRepository) { | ||
| suspend fun findPreviousMainBranchRunWithCoverage(publicId: PublicId): PublicId? = | ||
| previousTestRunRepository.findPreviousMainBranchRunWithCoverage(publicId) | ||
|
|
||
| suspend fun findMostRecentRunWithCoverage(branchType: BranchType, repoName: String, projectName: String?): RecentTestRun? = | ||
| previousTestRunRepository.findMostRecentRunWithCoverage(branchType, repoName, projectName) | ||
| suspend fun findMostRecentRunWithCoverage(repoName: String, projectName: String?, branch: BranchSearch?): RecentTestRun? = | ||
| previousTestRunRepository.findMostRecentRunWithCoverage(repoName, projectName, branch) | ||
| } |
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
30 changes: 29 additions & 1 deletion
30
server/server-app/src/main/kotlin/projektor/repository/coverage/RepositoryCoverageService.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,12 +1,40 @@ | ||
| package projektor.repository.coverage | ||
|
|
||
| import projektor.compare.PreviousTestRunService | ||
| import projektor.coverage.CoverageService | ||
| import projektor.server.api.repository.BranchSearch | ||
| import projektor.server.api.repository.BranchType | ||
| import projektor.server.api.repository.coverage.RepositoryCoverageTimeline | ||
| import projektor.server.api.repository.coverage.RepositoryCurrentCoverage | ||
|
|
||
| class RepositoryCoverageService(private val repositoryCoverageRepository: RepositoryCoverageRepository) { | ||
| class RepositoryCoverageService( | ||
| private val coverageService: CoverageService, | ||
| private val previousTestRunService: PreviousTestRunService, | ||
| private val repositoryCoverageRepository: RepositoryCoverageRepository | ||
| ) { | ||
| suspend fun fetchRepositoryCoverageTimeline(branchType: BranchType, repoName: String, projectName: String?): RepositoryCoverageTimeline? = | ||
| repositoryCoverageRepository.fetchRepositoryCoverageTimeline(branchType, repoName, projectName) | ||
|
|
||
| suspend fun fetchRepositoryCurrentCoverage(repoName: String, projectName: String?, branchSearch: BranchSearch?): RepositoryCurrentCoverage? { | ||
| val mostRecentRunWithCoverage = previousTestRunService.findMostRecentRunWithCoverage( | ||
| repoName, | ||
| projectName, | ||
| branchSearch | ||
| ) | ||
|
|
||
| val coveredPercentage = mostRecentRunWithCoverage?.publicId?.let { publicId -> coverageService.getCoveredLinePercentage(publicId) } | ||
|
|
||
| return if (mostRecentRunWithCoverage != null && coveredPercentage != null) { | ||
| RepositoryCurrentCoverage( | ||
| id = mostRecentRunWithCoverage.publicId.id, | ||
| coveredPercentage = coveredPercentage, | ||
| createdTimestamp = mostRecentRunWithCoverage.createdTimestamp | ||
| ) | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
|
|
||
| suspend fun coverageExists(repoName: String, projectName: String?): Boolean = | ||
| repositoryCoverageRepository.coverageExists(repoName, projectName) | ||
| } |
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
31 changes: 31 additions & 0 deletions
31
server/server-app/src/main/kotlin/projektor/route/ApiRoutes.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,31 @@ | ||
| package projektor.route | ||
|
|
||
| import io.ktor.http.* | ||
| import io.ktor.server.application.* | ||
| import io.ktor.server.response.* | ||
| import io.ktor.server.routing.* | ||
| import io.ktor.server.util.* | ||
| import projektor.repository.coverage.RepositoryCoverageService | ||
| import projektor.server.api.repository.BranchSearch | ||
|
|
||
| fun Route.api( | ||
| repositoryCoverageService: RepositoryCoverageService, | ||
| ) { | ||
| get("/api/repo/{orgPart}/{repoPart}/coverage/current") { | ||
| val orgPart = call.parameters.getOrFail("orgPart") | ||
| val repoPart = call.parameters.getOrFail("repoPart") | ||
| val fullRepoName = "$orgPart/$repoPart" | ||
|
|
||
| val projectName = call.request.queryParameters["project"] | ||
| val branchName = call.request.queryParameters["branch"] | ||
|
|
||
| val repositoryCurrentCoverage = repositoryCoverageService.fetchRepositoryCurrentCoverage( | ||
| fullRepoName, | ||
| projectName, | ||
| BranchSearch(branchName = branchName) | ||
| ) | ||
|
|
||
| repositoryCurrentCoverage?.let { call.respond(HttpStatusCode.OK, it) } | ||
| ?: call.respond(HttpStatusCode.NoContent) | ||
| } | ||
| } |
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
Oops, something went wrong.