2 files changed, 13 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
index ecc30df..46b86a6 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
@@ -69,13 +69,20 @@ trait Directives {
   }
 
   def domainExceptionHandler(req: String): ExceptionHandler = {
-    def errorResponse(ex: Throwable) =
-      ErrorsResponse(Seq(ResponseError(None, ex.getMessage, 1)), req)
+    def errorResponse(msg: String, code: Int) =
+      ErrorsResponse(Seq(ResponseError(None, msg, code)), req)
     ExceptionHandler {
-      case ex: InvalidActionException    => complete(StatusCodes.Forbidden           -> errorResponse(ex))
-      case ex: ResourceNotFoundException => complete(StatusCodes.NotFound            -> errorResponse(ex))
-      case ex: InvalidInputException     => complete(StatusCodes.BadRequest          -> errorResponse(ex))
-      case NonFatal(ex)                  => complete(StatusCodes.InternalServerError -> errorResponse(ex))
+      case ex: InvalidActionException =>
+        complete(StatusCodes.Forbidden -> errorResponse(ex.message, 403))
+
+      case ex: ResourceNotFoundException =>
+        complete(StatusCodes.NotFound -> errorResponse(ex.message, 404))
+
+      case ex: InvalidInputException =>
+        complete(StatusCodes.BadRequest -> errorResponse(ex.message, 400))
+
+      case NonFatal(ex) =>
+        complete(StatusCodes.InternalServerError -> errorResponse(ex.getMessage, 500))
     }
   }
 
diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
index f617a20..27560d5 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
@@ -18,9 +18,6 @@ import xyz.driver.pdsuidomain.formats.json.record._
 import xyz.driver.pdsuidomain.formats.json.document._
 import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
 import xyz.driver.pdsuidomain.services.ExtractedDataService.RichExtractedData
-import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion}
-import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEligibleTrial
-import xyz.driver.pdsuidomain.services.PatientLabelService.RichPatientLabel
 
 import scala.collection.immutable