arcanis/ffxivbis
1
0
Fork 0
mirror of https://github.com/arcan1s/ffxivbis.git synced 2025-04-25 01:37:17 +00:00
Code Issues Projects Releases Wiki Activity

better job handling

Browse Source
This commit is contained in:
Evgenii Alekseev 2019-11-18 23:22:23 +03:00
parent 9faceb4f61
commit ab790e87ff
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/me/arcanis/ffxivbis/http/api/v1/HttpHandler.scala
View File

@ -18,6 +18,9 @@ import spray.json._
trait HttpHandler extends StrictLogging { this: JsonSupport =>
implicit def exceptionHandler: ExceptionHandler = ExceptionHandler {
case ex: IllegalArgumentException =>
complete(StatusCodes.BadRequest, ErrorResponse(ex.getMessage))
case other: Exception =>
logger.error("exception during request completion", other)
complete(StatusCodes.InternalServerError, ErrorResponse("unknown server error"))

7
src/main/scala/me/arcanis/ffxivbis/models/Job.scala
View File

@ -100,5 +100,10 @@ object Job {
Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, MNK, DRG, NIN, SAM, BRD, MCH, DNC, BLM, SMN, RDM)
lazy val availableWithAnyJob: Seq[Job] = available.prepended(AnyJob)
def withName(job: String): Job.Job = available.find(_.toString == job.toUpperCase).getOrElse(AnyJob)
def withName(job: String): Job.Job =
availableWithAnyJob.find(_.toString.equalsIgnoreCase(job.toUpperCase)) match {
case Some(value) => value
case None if job.isEmpty => AnyJob
case _ => throw new IllegalArgumentException("Invalid or unknown job")
}
}

8
src/test/scala/me/arcanis/ffxivbis/models/JobTest.scala
View File

@ -12,8 +12,12 @@ class JobTest extends WordSpecLike with Matchers with BeforeAndAfterAll {
}
}
"return AnyJob on unknown job" in {
Job.withName("random string") shouldEqual Job.AnyJob
"return AnyJob" in {
Job.withName("anyjob") shouldEqual Job.AnyJob
}
"fail on unknown job" in {
an [IllegalArgumentException] should be thrownBy Job.withName("random string")
}
"equal AnyJob to others" in {