Епик Александр - Phase 1

app/ DTOs/HolderDTO.scala

@@ -0,0 +1,10 @@
+package DTOs
+
+import play.api.libs.json.{Json, Reads}
+
+case class HolderDTO(pages: Int,
+                     items: Option[Seq[VacancyDTO]])
+
+object HolderDTO {
+  implicit val holderDtoReader: Reads[HolderDTO] = Json.reads[HolderDTO]
+}

app/ DTOs/RegionDTO.scala

@@ -0,0 +1,11 @@
+package DTOs
+
+import play.api.libs.json.{Json, Reads}
+
+case class RegionDTO(id: String,
+                     name: String,
+                     areas: Seq[RegionDTO])
+
+object RegionDTO {
+  implicit val regionDtoReader: Reads[RegionDTO] = Json.reads[RegionDTO]
+}

app/ DTOs/SalaryDTO.scala

@@ -0,0 +1,12 @@
+package DTOs
+
+import play.api.libs.json.{Json, Reads}
+
+case class SalaryDTO(currency: Option[String],
+                     from: Option[Int],
+                     gross: Option[Boolean],
+                     to: Option[Int])
+
+object SalaryDTO {
+  implicit val salaryDtoReader: Reads[SalaryDTO] = Json.reads[SalaryDTO]
+}

app/ DTOs/SnippetDTO.scala

@@ -0,0 +1,10 @@
+package DTOs
+
+import play.api.libs.json.{Json, Reads}
+
+case class SnippetDTO(requirement: Option[String],
+                      responsibility: Option[String])
+
+object SnippetDTO {
+  implicit val snippetDtoReader: Reads[SnippetDTO] = Json.reads[SnippetDTO]
+}

app/ DTOs/VacancyDTO.scala

@@ -0,0 +1,13 @@
+package DTOs
+
+import play.api.libs.json.{Json, Reads}
+
+case class VacancyDTO(id: String,
+                      name: Option[String],
+                      alternate_url: Option[String],
+                      snippet: Option[SnippetDTO],
+                      salary: Option[SalaryDTO])
+
+object VacancyDTO {
+  implicit val vacancyDtoReader: Reads[VacancyDTO] = Json.reads[VacancyDTO]
+}

app/controllers/JobAggregatorController.scala

@@ -13,7 +13,7 @@ class JobAggregatorController @Inject()(val controllerComponents: ControllerComp
 
   def index(text: String, area: Int) = Action.async { implicit request: Request[AnyContent] =>
 
-    jobAggregatorService.parse(text, area).map(_ => Ok(""))
-      .recover(x => InternalServerError("Some exception has occurred"))
+    jobAggregatorService.aggregateData(text, area).map(_ => Ok(""))
+      .recover(exception => InternalServerError("Following exception has occurred: " + exception.getMessage))
   }
 }

app/model/Job.scala

@@ -1,15 +1,13 @@
 package model
 
-import java.util.UUID
-
 case class Job(id: Int,
                title: Option[String],
                requirement: Option[String],
                responsibility: Option[String],
-               alternate_url: Option[String],
-               salary_from: Option[Int],
-               salary_to: Option[Int],
-               salary_currency: Option[String],
-               salary_gross: Option[Boolean],
+               alternateUrl: Option[String],
+               salaryFrom: Option[Int],
+               salaryTo: Option[Int],
+               salaryCurrency: Option[String],
+               salaryGross: Option[Boolean],
                city: Option[String],
-               key_word: Option[String])
+               keyWord: Option[String])

app/model/db/JobTable.scala

@@ -2,7 +2,6 @@ package model.db
 
 import model.Job
 import slick.jdbc.PostgresProfile.api._
