Feature/metrics build diff report

admin-app/src/main/kotlin/com/epam/drill/admin/DrillAdminApplication.kt

@@ -21,26 +21,27 @@ import com.epam.drill.admin.auth.route.*
 import com.epam.drill.admin.config.dataSourceDIModule
 import com.epam.drill.admin.metrics.config.MetricsDatabaseConfig
 import com.epam.drill.admin.metrics.config.metricsDIModule
-import com.epam.drill.admin.metrics.route.metricRoutes
+import com.epam.drill.admin.metrics.route.metricsRoutes
+import com.epam.drill.admin.metrics.route.metricsStatusPages
 import com.epam.drill.admin.route.rootRoute
 import com.epam.drill.admin.route.uiConfigRoute
 import com.epam.drill.admin.writer.rawdata.config.RawDataWriterDatabaseConfig
 import com.epam.drill.admin.writer.rawdata.config.rawDataWriterDIModule
 import com.epam.drill.admin.writer.rawdata.route.*
-import io.ktor.server.application.*
-import io.ktor.server.auth.*
 import io.ktor.http.*
-import io.ktor.server.request.*
-import io.ktor.server.response.*
-import io.ktor.server.routing.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.serialization.kotlinx.protobuf.*
-import io.ktor.server.plugins.statuspages.*
+import io.ktor.server.application.*
+import io.ktor.server.auth.*
 import io.ktor.server.plugins.callloging.*
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.cors.routing.*
+import io.ktor.server.plugins.statuspages.*
+import io.ktor.server.request.*
 import io.ktor.server.resources.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
 import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 import org.kodein.di.instance
@@ -69,6 +70,7 @@ fun Application.module() {
         authStatusPages()
         if (oauth2Enabled) oauthStatusPages()
         defaultStatusPages()
+        metricsStatusPages()
     }
     val di = closestDI()
     install(Authentication) {
@@ -98,6 +100,7 @@ fun Application.module() {
             }
             authenticate("api-key") {
                 tryApiKeyRoute()
+                metricsRoutes()
             }
 
             //Data
@@ -115,8 +118,6 @@ fun Application.module() {
 //                    postRawJavaScriptCoverage(jsCoverageConverterAddress)
                 }
             }
-
-            metricRoutes()
         }
     }
 }

admin-app/src/main/resources/application.conf

@@ -42,6 +42,8 @@ drill {
             clientSecret = ${?DRILL_OAUTH2_CLIENT_SECRET}
             scopes = ${?DRILL_OAUTH2_SCOPES}
             redirectUrl = ${?DRILL_OAUTH2_REDIRECT_URL}
+            automaticSignIn = false
+            automaticSignIn = ${?DRILL_OAUTH2_AUTOMATIC_SIGN_IN}
             tokenMapping {
             }
             userInfoMapping {
@@ -53,10 +55,20 @@ drill {
             enabled = true
             enabled = ${?DRILL_AUTH_SIMPLE_ENABLED}
             signUpEnabled = true
+            signUpEnabled = ${?DRILL_AUTH_SIMPLE_SIGN_UP_ENABLED}
             passwordStrength {
             }
         }
     }
     rawData {
     }
+    metrics {
+        ui {
+            baseUrl = ${?DRILL_METRICS_UI_BASE_URL}
+            buildTestingReportPath = "/dashboard/2"
+            buildTestingReportPath = ${?DRILL_METRICS_UI_BUILD_TESTING_REPORT_PATH }
+            buildComparisonReportPath = "/dashboard/3"
+            buildComparisonReportPath = ${?DRILL_METRICS_UI_BUILD_COMPARISON_REPORT_PATH }
+        }
+    }
 }

admin-auth/src/main/kotlin/com/epam/drill/admin/auth/config/OAuth2Config.kt

