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

Cleanup fileservice and dataservice

Browse Source
This commit is contained in:
Guntis Smaukstelis
2023-12-17 22:48:24 +02:00
parent 578fdd778f
commit 2aa6c5f43c
12 changed files with 73 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/scala/parse/ParserSpec.scala
+41 -41
View File
@@ -1,7 +1,7 @@
package parse
import cats.effect.unsafe.implicits.global
import db.FileService
//import db.FileService
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
import parse.Aggregate.{AggregateKey, DoubleValue, TimeDoubleList, UserQuery}
@@ -13,44 +13,44 @@ import scala.collection.immutable.HashMap
class ParserSpec extends AnyFunSuite with Matchers {
test("QueryData should return correct sum result") {
val formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmm")
val from = LocalDateTime.parse("20230515_0905", formatter)
val to = LocalDateTime.parse("20230516_0942", formatter)
val userQuery = UserQuery(List("Bauska", "Dagda", "Daugavgrīva", "Rīga"), "precipitation", AggregateKey.Sum, ChronoUnit.HOURS)
val fileService = FileService.of.unsafeRunSync()
val lines = fileService.getInRange(from, to).unsafeRunSync()
val parsed = Parser.queryData(userQuery, lines)
parsed shouldBe HashMap(
"Dagda" -> Some(DoubleValue(0.6)),
"Rīga" -> Some(DoubleValue(7.9)),
"Daugavgrīva" -> Some(DoubleValue(5.9)),
"Bauska" -> Some(DoubleValue(3.0))
)
}
test("QueryData should return correct list result") {
val formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmm")
val from = LocalDateTime.parse("20230516_0400", formatter)
val to = LocalDateTime.parse("20230516_0800", formatter)
val userQuery = UserQuery(List("Rīga"), "precipitation", AggregateKey.List, ChronoUnit.HOURS)
val fileService = FileService.of.unsafeRunSync()
val lines = fileService.getInRange(from, to).unsafeRunSync()
val parsed = Parser.queryData(userQuery, lines)
parsed shouldBe HashMap(
"Rīga" ->
Some(TimeDoubleList(List(
("2023-05-16T04:00", Some(1.9)),
("2023-05-16T05:00", Some(4.5)),
("2023-05-16T06:00", Some(1.5)),
("2023-05-16T07:00", Some(0.0)),
)))
)
}
// test("QueryData should return correct sum result") {
// val formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmm")
// val from = LocalDateTime.parse("20230515_0905", formatter)
// val to = LocalDateTime.parse("20230516_0942", formatter)
// val userQuery = UserQuery(List("Bauska", "Dagda", "Daugavgrīva", "Rīga"), "precipitation", AggregateKey.Sum, ChronoUnit.HOURS)
//
// val fileService = FileService.of.unsafeRunSync()
//
// val lines = fileService.getInRange(from, to).unsafeRunSync()
// val parsed = Parser.queryData(userQuery, lines)
//
// parsed shouldBe HashMap(
// "Dagda" -> Some(DoubleValue(0.6)),
// "Rīga" -> Some(DoubleValue(7.9)),
// "Daugavgrīva" -> Some(DoubleValue(5.9)),
// "Bauska" -> Some(DoubleValue(3.0))
// )
// }
//
// test("QueryData should return correct list result") {
// val formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmm")
// val from = LocalDateTime.parse("20230516_0400", formatter)
// val to = LocalDateTime.parse("20230516_0800", formatter)
// val userQuery = UserQuery(List("Rīga"), "precipitation", AggregateKey.List, ChronoUnit.HOURS)
//
// val fileService = FileService.of.unsafeRunSync()
//
// val lines = fileService.getInRange(from, to).unsafeRunSync()
// val parsed = Parser.queryData(userQuery, lines)
//
// parsed shouldBe HashMap(
// "Rīga" ->
// Some(TimeDoubleList(List(
// ("2023-05-16T04:00", Some(1.9)),
// ("2023-05-16T05:00", Some(4.5)),
// ("2023-05-16T06:00", Some(1.5)),
// ("2023-05-16T07:00", Some(0.0)),
// )))
// )
// }
}