-import java.util.UUID
 
 class JobTable(tag: Tag) extends Table[Job](tag, "job") {
   def id = column[Int]("id", O.PrimaryKey)
@@ -13,23 +12,23 @@ class JobTable(tag: Tag) extends Table[Job](tag, "job") {
 
   def responsibility = column[Option[String]]("responsibility")
 
-  def alternate_url = column[Option[String]]("alternate_url")
+  def alternateUrl = column[Option[String]]("alternate_url")
 
-  def salary_from = column[Option[Int]]("salary_from")
+  def salaryFrom = column[Option[Int]]("salary_from")
 
-  def salary_to = column[Option[Int]]("salary_to")
+  def salaryTo = column[Option[Int]]("salary_to")
 
-  def salary_currency = column[Option[String]]("salary_currency")
+  def salaryCurrency = column[Option[String]]("salary_currency")
 
-  def salary_gross = column[Option[Boolean]]("salary_gross")
+  def salaryGross = column[Option[Boolean]]("salary_gross")
 
   def city = column[Option[String]]("city")
 
-  def key_word = column[Option[String]]("key_word")
+  def keyWord = column[Option[String]]("key_word")
 
 
   def * =
-    (id, title, requirement, responsibility, alternate_url, salary_from, salary_to, salary_currency, salary_gross,
-      city, key_word) <> (Job.tupled, Job.unapply)
+    (id, title, requirement, responsibility, alternateUrl, salaryFrom, salaryTo, salaryCurrency, salaryGross,
+      city, keyWord) <> (Job.tupled, Job.unapply)
 }
 

app/scheduler/Task.scala

@@ -5,22 +5,37 @@ import akka.actor.ActorSystem
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._
-import play.api.Configuration
+import play.api.{Configuration, Logger, Mode}
 import service.JobAggregatorService
 
+import scala.util.Try
+
 class Task @Inject()(actorSystem: ActorSystem,
                      configuration: Configuration,
                      jobAggregatorService: JobAggregatorService)(implicit executionContext: ExecutionContext) {
 
-  val initialDelay: String = configuration.get[String]("initialDelay")
-  val interval: String = configuration.get[String]("interval")
-  val cities: Seq[String] = configuration.get[Seq[String]]("cities")
-  val keyWords: Seq[String] = configuration.get[Seq[String]]("keyWords")
+  if (!configuration.has("initialDelay") || !configuration.has("interval")
+    || !configuration.has("cities") || !configuration.has("keyWords"))
+    throw new NoSuchFieldException("Configuration doesn't have some of these paths:" +
+      " initialDelay, interval, cities, keyWords")
+
+  val initialDelay: Option[String] = configuration.getOptional[String]("initialDelay")
+  val interval: Option[String] = configuration.getOptional[String]("interval")
+  val cities: Option[Seq[String]] = configuration.getOptional[Seq[String]]("cities")
+  val keyWords: Option[Seq[String]] = configuration.getOptional[Seq[String]]("keyWords")
+
+  if (initialDelay.isEmpty || interval.isEmpty || cities.isEmpty || keyWords.isEmpty)
+    throw new ClassCastException("Some of these paths have wrong type: initialDelay, interval, cities, keyWords")
+
+  val initDelay: Try[FiniteDuration] = Try(Duration(initialDelay.get).asInstanceOf[FiniteDuration])
+  val interv: Try[FiniteDuration] = Try(Duration(interval.get).asInstanceOf[FiniteDuration])
+
+  if(initDelay.isFailure || interv.isFailure)
+    throw new ClassCastException("Initial delay or interval have wrong format")
 
-  actorSystem.scheduler.scheduleAtFixedRate(initialDelay = Duration(initialDelay).asInstanceOf[FiniteDuration],
-    interval = Duration(interval).asInstanceOf[FiniteDuration]) { () =>
-    jobAggregatorService.parse(keyWords, cities)
-    println("Scheduled task executed")
-    //actorSystem.log.info("Executing something...")
+  actorSystem.scheduler.scheduleAtFixedRate(initialDelay = initDelay.get,
+    interval = interv.get) { () =>
+    jobAggregatorService.aggregateData(keyWords.get, cities.get)
+    Logger("play").info("Scheduled task executed")
   }
 }