Make some metnorwayforecastprovider queries shorter

davidtakac · Nov 6, 2022 · 516826f · 516826f
1 parent 9f9a9dd
commit 516826f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/...r/src/main/java/hr/dtakac/prognoza/metnorwayforecastprovider/MetNorwayForecastProvider.kt b/...r/src/main/java/hr/dtakac/prognoza/metnorwayforecastprovider/MetNorwayForecastProvider.kt
@@ -79,9 +79,11 @@ class MetNorwayForecastProvider(
         response?.let {
             withContext(ioDispatcher) {
                 cachedResponseQueries.insert(
-                    latitude = latitude,
-                    longitude = longitude,
-                    response = it
+                    CachedResponse(
+                        latitude = latitude,
+                        longitude = longitude,
+                        response = it
+                    )
                 )
             }
         }
@@ -94,10 +96,12 @@ class MetNorwayForecastProvider(
     ) {
         withContext(ioDispatcher) {
             metaQueries.insert(
-                latitude = latitude,
-                longitude = longitude,
-                expires = headers[HttpHeaders.Expires]?.let(zonedDateTimeSqlAdapter::decode),
-                lastModified = headers[HttpHeaders.LastModified]?.let(zonedDateTimeSqlAdapter::decode)
+                Meta(
+                    latitude = latitude,
+                    longitude = longitude,
+                    expires = headers[HttpHeaders.Expires]?.let(zonedDateTimeSqlAdapter::decode),
+                    lastModified = headers[HttpHeaders.LastModified]?.let(zonedDateTimeSqlAdapter::decode)
+                )
             )
         }
     }

diff --git a/...ovider/src/main/sqldelight/hr/dtakac/prognoza/metnorwayforecastprovider/CachedResponse.sq b/...ovider/src/main/sqldelight/hr/dtakac/prognoza/metnorwayforecastprovider/CachedResponse.sq
@@ -12,5 +12,4 @@ SELECT * FROM CachedResponse
 WHERE abs(latitude - :latitude) < 0.00001 AND abs(longitude - :longitude) < 0.00001;
 
 insert:
-INSERT OR REPLACE INTO CachedResponse (latitude, longitude, response)
-VALUES (?, ?, ?);
+INSERT OR REPLACE INTO CachedResponse VALUES ?;
diff --git a/...forecastprovider/src/main/sqldelight/hr/dtakac/prognoza/metnorwayforecastprovider/Meta.sq b/...forecastprovider/src/main/sqldelight/hr/dtakac/prognoza/metnorwayforecastprovider/Meta.sq
@@ -13,5 +13,4 @@ SELECT * FROM Meta
 WHERE abs(latitude - :latitude) < 0.00001 AND abs(longitude - :longitude) < 0.00001;
 
 insert:
-REPLACE INTO Meta (latitude, longitude, expires, lastModified)
-VALUES (?, ?, ?, ?);
+REPLACE INTO Meta VALUES ?;