From b117402fe32352580fc54b2c496b0663689c2203 Mon Sep 17 00:00:00 2001 From: iryabov Date: Tue, 4 Feb 2025 13:40:00 +0100 Subject: [PATCH 1/6] feat: add `started_at`/`finished_at` columns to `test_launches` --- .../writer/rawdata/entity/TestMetadata.kt | 4 +++- .../impl/TestLaunchRepositoryImpl.kt | 2 ++ .../rawdata/service/impl/RawDataServiceImpl.kt | 18 +++++++++++++----- .../writer/rawdata/table/TestLaunchTable.kt | 2 ++ .../db/migration/V12__Test_Finish_Time.sql | 4 ++++ 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt index 55017111..f4d8575b 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt @@ -27,7 +27,9 @@ class TestLaunch ( val id: String, val testDefinitionId: String, val testSessionId: String, - val result: String? + val result: String?, + val startedAt: LocalDateTime? = null, + val finishedAt: LocalDateTime? = null, ) class TestDefinition( diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt index 6950a6e4..5d6f71e3 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt @@ -33,6 +33,8 @@ class TestLaunchRepositoryImpl: TestLaunchRepository { this[TestLaunchTable.testDefinitionId] = it.testDefinitionId this[TestLaunchTable.testSessionId] = it.testSessionId this[TestLaunchTable.result] = it.result + this[TestLaunchTable.startedAt] = it.startedAt + this[TestLaunchTable.finishedAt] = it.finishedAt } } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt index bb79e58e..269aea0a 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt @@ -22,9 +22,10 @@ import com.epam.drill.admin.writer.rawdata.repository.* import com.epam.drill.admin.writer.rawdata.route.payload.* import com.epam.drill.admin.writer.rawdata.service.RawDataWriter import com.epam.drill.admin.writer.rawdata.views.MethodIgnoreRuleView -import kotlinx.datetime.TimeZone -import kotlinx.datetime.toJavaLocalDateTime -import kotlinx.datetime.toLocalDateTime +import kotlinx.datetime.* +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId private const val EXEC_DATA_BATCH_SIZE = 100 @@ -169,7 +170,9 @@ class RawDataServiceImpl( id = test.testLaunchId, testDefinitionId = test.testDefinitionId, testSessionId = testsPayload.sessionId, - result = test.result.toString() + result = test.result.toString(), + startedAt = test.startedAt.toLocalDateTime(), + finishedAt = test.finishedAt.toLocalDateTime(), ) }.let(testLaunchRepository::createMany) @@ -192,7 +195,7 @@ class RawDataServiceImpl( id = sessionPayload.id, groupId = sessionPayload.groupId, testTaskId = sessionPayload.testTaskId, - startedAt = sessionPayload.startedAt.toLocalDateTime(TimeZone.UTC).toJavaLocalDateTime() + startedAt = sessionPayload.startedAt.toLocalDateTime(TimeZone.currentSystemDefault()).toJavaLocalDateTime() ) transaction { testSessionRepository.create(testSession) @@ -224,4 +227,9 @@ class RawDataServiceImpl( methodIgnoreRuleRepository.deleteById(ruleId) } } + + private fun Long.toLocalDateTime(): LocalDateTime { + val instant = Instant.ofEpochMilli(this) + return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()) + } } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt index 731c5928..8bf608ab 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt @@ -22,5 +22,7 @@ object TestLaunchTable : StringIdTable("raw_data.test_launches") { val testDefinitionId = varchar("test_definition_id", SHORT_TEXT_LENGTH) val testSessionId = varchar("test_session_id", SHORT_TEXT_LENGTH) val result = varchar("result", SHORT_TEXT_LENGTH).nullable() + val startedAt = datetime("started_at").nullable() + val finishedAt = datetime("finished_at").nullable() val createdAt = datetime("created_at").nullable() } diff --git a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql new file mode 100644 index 00000000..1eebff2e --- /dev/null +++ b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql @@ -0,0 +1,4 @@ +ALTER TABLE raw_data.test_launches +ADD COLUMN IF NOT EXISTS started_at TIMESTAMP DEFAULT NULL; +ALTER TABLE raw_data.test_launches +ADD COLUMN IF NOT EXISTS finished_at TIMESTAMP DEFAULT NULL; From 6129c72950219d9c66e8d753a149c51972c1e7f8 Mon Sep 17 00:00:00 2001 From: iryabov Date: Tue, 4 Feb 2025 14:52:48 +0100 Subject: [PATCH 2/6] feat: make optional start/finish time for test execution --- .../admin/writer/rawdata/route/payload/TestMetadataPayload.kt | 4 ++-- .../admin/writer/rawdata/service/impl/RawDataServiceImpl.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt index cef96e61..d37c5ddd 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt @@ -31,8 +31,8 @@ class TestLaunchInfo( val testLaunchId: String, val testDefinitionId: String, val result: TestResult, - val startedAt: Long, - val finishedAt: Long, + val startedAt: Long? = null, + val finishedAt: Long? = null, val details: TestDetails, ) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt index 269aea0a..648ff873 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt @@ -171,8 +171,8 @@ class RawDataServiceImpl( testDefinitionId = test.testDefinitionId, testSessionId = testsPayload.sessionId, result = test.result.toString(), - startedAt = test.startedAt.toLocalDateTime(), - finishedAt = test.finishedAt.toLocalDateTime(), + startedAt = test.startedAt?.toLocalDateTime(), + finishedAt = test.finishedAt?.toLocalDateTime(), ) }.let(testLaunchRepository::createMany) From a45e1e3f59480efe1e03b2b032932c4a654a9367 Mon Sep 17 00:00:00 2001 From: iryabov Date: Tue, 4 Feb 2025 15:44:25 +0100 Subject: [PATCH 3/6] feat: make startedAt/finishedAt fields of type `String` ISO date and time format --- admin-app/src/main/resources/openapi.yml | 6 ++++-- .../writer/rawdata/route/payload/TestMetadataPayload.kt | 4 ++-- .../writer/rawdata/service/impl/RawDataServiceImpl.kt | 9 ++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/admin-app/src/main/resources/openapi.yml b/admin-app/src/main/resources/openapi.yml index ca9c6962..86613c14 100644 --- a/admin-app/src/main/resources/openapi.yml +++ b/admin-app/src/main/resources/openapi.yml @@ -895,9 +895,11 @@ components: result: $ref: '#/components/schemas/TestResult' startedAt: - type: integer + type: string + format: date-time finishedAt: - type: integer + type: string + format: date-time details: $ref: '#/components/schemas/TestDetails' TestDetails: diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt index d37c5ddd..22bb5601 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt @@ -31,8 +31,8 @@ class TestLaunchInfo( val testLaunchId: String, val testDefinitionId: String, val result: TestResult, - val startedAt: Long? = null, - val finishedAt: Long? = null, + val startedAt: Instant? = null, + val finishedAt: Instant? = null, val details: TestDetails, ) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt index 648ff873..60abdd47 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt @@ -171,8 +171,8 @@ class RawDataServiceImpl( testDefinitionId = test.testDefinitionId, testSessionId = testsPayload.sessionId, result = test.result.toString(), - startedAt = test.startedAt?.toLocalDateTime(), - finishedAt = test.finishedAt?.toLocalDateTime(), + startedAt = test.startedAt?.toLocalDateTime(TimeZone.currentSystemDefault())?.toJavaLocalDateTime(), + finishedAt = test.finishedAt?.toLocalDateTime(TimeZone.currentSystemDefault())?.toJavaLocalDateTime(), ) }.let(testLaunchRepository::createMany) @@ -227,9 +227,4 @@ class RawDataServiceImpl( methodIgnoreRuleRepository.deleteById(ruleId) } } - - private fun Long.toLocalDateTime(): LocalDateTime { - val instant = Instant.ofEpochMilli(this) - return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()) - } } From 233df9a41caa6950120f3285531170f11791b50d Mon Sep 17 00:00:00 2001 From: iryabov Date: Wed, 5 Feb 2025 12:35:11 +0100 Subject: [PATCH 4/6] feat: add `duration` column --- admin-app/src/main/resources/openapi.yml | 8 ++------ .../drill/admin/writer/rawdata/entity/TestMetadata.kt | 3 +-- .../rawdata/repository/impl/TestLaunchRepositoryImpl.kt | 3 +-- .../writer/rawdata/route/payload/TestMetadataPayload.kt | 3 +-- .../writer/rawdata/service/impl/RawDataServiceImpl.kt | 6 +----- .../drill/admin/writer/rawdata/table/TestLaunchTable.kt | 3 +-- .../raw_data/db/migration/V12__Test_Duration.sql | 2 ++ .../raw_data/db/migration/V12__Test_Finish_Time.sql | 4 ---- 8 files changed, 9 insertions(+), 23 deletions(-) create mode 100644 admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql delete mode 100644 admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql diff --git a/admin-app/src/main/resources/openapi.yml b/admin-app/src/main/resources/openapi.yml index 86613c14..792081b8 100644 --- a/admin-app/src/main/resources/openapi.yml +++ b/admin-app/src/main/resources/openapi.yml @@ -894,12 +894,8 @@ components: type: string result: $ref: '#/components/schemas/TestResult' - startedAt: - type: string - format: date-time - finishedAt: - type: string - format: date-time + duration: + type: integer details: $ref: '#/components/schemas/TestDetails' TestDetails: diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt index f4d8575b..c3099578 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt @@ -28,8 +28,7 @@ class TestLaunch ( val testDefinitionId: String, val testSessionId: String, val result: String?, - val startedAt: LocalDateTime? = null, - val finishedAt: LocalDateTime? = null, + val duration: Long? = null, ) class TestDefinition( diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt index 5d6f71e3..d54b3ea4 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/repository/impl/TestLaunchRepositoryImpl.kt @@ -33,8 +33,7 @@ class TestLaunchRepositoryImpl: TestLaunchRepository { this[TestLaunchTable.testDefinitionId] = it.testDefinitionId this[TestLaunchTable.testSessionId] = it.testSessionId this[TestLaunchTable.result] = it.result - this[TestLaunchTable.startedAt] = it.startedAt - this[TestLaunchTable.finishedAt] = it.finishedAt + this[TestLaunchTable.duration] = it.duration } } diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt index 22bb5601..747736d2 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt @@ -31,8 +31,7 @@ class TestLaunchInfo( val testLaunchId: String, val testDefinitionId: String, val result: TestResult, - val startedAt: Instant? = null, - val finishedAt: Instant? = null, + val duration: Long? = null, val details: TestDetails, ) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt index 60abdd47..c9515f52 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt @@ -23,9 +23,6 @@ import com.epam.drill.admin.writer.rawdata.route.payload.* import com.epam.drill.admin.writer.rawdata.service.RawDataWriter import com.epam.drill.admin.writer.rawdata.views.MethodIgnoreRuleView import kotlinx.datetime.* -import java.time.Instant -import java.time.LocalDateTime -import java.time.ZoneId private const val EXEC_DATA_BATCH_SIZE = 100 @@ -171,8 +168,7 @@ class RawDataServiceImpl( testDefinitionId = test.testDefinitionId, testSessionId = testsPayload.sessionId, result = test.result.toString(), - startedAt = test.startedAt?.toLocalDateTime(TimeZone.currentSystemDefault())?.toJavaLocalDateTime(), - finishedAt = test.finishedAt?.toLocalDateTime(TimeZone.currentSystemDefault())?.toJavaLocalDateTime(), + duration = test.duration ) }.let(testLaunchRepository::createMany) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt index f874b772..3fda167f 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt @@ -23,7 +23,6 @@ object TestLaunchTable : StringIdTable("raw_data.test_launches") { val testDefinitionId = varchar("test_definition_id", SHORT_TEXT_LENGTH) val testSessionId = varchar("test_session_id", SHORT_TEXT_LENGTH) val result = varchar("result", SHORT_TEXT_LENGTH).nullable() - val startedAt = datetime("started_at").nullable() - val finishedAt = datetime("finished_at").nullable() + val duration = long("duration").nullable() val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } diff --git a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql new file mode 100644 index 00000000..cc947241 --- /dev/null +++ b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql @@ -0,0 +1,2 @@ +ALTER TABLE raw_data.test_launches +ADD COLUMN IF NOT EXISTS duration BIGINT DEFAULT NULL; \ No newline at end of file diff --git a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql deleted file mode 100644 index 1eebff2e..00000000 --- a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Finish_Time.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE raw_data.test_launches -ADD COLUMN IF NOT EXISTS started_at TIMESTAMP DEFAULT NULL; -ALTER TABLE raw_data.test_launches -ADD COLUMN IF NOT EXISTS finished_at TIMESTAMP DEFAULT NULL; From d87ddedbfeee0f84c0c2a85fc7a4037ee1b7c1c0 Mon Sep 17 00:00:00 2001 From: iryabov Date: Wed, 5 Feb 2025 14:50:39 +0100 Subject: [PATCH 5/6] refactor: change `duration` type to `integer` refactor: return back UTC timezone for startedAt field --- .../admin/writer/rawdata/service/impl/RawDataServiceImpl.kt | 2 +- .../epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt index c9515f52..e66cb0d8 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/service/impl/RawDataServiceImpl.kt @@ -191,7 +191,7 @@ class RawDataServiceImpl( id = sessionPayload.id, groupId = sessionPayload.groupId, testTaskId = sessionPayload.testTaskId, - startedAt = sessionPayload.startedAt.toLocalDateTime(TimeZone.currentSystemDefault()).toJavaLocalDateTime() + startedAt = sessionPayload.startedAt.toLocalDateTime(TimeZone.UTC).toJavaLocalDateTime() ) transaction { testSessionRepository.create(testSession) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt index 3fda167f..36006816 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/table/TestLaunchTable.kt @@ -23,6 +23,6 @@ object TestLaunchTable : StringIdTable("raw_data.test_launches") { val testDefinitionId = varchar("test_definition_id", SHORT_TEXT_LENGTH) val testSessionId = varchar("test_session_id", SHORT_TEXT_LENGTH) val result = varchar("result", SHORT_TEXT_LENGTH).nullable() - val duration = long("duration").nullable() + val duration = integer("duration").nullable() val createdAt = datetime("created_at").defaultExpression(CurrentDateTime) } From e02b8ad5424cd09016fd806c276ab27661565a4e Mon Sep 17 00:00:00 2001 From: iryabov Date: Wed, 5 Feb 2025 15:14:51 +0100 Subject: [PATCH 6/6] refactor: change `duration` column type to `INT` --- .../com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt | 2 +- .../admin/writer/rawdata/route/payload/TestMetadataPayload.kt | 2 +- .../main/resources/raw_data/db/migration/V12__Test_Duration.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt index c3099578..2257aa71 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/entity/TestMetadata.kt @@ -28,7 +28,7 @@ class TestLaunch ( val testDefinitionId: String, val testSessionId: String, val result: String?, - val duration: Long? = null, + val duration: Int? = null, ) class TestDefinition( diff --git a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt index 747736d2..96c41979 100644 --- a/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt +++ b/admin-writer/src/main/kotlin/com/epam/drill/admin/writer/rawdata/route/payload/TestMetadataPayload.kt @@ -31,7 +31,7 @@ class TestLaunchInfo( val testLaunchId: String, val testDefinitionId: String, val result: TestResult, - val duration: Long? = null, + val duration: Int? = null, val details: TestDetails, ) diff --git a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql index cc947241..b5093a8d 100644 --- a/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql +++ b/admin-writer/src/main/resources/raw_data/db/migration/V12__Test_Duration.sql @@ -1,2 +1,2 @@ ALTER TABLE raw_data.test_launches -ADD COLUMN IF NOT EXISTS duration BIGINT DEFAULT NULL; \ No newline at end of file +ADD COLUMN IF NOT EXISTS duration INT DEFAULT NULL; \ No newline at end of file