* fixes after merge conflicts resolution

AbsaOSS · Sep 27, 2024 · e301350 · e301350
1 parent 4587f33
commit e301350
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.../flows/V1.9.8__get_flow_partitionings.sql → ...ows/V0.2.0.58__get_flow_partitionings.sql b/.../flows/V1.9.8__get_flow_partitionings.sql → ...ows/V0.2.0.58__get_flow_partitionings.sql
diff --git a/...ns/V1.9.9__get_partitioning_main_flow.sql → ...V0.2.0.30__get_partitioning_main_flow.sql b/...ns/V1.9.9__get_partitioning_main_flow.sql → ...V0.2.0.30__get_partitioning_main_flow.sql
diff --git a/...stgres/runs/V1.9.12__get_partitioning.sql → ...gres/runs/V0.2.0.31__get_partitioning.sql b/...stgres/runs/V1.9.12__get_partitioning.sql → ...gres/runs/V0.2.0.31__get_partitioning.sql
diff --git a/.../src/test/scala/za/co/absa/atum/database/flows/GetFlowPartitioningsIntegrationTests.scala b/.../src/test/scala/za/co/absa/atum/database/flows/GetFlowPartitioningsIntegrationTests.scala
@@ -34,7 +34,7 @@ class GetFlowPartitioningsIntegrationTests extends DBTestSuite {
       |{
       |   "version": 1,
       |   "keys": ["keyA", "keyB", "keyC"],
-      |   "keysToValues": {
+      |   "keysToValuesMap": {
       |     "keyA": "valueA",
       |     "keyB": "valueB",
       |     "keyC": "valueC"
@@ -48,7 +48,7 @@ class GetFlowPartitioningsIntegrationTests extends DBTestSuite {
       |{
       |   "version": 1,
       |   "keys": ["keyA", "keyB"],
-      |   "keysToValues": {
+      |   "keysToValuesMap": {
       |     "keyA": "valueA",
       |     "keyB": "valueB"
       |   }
@@ -61,7 +61,7 @@ class GetFlowPartitioningsIntegrationTests extends DBTestSuite {
       |{
       |   "version": 1,
       |   "keys": ["keyD", "keyE", "keyF"],
-      |   "keysToValues": {
+      |   "keysToValuesMap": {
       |     "keyD": "valueD",
       |     "keyE": "valueE",
       |     "keyF": "valueF"

diff --git a/...test/scala/za/co/absa/atum/database/runs/GetPartitioningCheckpointsIntegrationTests.scala b/...test/scala/za/co/absa/atum/database/runs/GetPartitioningCheckpointsIntegrationTests.scala
@@ -38,7 +38,7 @@ class GetPartitioningCheckpointsIntegrationTests extends DBTestSuite {
       |{
       | "version": 1,
       |  "keys": ["keyX", "keyY", "keyZ"],
-      |  "keysToValues": {
+      |  "keysToValuesMap": {
       |    "keyX": "value1",
       |    "keyZ": "value3",
       |    "keyY": "value2"

diff --git a/database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningIntegrationTests.scala b/database/src/test/scala/za/co/absa/atum/database/runs/GetPartitioningIntegrationTests.scala
@@ -30,7 +30,7 @@ class GetPartitioningIntegrationTests extends DBTestSuite {
       |{
       |  "version":1,
       |  "keys":["key1","key2","key3","key4"],
-      |  "keysToValues":{
+      |  "keysToValuesMap":{
       |    "key1":"valueX",
       |    "key2":"valueY",
       |    "key3":"valueZ",
@@ -46,7 +46,7 @@ class GetPartitioningIntegrationTests extends DBTestSuite {
       |{
       |  "version":1,
       |  "keys":["key1","key2","key3","key4"],
-      |  "keysToValues":{
+      |  "keysToValuesMap":{
       |    "key1":"valueX",
       |    "key2":"valueX",
       |    "key3":"valueX",
@@ -91,7 +91,7 @@ class GetPartitioningIntegrationTests extends DBTestSuite {
         assert {
           val retrievedPartitioningAsJson = Json.fromString(row.getJsonB("o_partitioning").get.value)
           val expectedPartitioningAsJson = Json.fromString(partitioning1Value)
-          retrievedPartitioningAsJson \\ "keysToValues" == expectedPartitioningAsJson \\ "keysToValues" &&
+          retrievedPartitioningAsJson \\ "keysToValuesMap" == expectedPartitioningAsJson \\ "keysToValuesMap" &&
             retrievedPartitioningAsJson \\ "keys" == expectedPartitioningAsJson \\ "keys"
         }
         assert(row.getString("author").contains("Fantômas"))

diff --git a/...rc/test/scala/za/co/absa/atum/database/runs/GetPartitioningMainFlowIntegrationTests.scala b/...rc/test/scala/za/co/absa/atum/database/runs/GetPartitioningMainFlowIntegrationTests.scala
@@ -28,7 +28,7 @@ class GetPartitioningMainFlowIntegrationTests extends DBTestSuite {
       |{
       |   "version": 1,
       |   "keys": ["keyX", "keyY", "keyZ"],
-      |   "keysToValues": {
+      |   "keysToValuesMap": {
       |     "keyX": "value1",
       |     "keyZ": "value3",
       |     "keyY": "value2"
@@ -42,7 +42,7 @@ class GetPartitioningMainFlowIntegrationTests extends DBTestSuite {
       |{
       |  "version": 1,
       |  "keys": ["key1", "key3", "key2", "key4"],
-      |  "keysToValues": {
+      |  "keysToValuesMap": {
       |    "key1": "valueX",
       |    "key2": "valueY",
       |    "key3": "valueZ",

diff --git a/...main/scala/za/co/absa/atum/server/api/database/flows/functions/GetFlowPartitionings.scala b/...main/scala/za/co/absa/atum/server/api/database/flows/functions/GetFlowPartitionings.scala
@@ -69,7 +69,7 @@ object GetFlowPartitionings {
           case Left(decodingFailure) => Left(decodingFailure)
           case Right(partitioningForDB) =>
             val partitioningDTO = partitioningForDB.keys.map { key =>
-              PartitionDTO(key, partitioningForDB.keysToValues(key))
+              PartitionDTO(key, partitioningForDB.keysToValuesMap(key))
             }
             resultsToPartitioningWithIdDTOs(tail, acc :+ PartitioningWithIdDTO(head.id, partitioningDTO, head.author))
         }

diff --git a/server/src/main/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryImpl.scala b/server/src/main/scala/za/co/absa/atum/server/api/repository/PartitioningRepositoryImpl.scala
@@ -128,7 +128,7 @@ class PartitioningRepositoryImpl (
           error => ZIO.fail(GeneralDatabaseError(s"Failed to decode JSON: $error")),
           partitioningForDB => {
             val partitioningDTO: PartitioningDTO = partitioningForDB.keys.map { key =>
-              PartitionDTO(key, partitioningForDB.keysToValues(key))
+              PartitionDTO(key, partitioningForDB.keysToValuesMap(key))
             }
             ZIO.succeed(PartitioningWithIdDTO(id, partitioningDTO, author))
           }

diff --git a/server/src/test/scala/za/co/absa/atum/server/api/TestData.scala b/server/src/test/scala/za/co/absa/atum/server/api/TestData.scala
@@ -56,7 +56,7 @@ trait TestData {
         |{
         |  "version": 1,
         |  "keys": ["key1", "key2"],
-        |  "keysToValues": {
+        |  "keysToValuesMap": {
         |    "key1": "val1",
         |    "key2": "val2"
         |  }