Handle unrecognized job type properly (#30)

Author: tanin47

build.sbt

@@ -14,7 +14,7 @@ libraryDependencies ++= Seq(
 
 organization := "givers.moonlight"
 name := "play-moonlight"
-version := "0.16.1"
+version := "0.16.2"
 parallelExecution in Test := false
 
 publishMavenStyle := true

src/main/scala/givers/moonlight/Main.scala

@@ -204,10 +204,10 @@ class Work @Inject()(
       return
     }
 
-    val runnable = getWorker(job.jobType)
-
     val startInMillis = Instant.now().toEpochMilli
     try {
+      val runnable = getWorker(job.jobType)
+
       await(backgroundJobService.start(job.id))
       logger.info(s"Started ${runnable.getClass.getSimpleName} (id=${job.id})")
       runnable.run(job)
@@ -217,12 +217,12 @@ class Work @Inject()(
       case e: InterruptedException => throw e
       case e: Throwable =>
         await(backgroundJobService.fail(job.id, e))
-        logger.error(s"Error occurred while running ${runnable.getClass.getSimpleName} (id=${job.id}, type=${job.jobType}, params=${job.paramsInJsonString}.", e)
-        logger.info(s"Finished ${runnable.getClass.getSimpleName} (id=${job.id}) with the above error")
+        logger.error(s"Error occurred while running the job (id=${job.id}, type=${job.jobType}, params=${job.paramsInJsonString}, tryCount=${job.tryCount}).", e)
         throw e
+    } finally {
+      val duration = Instant.now().toEpochMilli - startInMillis
+      logger.info(s"The job (id=${job.id}) took $duration millis")
     }
-    val duration = Instant.now().toEpochMilli - startInMillis
-    logger.info(s"The job (id=${job.id}) took $duration millis")
   }
 
   private[moonlight] def getWorker(jobType: String): Worker[_] = {

src/test/scala/givers.moonlight/WorkSpec.scala

@@ -99,6 +99,22 @@ object WorkSpec extends BaseSpec {
         verifyNoMoreInteractions(backgroundJobService)
       }
 
+      "Unrecognized job type fails the job" - {
+        val unrecognizedJob = job.copy(id = 1234L, jobType = "ItsUnrecognizedJobType")
+        when(backgroundJobService.getById(any())).thenReturn(Future(Some(unrecognizedJob)))
+        when(worker.run(any())).thenAnswer(new Answer[Unit] {
+          override def answer(invocation: InvocationOnMock) = throw new Exception("FakeError")
+        })
+
+        intercept[Exception] {
+          work.runJob(unrecognizedJob.id)
+        }
+
+        verify(backgroundJobService).getById(unrecognizedJob.id)
+        verify(backgroundJobService).fail(eq(unrecognizedJob.id), argThat { e: Throwable => e.getMessage == "Unrecognized job type 'ItsUnrecognizedJobType'." })
+        verifyNoMoreInteractions(backgroundJobService)
+      }
+
       "InterruptedException occurs" - {
         when(worker.run(any())).thenAnswer(new Answer[Unit] {
           override def answer(invocation: InvocationOnMock) = throw new InterruptedException()