Make some data queries shorter

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

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/data/src/main/java/hr/dtakac/prognoza/data/repository/PlaceRepository.kt b/data/src/main/java/hr/dtakac/prognoza/data/repository/PlaceRepository.kt
@@ -4,6 +4,7 @@ import hr.dtakac.prognoza.data.PlaceQueries
 import hr.dtakac.prognoza.domain.place.SavedPlaceGetter
 import hr.dtakac.prognoza.domain.place.PlaceSaver
 import hr.dtakac.prognoza.entities.Place
+import hr.dtakac.prognoza.data.Place as PlaceDbModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
@@ -50,10 +51,12 @@ class PlaceRepository(
     override suspend fun save(place: Place) {
         withContext(ioDispatcher) {
             placeQueries.insert(
-                latitude = place.latitude,
-                longitude = place.longitude,
-                name = place.name,
-                details = place.details
+                PlaceDbModel(
+                    latitude = place.latitude,
+                    longitude = place.longitude,
+                    name = place.name,
+                    details = place.details
+                )
             )
         }
     }

diff --git a/data/src/main/java/hr/dtakac/prognoza/data/repository/SettingsRepository.kt b/data/src/main/java/hr/dtakac/prognoza/data/repository/SettingsRepository.kt
@@ -1,6 +1,6 @@
 package hr.dtakac.prognoza.data.repository
 
-import hr.dtakac.prognoza.data.GetSettings
+import hr.dtakac.prognoza.data.Get
 import hr.dtakac.prognoza.data.SettingsQueries
 import hr.dtakac.prognoza.domain.place.SavedPlaceGetter
 import hr.dtakac.prognoza.domain.settings.SettingsRepository
@@ -56,7 +56,7 @@ class SettingsRepository(
         settingsQueries.setWindUnit(unit)
     }
 
-    private suspend fun getSettings(): GetSettings = withContext(ioDispatcher) {
-        settingsQueries.getSettings().executeAsOne()
+    private suspend fun getSettings(): Get = withContext(ioDispatcher) {
+        settingsQueries.get().executeAsOne()
     }
 }
diff --git a/data/src/main/sqldelight/hr/dtakac/prognoza/data/Place.sq b/data/src/main/sqldelight/hr/dtakac/prognoza/data/Place.sq
@@ -7,8 +7,7 @@ CREATE TABLE IF NOT EXISTS Place (
 );
 
 insert:
-INSERT OR REPLACE INTO Place (latitude, longitude, name, details)
-VALUES (?, ?, ?, ?);
+INSERT OR REPLACE INTO Place VALUES ?;
 
 get:
 SELECT * FROM Place

diff --git a/data/src/main/sqldelight/hr/dtakac/prognoza/data/Settings.sq b/data/src/main/sqldelight/hr/dtakac/prognoza/data/Settings.sq
@@ -14,13 +14,12 @@ CREATE TABLE IF NOT EXISTS Settings (
 );
 
 -- Prepopulated database
-INSERT OR IGNORE INTO Settings (id, temperatureUnit, precipitationUnit, windUnit, pressureUnit, placeLatitude, placeLongitude)
+INSERT OR IGNORE INTO Settings
 VALUES (0, 0, 0, 0, 0, NULL, NULL);
 
-getSettings:
+get:
 SELECT temperatureUnit, precipitationUnit, windUnit, pressureUnit, placeLatitude, placeLongitude
-FROM Settings
-WHERE id = 0;
+FROM Settings WHERE id = 0;
 
 setPlace:
 UPDATE Settings SET placeLatitude = ?, placeLongitude = ? WHERE id = 0;