@@ -133,7 +133,7 @@ class OAuth2Config(private val config: ApplicationConfig) {
      * A title of the OAuth2 sign-in button. Optional, "Sign in with SSO" by default.
      */
     val signInButtonTitle: String
-        get() = config.propertyOrNull("buttonTitle")?.getString() ?: "Sign in with SSO"
+        get() = config.propertyOrNull("buttonTitle")?.getString() ?: "Sign in with Auth Provider"
 
     /**
      * A flag that indicates whether the automatic sign-in is enabled. Optional, true by default.

admin-auth/src/main/kotlin/com/epam/drill/admin/auth/model/ApiKeyModels.kt

@@ -28,6 +28,7 @@ data class ApiKeyView(
     val createdAt: LocalDateTime,
     val username: String,
     val role: Role,
+    val userBlocked: Boolean
 )
 
 @Serializable

admin-auth/src/main/kotlin/com/epam/drill/admin/auth/service/impl/ApiKeyServiceImpl.kt

@@ -100,6 +100,7 @@ private fun ApiKeyEntity.toApiKeyView() = ApiKeyView(
     createdAt = createdAt.toKotlinLocalDateTime(),
     username = user?.username ?: throw IllegalStateException("User property cannot be null in ApiKeyEntity"),
     role = user.role.let { Role.valueOf(it) },
+    userBlocked = user.blocked
 )
 
 private fun ApiKeyEntity.toUserApiKeyView() = UserApiKeyView(

admin-metrics/build.gradle.kts

@@ -52,6 +52,7 @@ dependencies {
     implementation("io.ktor:ktor-server-auth:$ktorVersion")
     implementation("io.ktor:ktor-server-auth-jwt:$ktorVersion")
     implementation("io.ktor:ktor-server-resources:$ktorVersion")
+    implementation("io.ktor:ktor-server-status-pages:$ktorVersion")
     implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/config/MetricsDatabaseConfig.kt

@@ -17,10 +17,6 @@ package com.epam.drill.admin.metrics.config
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.encodeToJsonElement
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.IColumnType
 import org.jetbrains.exposed.sql.Transaction
@@ -45,33 +41,47 @@ object MetricsDatabaseConfig {
         newSuspendedTransaction(dispatcher, database) { block() }
 }
 
-fun Transaction.executeQuery(sqlQuery: String, vararg params: Any): List<JsonObject> {
-    val result = mutableListOf<JsonObject>()
-    execSp(sqlQuery, *params) { resultSet ->
+fun Transaction.executeQueryReturnMap(sqlQuery: String, vararg params: Any?): List<Map<String, Any?>> {
+    val result = mutableListOf<Map<String, Any?>>()
+    executePreparedStatement(sqlQuery, *params) { resultSet ->
         val metaData = resultSet.metaData
         val columnCount = metaData.columnCount
 
         while (resultSet.next()) {
-            val rowObject = buildJsonObject {
-                for (i in 1..columnCount) {
-                    val columnName = metaData.getColumnName(i)
-                    val columnValue = resultSet.getObject(i)
-                    val stringValue = columnValue?.toString()
-                    put(columnName, Json.encodeToJsonElement(stringValue))
+            val rowObject = mutableMapOf<String, Any?>()
+
+            for (i in 1..columnCount) {
+                val columnName = metaData.getColumnName(i)
+                val columnType = metaData.getColumnType(i)
+
+                val columnValue = when (columnType) {
+                    java.sql.Types.INTEGER -> resultSet.getInt(i)
+                    java.sql.Types.BIGINT -> resultSet.getLong(i)
+                    java.sql.Types.FLOAT -> resultSet.getFloat(i)
+                    java.sql.Types.DOUBLE -> resultSet.getDouble(i)
+                    java.sql.Types.DECIMAL, java.sql.Types.NUMERIC -> resultSet.getBigDecimal(i)
+                    java.sql.Types.BOOLEAN -> resultSet.getBoolean(i)
+                    java.sql.Types.VARCHAR, java.sql.Types.CHAR, java.sql.Types.LONGVARCHAR -> resultSet.getString(i)
+                    java.sql.Types.DATE -> resultSet.getDate(i)
+                    java.sql.Types.TIMESTAMP -> resultSet.getTimestamp(i)
+                    java.sql.Types.TIME -> resultSet.getTime(i)
+                    java.sql.Types.BINARY, java.sql.Types.VARBINARY, java.sql.Types.LONGVARBINARY -> resultSet.getBytes(i)
+                    else -> resultSet.getObject(i) // Fallback to generic Object type
                 }
+                rowObject[columnName] = if (resultSet.wasNull()) null else columnValue
             }
             result.add(rowObject)
         }
     }
     return result
 }
 
-private fun <T : Any> Transaction.execSp(stmt: String, vararg params: Any, transform: (ResultSet) -> T): T? {
+private fun <T : Any> Transaction.executePreparedStatement(stmt: String, vararg params: Any?, transform: (ResultSet) -> T): T? {
     if (stmt.isEmpty()) return null
 
     return exec(object : Statement<T>(StatementType.SELECT, emptyList()) {
         override fun PreparedStatementApi.executeInternal(transaction: Transaction): T? {
-            params.forEachIndexed { idx, value -> set(idx + 1, value) }
+            params.forEachIndexed { idx, value -> set(idx + 1, value ?: "NULL") }
             executeQuery()
             return resultSet?.use { transform(it) }
         }

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/config/MetricsModule.kt

@@ -15,12 +15,23 @@
  */
 package com.epam.drill.admin.metrics.config
 
-import com.epam.drill.admin.metrics.repository.*
-import com.epam.drill.admin.metrics.repository.impl.*
+import com.epam.drill.admin.metrics.repository.impl.MetricsRepositoryImpl
+import com.epam.drill.admin.metrics.service.MetricsService
+import com.epam.drill.admin.metrics.service.impl.MetricsServiceImpl
+import io.ktor.server.application.*
+import io.ktor.server.config.*
 import org.kodein.di.DI
 import org.kodein.di.bind
+import org.kodein.di.instance
 import org.kodein.di.singleton
 
 val metricsDIModule = DI.Module("metricsServices") {
-    bind<MetricsRepository>() with singleton { MetricsRepositoryImpl() }
-}
+    bind<MetricsService>() with singleton {
+        val metricsConfig: ApplicationConfig = instance<Application>().environment.config.config("drill.metrics")
+        MetricsServiceImpl(
+            MetricsRepositoryImpl(),
+            MetricsServiceUiLinksConfig(metricsConfig.config("ui"))
+        )
+    }
+}
+

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/config/MetricsServiceUiLinksConfig.kt

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.drill.admin.metrics.config
+
+import io.ktor.server.config.*
+
+class MetricsServiceUiLinksConfig(
+    val baseUrl: String?,
+    val buildTestingReportPath: String?,
+    val buildComparisonReportPath: String?
+) {
+    constructor(config: ApplicationConfig) : this(
+        baseUrl = config.propertyOrNull("baseUrl")?.getString(),
+        buildTestingReportPath = config.propertyOrNull("buildTestingReportPath")?.getString(),
+        buildComparisonReportPath = config.propertyOrNull("buildComparisonReportPath")?.getString()
+    )
+}

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/exception/BuildNotFound.kt

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.epam.drill.admin.metrics.exception
+
+class BuildNotFound(message: String): RuntimeException(message)

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/exception/InvalidParameters.kt

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.epam.drill.admin.metrics.exception
+
+class InvalidParameters(message: String): RuntimeException(message)

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/repository/MetricsRepository.kt

