Improving insert queries for postgres

README.md

@@ -41,6 +41,7 @@ npm run dev
 ```
 SELECT * FROM public.weather WHERE datetime > '2023-12-9T00:00:00+00'::timestamptz;
 DELETE FROM public.weather
+SET TIMEZONE = 'Europe/Riga';
 ```
 
 ## Docker
@@ -53,6 +54,8 @@ docker start local-postgres
 
 ## Fly Postgres
 ```
-fly machines list --app <app-name>
+fly machines list --app weather-tool-db
-fly machines start <machine-id> --app <app-name>
+fly machines start <machine-id> --app weather-tool-db
+
+fly proxy 15432:5432 -a weather-tool-db // map to local port for pgAdmin
 ```

src/main/scala/db/DataService.scala

@@ -58,10 +58,17 @@ class DataService private(
 
   def save(fileName: String, content: String): IO[String] = {
     // TODO replace unsafeRunSync to redeemWith
-    postgresService.save(fileName, content).unsafeRunSync()
+//    postgresService.save(fileName, content).unsafeRunSync()
+//    postgresService.save(fileName, content)
+
+    for {
+      result <- fileService.save(fileName, content)
+      _ <- postgresService.save(fileName, content)
+    } yield result
 
     // TODO delete this
-    fileService.save(fileName, content)
+//    fileService.save(fileName, content)
+
 //    fileService.save(fileName, content).redeemWith(
 //      error => IO.raiseError(error),
 //      savedFileName => {

src/main/scala/db/PostgresService.scala

@@ -85,17 +85,19 @@ class PostgresService(transactor: Transactor[IO], log: Logger[IO]) extends DataS
   implicit val doubleOptionMeta: Meta[Option[Double]] = Meta[Double].imap(Option(_))(_.getOrElse(Double.NaN))
 
   def insertInWeatherTable(data: List[WeatherStationData]): IO[Int] = {
-    data.parTraverse(line => {
+//    IO.blocking {
-      val zonedTime: ZonedDateTime = line.timestamp.atZone(rigaZone)
+      getResourceContent("/db/insert_weather_table.sql").flatMap { insertTableSql =>
-      val w = line.weather
+        val insertData = data.map(line => {
-      for {
+          val zonedTime: ZonedDateTime = line.timestamp.atZone(rigaZone)
-        insertTableSql <- getResourceContent("/db/insert_weather_table.sql")
+          val w = line.weather
-        result <- Update[(ZonedDateTime, String, Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], List[String])](
+          (zonedTime, line.city, w.tempMax, w.tempMin, w.tempAvg, w.precipitation, w.windAvg, w.windMax, w.visibilityMin, w.visibilityAvg, w.snowAvg, w.atmPressure, w.dewPoint, w.humidity, w.sunDuration, w.phenomena)
-          insertTableSql
+        })
-        ).run((zonedTime, line.city, w.tempMax, w.tempMin, w.tempAvg, w.precipitation, w.windAvg, w.windMax, w.visibilityMin, w.visibilityAvg, w.snowAvg, w.atmPressure, w.dewPoint, w.humidity, w.sunDuration, w.phenomena))
+
+        Update[(ZonedDateTime, String, Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], Option[Double], List[String])](insertTableSql)
+          .updateMany(insertData)
           .transact(transactor)
-      } yield result
+      }
-    }).map(_.sum)
+//    }.flatten
   }
 
   def selectWeatherTable(): IO[List[(String, Option[Double])]] = {

src/main/scala/server/Server.scala

@@ -67,6 +67,7 @@ class Server(dataService: DataService, fetch: FetchService, log: Logger[IO]) {
         fetchServiceError = fetchResultEither.left.toOption.map(e => s"FetchServiceError: ${e.getMessage}").toList
         fetchResult = fetchResultEither.getOrElse(List.empty)
         (fetchErrors, successDownloads) = fetchResult.partitionMap(identity)
+        _ <- log.info(s"FETCHED SUCCESSFULLY files: ${successDownloads.size}")
         saveResults <- successDownloads.traverse { case (name, content) => dataService.save(name, content).attempt }
         (saveErrors, successSaves) = saveResults.partitionMap(identity)
 //        successes = successDownloads.map(s => s"fetched: ${s._1}") ++ successSaves.map(s => s"saved: $s")