Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Use enums for execution/review statuses #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Askir wants to merge 1 commit into
base: main
Choose a base branch
Loading
from
Open

Use enums for execution/review statuses #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions 6 backend/src/main/kotlin/dev/kviklet/kviklet/db/ExecutionRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ class ExecutionRequestEntity(
type = executionType,
description = description,
statement = statement,
executionStatus = executionStatus.name,
executionStatus = executionStatus,
reviewStatus = reviewStatus,
createdAt = createdAt,
author = author.toDto(),
temporaryAccessDuration = temporaryAccessDuration?.let { Duration.ofMinutes(it) },
Expand All @@ -109,7 +110,8 @@ class ExecutionRequestEntity(
title = title,
type = executionType,
description = description,
executionStatus = executionStatus.name,
executionStatus = executionStatus,
reviewStatus = reviewStatus,
createdAt = createdAt,
author = author.toDto(),
namespace = namespace,
Expand Down
12 changes: 8 additions & 4 deletions 12 backend/src/main/kotlin/dev/kviklet/kviklet/service/dto/ExecutionRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ sealed class ExecutionRequest(
open val title: String,
open val type: RequestType,
open val description: String?,
open val executionStatus: String,
open val executionStatus: ExecutionStatus,
open val reviewStatus: ReviewStatus,
open val createdAt: LocalDateTime = utcTimeNow(),
open val author: User,
open val temporaryAccessDuration: Duration? = null,
Expand Down Expand Up @@ -95,12 +96,13 @@ data class DatasourceExecutionRequest(
override val type: RequestType,
override val description: String?,
val statement: String?,
override val executionStatus: String,
override val executionStatus: ExecutionStatus,
override val reviewStatus: ReviewStatus,
override val createdAt: LocalDateTime = utcTimeNow(),
override val author: User,
override val temporaryAccessDuration: Duration?,
) : ExecutionRequest(
id, connection, title, type, description, executionStatus, createdAt,
id, connection, title, type, description, executionStatus, reviewStatus, createdAt,
author,
temporaryAccessDuration,
)
Expand All @@ -111,7 +113,8 @@ data class KubernetesExecutionRequest(
override val title: String,
override val type: RequestType,
override val description: String?,
override val executionStatus: String,
override val executionStatus: ExecutionStatus,
override val reviewStatus: ReviewStatus,
override val createdAt: LocalDateTime = utcTimeNow(),
override val author: User,
val namespace: String?,
Expand All @@ -126,6 +129,7 @@ data class KubernetesExecutionRequest(
type,
description,
executionStatus,
reviewStatus,
createdAt,
author,
temporaryAccessDuration,
Expand Down
6 changes: 5 additions & 1 deletion 6 backend/src/test/kotlin/dev/kviklet/kviklet/helper/ExecutionRequestFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ import dev.kviklet.kviklet.service.dto.ExecuteEvent
import dev.kviklet.kviklet.service.dto.ExecutionRequest
import dev.kviklet.kviklet.service.dto.ExecutionRequestDetails
import dev.kviklet.kviklet.service.dto.ExecutionRequestId
import dev.kviklet.kviklet.service.dto.ExecutionStatus
import dev.kviklet.kviklet.service.dto.Policy
import dev.kviklet.kviklet.service.dto.PolicyEffect
import dev.kviklet.kviklet.service.dto.RequestType
import dev.kviklet.kviklet.service.dto.ResultLog
import dev.kviklet.kviklet.service.dto.ReviewAction
import dev.kviklet.kviklet.service.dto.ReviewEvent
import dev.kviklet.kviklet.service.dto.ReviewStatus
import dev.kviklet.kviklet.service.dto.Role
import dev.kviklet.kviklet.service.dto.RoleId
import dev.kviklet.kviklet.service.dto.utcTimeNow
Expand Down Expand Up @@ -154,7 +156,8 @@ class ExecutionRequestFactory : Factory() {
type: RequestType = RequestType.SingleExecution,
description: String? = "A test request",
statement: String = "SELECT 1;",
executionStatus: String = "PENDING",
executionStatus: ExecutionStatus = ExecutionStatus.EXECUTABLE,
reviewStatus: ReviewStatus = ReviewStatus.AWAITING_APPROVAL,
createdAt: LocalDateTime = utcTimeNow(),
author: User? = null,
temporaryAccessDuration: Duration? = null,
Expand All @@ -166,6 +169,7 @@ class ExecutionRequestFactory : Factory() {
description,
statement,
executionStatus,
reviewStatus,
createdAt,
author ?: userFactory.createUser(),
temporaryAccessDuration,
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.