Merge branch 'refs/heads/master' into feature/231-get-partitioning-ch…

…eckpoint-232-based # Conflicts: # server/src/main/scala/za/co/absa/atum/server/Main.scala # server/src/main/scala/za/co/absa/atum/server/api/controller/BaseController.scala # server/src/main/scala/za/co/absa/atum/server/api/controller/CheckpointController.scala # server/src/main/scala/za/co/absa/atum/server/api/controller/CheckpointControllerImpl.scala # server/src/main/scala/za/co/absa/atum/server/api/exception/DatabaseError.scala # server/src/main/scala/za/co/absa/atum/server/api/exception/ServiceError.scala # server/src/main/scala/za/co/absa/atum/server/api/http/BaseEndpoints.scala # server/src/main/scala/za/co/absa/atum/server/api/http/Endpoints.scala # server/src/main/scala/za/co/absa/atum/server/api/repository/BaseRepository.scala # server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepository.scala # server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryImpl.scala # server/src/main/scala/za/co/absa/atum/server/api/service/BaseService.scala # server/src/main/scala/za/co/absa/atum/server/api/service/CheckpointService.scala # server/src/main/scala/za/co/absa/atum/server/api/service/CheckpointServiceImpl.scala # server/src/main/scala/za/co/absa/atum/server/model/CheckpointFromDB.scala # server/src/test/scala/za/co/absa/atum/server/api/controller/CheckpointControllerUnitTests.scala # server/src/test/scala/za/co/absa/atum/server/api/http/PostCheckpointEndpointV2UnitTests.scala # server/src/test/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryUnitTests.scala # server/src/test/scala/za/co/absa/atum/server/api/service/CheckpointServiceUnitTests.scala
AbsaOSS · Aug 21, 2024 · 5336dcd · 5336dcd
2 parents 5c21538 + 0037625
commit 5336dcd
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepository.scala b/server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepository.scala
@@ -18,7 +18,6 @@ package za.co.absa.atum.server.api.repository
 
 import za.co.absa.atum.model.dto.{CheckpointDTO, CheckpointV2DTO}
 import za.co.absa.atum.server.api.exception.DatabaseError
-import za.co.absa.atum.server.model.CheckpointFromDB
 import zio._
 import zio.macros.accessible
 

diff --git a/server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryImpl.scala b/server/src/main/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryImpl.scala
@@ -20,6 +20,7 @@ import za.co.absa.atum.model.dto.{CheckpointDTO, CheckpointV2DTO}
 import za.co.absa.atum.server.api.database.runs.functions._
 import za.co.absa.atum.server.api.database.runs.functions.GetPartitioningCheckpointV2.GetPartitioningCheckpointV2Args
 import za.co.absa.atum.server.api.database.runs.functions.WriteCheckpointV2.WriteCheckpointArgs
+import za.co.absa.atum.server.api.database.runs.functions.{WriteCheckpointV2, WriteCheckpoint}
 import za.co.absa.atum.server.api.exception.DatabaseError
 import za.co.absa.atum.server.api.exception.DatabaseError.GeneralDatabaseError
 import za.co.absa.atum.server.model.CheckpointItemFromDB

diff --git a/server/src/main/scala/za/co/absa/atum/server/model/CheckpointFromDB.scala b/server/src/main/scala/za/co/absa/atum/server/model/CheckpointFromDB.scala
@@ -16,8 +16,8 @@
 
 package za.co.absa.atum.server.model
 
-import io.circe.{DecodingFailure, Json}
 import za.co.absa.atum.model.dto._
+import io.circe.{DecodingFailure, Json}
 
 import java.time.ZonedDateTime
 import java.util.UUID

diff --git a/.../src/test/scala/za/co/absa/atum/server/api/controller/CheckpointControllerUnitTests.scala b/.../src/test/scala/za/co/absa/atum/server/api/controller/CheckpointControllerUnitTests.scala
@@ -24,7 +24,6 @@ import za.co.absa.atum.server.api.exception.ServiceError._
 import za.co.absa.atum.server.api.service.CheckpointService
 import za.co.absa.atum.server.model.SuccessResponse.SingleSuccessResponse
 import za.co.absa.atum.server.model.{ConflictErrorResponse, InternalServerErrorResponse, NotFoundErrorResponse}
-import za.co.absa.atum.server.model.{ConflictErrorResponse, InternalServerErrorResponse}
 import zio._
 import zio.test.Assertion.failsWithA
 import zio.test._

diff --git a/.../src/test/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryUnitTests.scala b/.../src/test/scala/za/co/absa/atum/server/api/repository/CheckpointRepositoryUnitTests.scala
@@ -29,6 +29,7 @@ import zio._
 import zio.interop.catz.asyncInstance
 import zio.test.Assertion.failsWithA
 import zio.test._
+
 import za.co.absa.db.fadb.status.Row
 
 object CheckpointRepositoryUnitTests extends ZIOSpecDefault with TestData {