bot/WeatherTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DBService object to class with logger injection

Browse Source
This commit is contained in:
Guntis Smaukstelis
2023-05-20 20:20:14 +03:00
parent 9241277b7f
commit bbdfaa06d8
6 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/server/Main.scala
+14 -12
View File
@@ -6,19 +6,21 @@ import fetch.{FetchService, FileNameService}
object Main extends IOApp {
def run(args: List[String]): IO[ExitCode] = {
// TODO looks like fetchTask fails server if no csv on meteo server
val fetchTask = FileNameService.generateCurrentHour.flatMap(FetchService.fetchSingleFile)
val scheduler = Scheduler.scheduleTask(fetchTask)
.evalMap { case (name, content) =>
IO(println(s"fetched: $name")) *>
DBService.save(name, content).attempt.flatMap {
case Right(savedName) => IO(println(s"File saved: $savedName"))
case Left(err) => IO(println(s"Error: $err"))
}
}.compile.drain // Convert Stream[IO, Unit] to IO[Unit]
for {
dbService <- DBService.of
fetchTask = FileNameService.generateCurrentHour.flatMap(FetchService.fetchSingleFile)
scheduler = Scheduler.scheduleTask(fetchTask)
.evalMap { case (name, content) =>
IO(println(s"fetched: $name")) *>
dbService.save(name, content).attempt.flatMap {
case Right(savedName) => IO(println(s"File saved: $savedName"))
case Left(err) => IO(println(s"Error: $err"))
}
}.compile.drain // Convert Stream[IO, Unit] to IO[Unit]
val server = Server.run // This is an IO[Server]
server = Server.run // This is an IO[Server]
(server, scheduler).parMapN((_, _) => ExitCode.Success)
exitCode <- (server, scheduler).parMapN((_, _) => ExitCode.Success)
} yield exitCode
}
}
src/main/scala/server/Server.scala
+9 -8
View File
@@ -38,9 +38,9 @@ object Server {
// http://0.0.0.0:8080/api/query/20230414_2200-20230501_1230/Liepāja,Rēzekne/tempMax/max
case GET -> Root / "query" / DateTimeRange(from, to) / CityList(cities) / field / AggKey(key) =>
DBService.getInRange(from, to)
DBService.of.flatMap(_.getInRange(from, to)
.map(Parser.queryData(UserQuery(cities, field, key), _))
.flatMap(result => Ok(result.asJson.pretty))
.flatMap(result => Ok(result.asJson.pretty)))
// http://0.0.0.0:8080/api/fetch/date/20230514
case GET -> Root / "fetch" / "date" / ValidDate(date) =>
@@ -49,7 +49,8 @@ object Server {
fetchServiceError = fetchResultEither.left.toOption.map(e => s"FetchServiceError: ${e.getMessage}").toList
fetchResult = fetchResultEither.getOrElse(List.empty)
(fetchErrors, successDownloads) = fetchResult.partitionMap(identity)
saveResults <- successDownloads.traverse { case (name, content) => DBService.save(name, content) }
dbService <- DBService.of
saveResults <- successDownloads.traverse { case (name, content) => dbService.save(name, content) }
(saveErrors, successSaves) = saveResults.partitionMap(identity)
// successes = successDownloads.map(s => s"fetched: ${s._1}") ++ successSaves.map(s => s"saved: $s")
successes = successSaves
@@ -67,19 +68,19 @@ object Server {
// http://0.0.0.0:8080/api/show/all_dates
case GET -> Root / "show" / "all_dates" =>
DBService.getDates().flatMap(dates =>
DBService.of.flatMap(_.getDates().flatMap(dates =>
Ok(dates.asJson.pretty)
)
))
// http://0.0.0.0:8080/api/show/date/20230423
case GET -> Root / "show" / "date" / ValidDate(date) =>
DBService.getDateFileNames(date).flatMap(fileNames =>
DBService.of.flatMap(_.getDateFileNames(date).flatMap(fileNames =>
Ok(fileNames.asJson.pretty)
)
))
// http://0.0.0.0:8080/api/show/file/20230423_12:30.csv
case GET -> Root / "show" / "file" / (fileName: String) =>
DBService.getFileContent(fileName).flatMap(Ok(_))
DBService.of.flatMap(_.getFileContent(fileName).flatMap(Ok(_)))
// http://0.0.0.0:8080/api/help
case GET -> Root / "help" => {