Skip to content

Support for detailed error messages in case of query errors #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2020
Merged

Support for detailed error messages in case of query errors #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/main/scala/de/upb/cs/swt/delphi/cli/commands/SearchCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import de.upb.cs.swt.delphi.cli.artifacts.SearchResultsJson._
import spray.json._

import scala.concurrent.duration._
import scala.util.{Success, Try}

object SearchCommand extends Command with DefaultJsonProtocol{

Expand Down Expand Up @@ -65,6 +66,26 @@ object SearchCommand extends Command with DefaultJsonProtocol{
error.apply(s"The query timed out after ${took.toSeconds}%.0f seconds. " +
"To set a longer timeout, use the --timeout option.")
}

if (res.code == StatusCodes.BadRequest && !res.statusText.isEmpty) {
Try(res.statusText.parseJson) match {
case Success(value) =>
val errorDescription = value.asJsObject
val errorMessage = errorDescription.fields("msg").asInstanceOf[JsString].value

error.apply(f"Your query could not be processed: $errorMessage")

if (errorDescription.fields.contains("invalid_fields")) {
val invalidFields = errorDescription.fields("invalid_fields")
.asInstanceOf[JsArray].elements.map(_.asInstanceOf[JsString].value).mkString(", ")
error.apply(f"The following field names are invalid: $invalidFields")
}

case _ =>
error.apply("Your query could not be processed: Unknown error")
}
}

val resStr = res.body match {
case Left(v) =>
error.apply(s"Search request failed \n $v")
Expand Down