ref: reformat caching data in Rooms

app/src/main/java/ru/risdeveau/pixeldragon/db/Common.kt

@@ -0,0 +1,38 @@
+/*
+ * Created by sweetbread
+ * Copyright (c) 2025. All rights reserved.
+ */
+
+package ru.risdeveau.pixeldragon.db
+
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverter
+import splitties.init.appCtx
+import java.time.Instant
+
+@Database(entities = [RoomDB::class, SpaceToRoom::class, UserDB::class], version = 1)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun roomDoa(): RoomDao
+    abstract fun userDoa(): UserDao
+}
+
+class Converters {
+    @TypeConverter
+    fun fromInstant(value: Instant?): String? {
+        return value?.toString()
+    }
+
+    @TypeConverter
+    fun toInstant(value: String?): Instant? {
+        return value?.let { Instant.parse(it) }
+    }
+}
+
+val cacheDb = Room.databaseBuilder(
+    appCtx,
+    AppDatabase::class.java, "cache"
+)
+    .fallbackToDestructiveMigration()
+    .build()

app/src/main/java/ru/risdeveau/pixeldragon/db/Room.kt

@@ -6,7 +6,6 @@
 package ru.risdeveau.pixeldragon.db
 
 import androidx.room.Dao
-import androidx.room.Database
 import androidx.room.Delete
 import androidx.room.Embedded
 import androidx.room.Entity
@@ -15,11 +14,16 @@ import androidx.room.Junction
 import androidx.room.PrimaryKey
 import androidx.room.Query
 import androidx.room.Relation
-import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import ru.risdeveau.pixeldragon.repo.Room
+import ru.risdeveau.pixeldragon.repo.User
+import java.time.Instant
 
-@Entity
-data class Room(
-    @PrimaryKey val roomId: String,
+@Entity(tableName = "room")
+@TypeConverters(Converters::class)
+data class RoomDB (
+    @PrimaryKey val id: String,
+    val updatedAt: Instant,
     val name: String?,
     val type: String,
     val creatorId: String?,
@@ -27,36 +31,56 @@ data class Room(
     val avatarUrl: String?,
     val members: Int?,
     val joined: Boolean,
-    val direct: String?,
+    val direct: String?
 )
 
+fun RoomDB.isExpired(cacheDuration: Long = 60 * 60): Boolean {
+    return Instant.now().minusSeconds(cacheDuration) > updatedAt
+}
+
+suspend fun RoomDB.toDomain(): Room = Room(
+    id = id,
+    name = name,
+    type = type,
+    creatorId = creatorId,
+    createTime = createTime,
+    avatarUrl = avatarUrl,
+    members = members,
+    joined = joined,
+    direct = direct?.let { User.getById(it) }
+)
+
+fun Room.toEntity(): RoomDB = RoomDB(
+    id = id,
+    updatedAt = Instant.now(),
+    name = name,
+    type = type,
+    creatorId = creatorId,
+    createTime = createTime,
+    avatarUrl = avatarUrl,
+    members = members,
+    joined = joined,
+    direct = direct?.id
+)
+
+
 @Dao
 interface RoomDao {
-//    @Query("SELECT * FROM room")
-//    fun getAll(): List<User>
-
-//    @Query("SELECT * FROM user WHERE uid IN (:userIds)")
-//    fun loadAllByIds(userIds: IntArray): List<User>
-
-//    @Query("SELECT * FROM user WHERE first_name LIKE :first AND " +
-//            "last_name LIKE :last LIMIT 1")
-//    fun findByName(first: String, last: String): User
-
-    @Query("SELECT * FROM room WHERE roomId LIKE :rid LIMIT 1")
-    fun getById(rid: String): Room?
+    @Query("SELECT * FROM room WHERE id LIKE :id LIMIT 1")
+    fun getById(id: String): RoomDB?
 
 //    @Transaction
 //    @Query("SELECT * FROM room WHERE ")
 //    fun getSpace(rid: String): Space
 
-    @Query("SELECT * FROM room WHERE joined = 1 AND roomId NOT IN (SELECT roomId FROM SpaceToRoom)")
-    fun getAllJoined(): List<Room>
+    @Query("SELECT * FROM room WHERE joined = 1 AND id NOT IN (SELECT id FROM SpaceToRoom)")
+    fun getAllJoined(): List<RoomDB>
 
     @Insert
-    fun insert(vararg rooms: Room)
+    fun insert(vararg rooms: RoomDB)
 
     @Delete
-    fun delete(room: Room)
+    fun delete(room: RoomDB)
 }
 
 @Entity(primaryKeys = ["spaceId", "roomId"])
@@ -66,16 +90,11 @@ data class SpaceToRoom(
 )
 
 data class Space(
-    @Embedded val space: Room,
+    @Embedded val space: RoomDB,
     @Relation(
         parentColumn = "spaceId",
         entityColumn = "roomId",
         associateBy = Junction(SpaceToRoom::class)
     )
-    val children: List<Room>
-)
-
-@Database(entities = [Room::class, SpaceToRoom::class, User::class], version = 1)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun roomDoa(): RoomDao
-}
+    val children: List<RoomDB>
+)

app/src/main/java/ru/risdeveau/pixeldragon/db/User.kt

@@ -1,18 +1,59 @@
 /*
- * Created by sweetbread on 22.02.2025, 15:45
+ * Created by sweetbread
  * Copyright (c) 2025. All rights reserved.
- * Last modified 21.02.2025, 13:38
  */
 
 package ru.risdeveau.pixeldragon.db
 
-import androidx.room.ColumnInfo
+import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Entity
+import androidx.room.Insert
 import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.TypeConverters
+import org.json.JSONObject
+import ru.risdeveau.pixeldragon.repo.User
+import java.time.Instant
 
-@Entity
-data class User(
-    @PrimaryKey val uid: String,
-    @ColumnInfo(name = "name") val name: String?,
-    @ColumnInfo(name = "avatar") val avatar: String?
-)
+@Entity(tableName = "user")
+@TypeConverters(Converters::class)
+data class UserDB (
+    @PrimaryKey val id: String,
+    val updatedAt: Instant,
+    val name: String?,
+    val avatar: String?,
+    val attrs: String,
+)
+
+fun UserDB.isExpired(cacheDuration: Long = 60 * 60): Boolean {
+    return Instant.now().minusSeconds(cacheDuration) > updatedAt
+}
+
+fun UserDB.toDomain(): User = User(
+    id = id,
+    name = name,
+    avatarUrl = avatar,
+    attrs = JSONObject(attrs),
+)
+
+fun User.toEntity(): UserDB = UserDB(
+    id = id,
+    updatedAt = Instant.now(),
+    name = name,
+    avatar = avatarUrl,
+    attrs = attrs.toString().trim(),
+)
+
+
+@Dao
+interface UserDao {
+    @Query("SELECT * FROM user WHERE id LIKE :id LIMIT 1")
+    fun getById(id: String): UserDB?
+
+    @Insert
+    fun insert(vararg users: UserDB)
+
+    @Delete
+    fun delete(user: UserDB)
+}