@@ -15,31 +15,17 @@
  */
 package com.epam.drill.admin.metrics.repository
 
-import kotlinx.serialization.json.JsonObject
-
 interface MetricsRepository {
 
-    suspend fun getRisksByBranchDiff(
-        groupId: String,
-        appId: String,
-        currentBranch: String,
-        currentVcsRef: String,
-        baseBranch: String,
-        baseVcsRef: String
-    ): List<JsonObject>
-
-    suspend fun getTotalCoverage(
-        groupId: String,
-        appId: String,
-        currentVcsRef: String
-    ): JsonObject
+    suspend fun buildExists(buildId: String): Boolean
+    suspend fun getBuildDiffReport(
+        buildId: String,
+        baselineBuildId: String,
+        coverageThreshold: Double
+    ): Map<String, String>
 
-    suspend fun getSummaryByBranchDiff(
-        groupId: String,
-        appId: String,
-        currentBranch: String,
-        currentVcsRef: String,
-        baseBranch: String,
-        baseVcsRef: String
-    ): JsonObject
+    suspend fun getRecommendedTests(
+        buildId: String,
+        baselineBuildId: String
+    ): List<Map<String, Any>>
 }

admin-metrics/src/main/kotlin/com/epam/drill/admin/metrics/repository/impl/AnySerializer.kt

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2020 - 2022 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.epam.drill.admin.metrics.repository.impl
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.sql.Timestamp
+
+object AnySerializer : KSerializer<Any?> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Any")
+
+    override fun serialize(encoder: Encoder, value: Any?) {
+        when (value) {
+            null -> encoder.encodeNull()
+            is String -> encoder.encodeString(value)
+            is Int -> encoder.encodeInt(value)
+            is Long -> encoder.encodeLong(value)
+            is Number -> encoder.encodeDouble(value.toDouble())
+            is Boolean -> encoder.encodeBoolean(value)
+            is Timestamp -> encoder.encodeString(value.toString())
+            is Map<*, *> -> {
+                val mapSerializer = MapSerializer(String.serializer(), this)
+                encoder.encodeSerializableValue(mapSerializer, value as Map<String, Any?>)
+            }
+            is List<*> -> {
+                val listSerializer = ListSerializer(this)
+                encoder.encodeSerializableValue(listSerializer, value)
+            }
+            else -> throw SerializationException("Unsupported type")
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): Any? {
+        throw SerializationException("Deserialization is not supported")
+    }
+}
+
+@Serializable
+data class ApiResponse(
+    @Serializable(with = AnySerializer::class) val data: Map<String, Any?>?
+)