fix: upsert photo maps returning -1

Signed-off-by: Kyle Corry <kylecorry31@gmail.com>

Author: kylecorry31

app/src/main/java/com/kylecorry/trail_sense/shared/Extensions.kt

@@ -195,4 +195,10 @@ fun <T> List<T>.padRight(minLength: Int, value: T): List<T> {
     }
 }
 
-
+fun Long.getUpsertedId(originalId: Long): Long {
+    return if (this == -1L) {
+        originalId
+    } else {
+        this
+    }
+}

app/src/main/java/com/kylecorry/trail_sense/shared/map_layers/tiles/infrastructure/persistance/CachedTileRepo.kt

@@ -6,6 +6,7 @@ import com.kylecorry.andromeda.files.CacheFileSystem
 import com.kylecorry.luna.coroutines.onIO
 import com.kylecorry.trail_sense.main.persistence.AppDatabase
 import com.kylecorry.trail_sense.main.persistence.ICleanable
+import com.kylecorry.trail_sense.shared.getUpsertedId
 import com.kylecorry.trail_sense.shared.map_layers.tiles.Tile
 import java.time.Duration
 import java.time.Instant
@@ -20,7 +21,7 @@ class CachedTileRepo private constructor(context: Context) : ICleanable {
     }
 
     suspend fun add(cachedTile: CachedTile): Long = onIO {
-        dao.upsert(CachedTileEntity.from(cachedTile))
+        dao.upsert(CachedTileEntity.from(cachedTile)).getUpsertedId(cachedTile.id)
     }
 
     suspend fun delete(cachedTile: CachedTile) = onIO {

app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/FieldGuideRepo.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import com.kylecorry.luna.coroutines.onIO
 import com.kylecorry.trail_sense.main.persistence.AppDatabase
+import com.kylecorry.trail_sense.shared.getUpsertedId
 import com.kylecorry.trail_sense.shared.io.FileSubsystem
 import com.kylecorry.trail_sense.tools.field_guide.domain.FieldGuidePage
 import com.kylecorry.trail_sense.tools.field_guide.domain.Sighting
@@ -52,11 +53,11 @@ class FieldGuideRepo private constructor(private val context: Context) {
         }
 
         val entity = FieldGuidePageEntity.fromFieldGuidePage(page)
-        pageDao.upsert(entity)
+        pageDao.upsert(entity).getUpsertedId(page.id)
     }
 
     suspend fun addSighting(sighting: Sighting): Long = onIO {
-        sightingDao.upsert(FieldGuideSightingEntity.fromSighting(sighting))
+        sightingDao.upsert(FieldGuideSightingEntity.fromSighting(sighting)).getUpsertedId(sighting.id)
     }
 
     suspend fun getSighting(id: Long): Sighting? = onIO {

app/src/main/java/com/kylecorry/trail_sense/tools/offline_maps/infrastructure/persistence/MapRepo.kt

@@ -9,6 +9,7 @@ import com.kylecorry.andromeda.core.tryOrNothing
 import com.kylecorry.luna.coroutines.ParallelCoroutineRunner
 import com.kylecorry.trail_sense.main.getAppService
 import com.kylecorry.trail_sense.main.persistence.AppDatabase
+import com.kylecorry.trail_sense.shared.getUpsertedId
 import com.kylecorry.trail_sense.shared.io.FileSubsystem
 import com.kylecorry.trail_sense.shared.map_layers.tiles.infrastructure.persistance.PersistentTileCache
 import com.kylecorry.trail_sense.tools.offline_maps.domain.groups.MapGroup
@@ -74,13 +75,13 @@ class MapRepo private constructor(context: Context) {
     }
 
     suspend fun add(map: PhotoMap): Long = onIO {
-        val newId = photoMapDao.upsert(PhotoMapEntity.from(map))
+        val newId = photoMapDao.upsert(PhotoMapEntity.from(map)).getUpsertedId(map.id)
         invalidatePhotoMapCache(newId)
         newId
     }
 
     suspend fun add(file: VectorMap): Long = onIO {
-        offlineMapFileDao.upsert(VectorMapEntity.from(file))
+        offlineMapFileDao.upsert(VectorMapEntity.from(file)).getUpsertedId(file.id)
     }
 
     suspend fun getPhotoMaps(parentId: Long?): List<PhotoMap> = onIO {