Refs/heads/feat/profile/powersync

app/build.gradle.kts

@@ -180,6 +180,10 @@ dependencies {
   implementation(libs.kotlinx.serialization.json.v162)
   implementation(libs.storage.kt)
 
+  implementation("com.powersync:core:1.0.0-BETA9")
+  implementation("com.powersync:connector-supabase:1.0.0-BETA9")
+  implementation("com.powersync:compose:1.0.0-BETA11")
+
   implementation(libs.androidx.core.ktx)
   implementation(libs.androidx.appcompat)
   implementation(libs.material)

app/src/main/java/com/android/periodpals/MainActivity.kt

@@ -11,6 +11,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -30,8 +31,10 @@ import com.android.periodpals.model.timer.TimerManager
 import com.android.periodpals.model.timer.TimerRepositorySupabase
 import com.android.periodpals.model.timer.TimerViewModel
 import com.android.periodpals.model.user.UserAuthenticationState
+import com.android.periodpals.model.user.UserModelPowerSync
 import com.android.periodpals.model.user.UserRepositorySupabase
 import com.android.periodpals.model.user.UserViewModel
+import com.android.periodpals.resources.localSchema
 import com.android.periodpals.services.GPSServiceImpl
 import com.android.periodpals.services.PushNotificationsService
 import com.android.periodpals.services.PushNotificationsServiceImpl
@@ -51,6 +54,9 @@ import com.android.periodpals.ui.settings.SettingsScreen
 import com.android.periodpals.ui.theme.PeriodPalsAppTheme
 import com.android.periodpals.ui.timer.TimerScreen
 import com.google.android.gms.common.GoogleApiAvailability
+import com.powersync.PowerSyncDatabase
+import com.powersync.compose.rememberDatabaseDriverFactory
+import com.powersync.connector.supabase.SupabaseConnector
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.logger.ChatLogLevel
 import io.getstream.chat.android.compose.ui.channels.ChannelsScreen
@@ -59,6 +65,7 @@ import io.getstream.chat.android.models.InitializationState
 import io.getstream.chat.android.offline.plugin.factory.StreamOfflinePluginFactory
 import io.getstream.chat.android.state.plugin.config.StatePluginConfig
 import io.getstream.chat.android.state.plugin.factory.StreamStatePluginFactory
+import io.github.jan.supabase.SupabaseClient
 import io.github.jan.supabase.auth.Auth
 import io.github.jan.supabase.createSupabaseClient
 import io.github.jan.supabase.postgrest.Postgrest
@@ -88,7 +95,7 @@ class MainActivity : ComponentActivity() {
   private val authenticationViewModel = AuthenticationViewModel(authModel)
 
   private val userModel = UserRepositorySupabase(supabaseClient)
-  private val userViewModel = UserViewModel(userModel)
+  private val userViewModelSupabase = UserViewModel(userModel)
 
   private val userLocationModel = UserLocationModelSupabase(supabaseClient)
   private val userLocationViewModel = UserLocationViewModel(userLocationModel)
@@ -105,7 +112,7 @@ class MainActivity : ComponentActivity() {
 
     gpsService = GPSServiceImpl(this, authenticationViewModel, userLocationViewModel)
     pushNotificationsService =
-        PushNotificationsServiceImpl(this, authenticationViewModel, userViewModel)
+        PushNotificationsServiceImpl(this, authenticationViewModel, userViewModelSupabase)
     timerManager = TimerManager(this)
     timerViewModel = TimerViewModel(timerModel, timerManager)
 
@@ -134,10 +141,12 @@ class MainActivity : ComponentActivity() {
         // A surface container using the 'background' color from the theme
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
           PeriodPalsApp(
+              this,
+              supabaseClient,
               gpsService,
               pushNotificationsService,
               authenticationViewModel,
-              userViewModel,
+              userViewModelSupabase,
               alertViewModel,
               timerViewModel,
               chatClient,
@@ -185,6 +194,8 @@ fun userAuthStateLogic(
 
 @Composable
 fun PeriodPalsApp(
+    mainActivity: MainActivity,
+    supabase: SupabaseClient,
     gpsService: GPSServiceImpl,
     pushNotificationsService: PushNotificationsService,
     authenticationViewModel: AuthenticationViewModel,
@@ -194,6 +205,13 @@ fun PeriodPalsApp(
     chatClient: ChatClient,
     chatViewModel: ChatViewModel,
 ) {
+  val dbDriverFactory = rememberDatabaseDriverFactory()
+  val db = remember { PowerSyncDatabase(dbDriverFactory, schema = localSchema) }
+  val supabaseConnector = remember { SupabaseConnector(supabase, BuildConfig.POWERSYNC_URL) }
+
+  val userModelPowerSync = remember { UserModelPowerSync(db, supabaseConnector, supabase) }
+  val userViewModelPowerSync = remember { UserViewModel(userModelPowerSync) }
+
   val navController = rememberNavController()
   val navigationActions = NavigationActions(navController)
 
@@ -231,8 +249,7 @@ fun PeriodPalsApp(
             authenticationViewModel,
             locationViewModel,
             gpsService,
-            navigationActions,
-        )
+            navigationActions)
       }
       composable(Screen.EDIT_ALERT) {
         EditAlertScreen(locationViewModel, gpsService, alertViewModel, navigationActions)
@@ -288,16 +305,18 @@ fun PeriodPalsApp(
     navigation(startDestination = Screen.PROFILE, route = Route.PROFILE) {
       composable(Screen.PROFILE) {
         ProfileScreen(
-            userViewModel,
+            userViewModelPowerSync,
             authenticationViewModel,
             pushNotificationsService,
             chatViewModel,
             navigationActions,
         )
       }
-      composable(Screen.EDIT_PROFILE) { EditProfileScreen(userViewModel, navigationActions) }
+      composable(Screen.EDIT_PROFILE) {
+        EditProfileScreen(userViewModelPowerSync, navigationActions)
+      }
       composable(Screen.SETTINGS) {
-        SettingsScreen(userViewModel, authenticationViewModel, navigationActions)
+        SettingsScreen(userViewModelPowerSync, authenticationViewModel, navigationActions)
       }
     }
   }

app/src/main/java/com/android/periodpals/model/user/User.kt

@@ -16,7 +16,7 @@ data class User(
     val description: String,
     val dob: String,
     val preferredDistance: Int,
-    val fcmToken: String? = null,
+    val fcmToken: String? = null
 ) {
   /**
    * Converts the User object to a UserDto object.
@@ -30,7 +30,9 @@ data class User(
         description = this.description,
         dob = this.dob,
         preferred_distance = this.preferredDistance,
-        fcm_token = this.fcmToken,
-    )
+        fcm_token = this.fcmToken)
   }
+
+  inline fun asList(): List<Any?> =
+      listOf(name, imageUrl, description, dob, preferredDistance, fcmToken)
 }

app/src/main/java/com/android/periodpals/model/user/UserDto.kt

@@ -36,4 +36,7 @@ data class UserDto(
         fcmToken = this.fcm_token,
     )
   }
+
+  inline fun asList(): List<Any?> =
+      listOf(name, imageUrl, description, dob, preferred_distance, fcm_token)
 }

app/src/main/java/com/android/periodpals/model/user/UserModelPowerSync.kt

@@ -0,0 +1,223 @@
+package com.android.periodpals.model.user
+
+import android.util.Log
+import com.powersync.PowerSyncDatabase
+import com.powersync.connector.supabase.SupabaseConnector
+import io.github.jan.supabase.SupabaseClient
+import io.github.jan.supabase.auth.auth
+import io.github.jan.supabase.storage.storage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+/**
+ * Implementation of UserRepository using PowerSync with Supabase.
+ *
+ * @property db PowerSync's database used to locally cache everything that calls syncs to online
+ *   servers.
+ * @property supabase The Supabase client used for making API calls.
+ */
+private const val TAG = "UserModelPowerSync"
+private const val USERS = "users"
+
+class UserModelPowerSync(
+  private val db: PowerSyncDatabase,
+  private val connector: SupabaseConnector,
+  private val supabase: SupabaseClient
+) : UserRepository {
+
+  private suspend fun sync() {
+    try {
+      connector.uploadData(db)
+      Log.d(TAG, "sync: Success")
+    } catch (e: Exception) {
+      Log.d(TAG, "sync: Failure ${e.message}")
+    }
+  }
+
+  override suspend fun loadUserProfile(
+    idUser: String,
+    onSuccess: (UserDto) -> Unit,
+    onFailure: (Exception) -> Unit
+  ) {
+    try {
+      db.connect(connector)
+      sync()
+      val user: UserDto =
+        db.get(
+          "SELECT name, imageUrl, description, dob, preferred_distance, fcm_token FROM $USERS WHERE user_id = ?",
+          listOf(idUser)
+        ) {
+          UserDto(
+            name = it.getString(0)!!,
+            imageUrl = it.getString(1)!!,
+            description = it.getString(2)!!,
+            dob = it.getString(3)!!,
+            preferred_distance = it.getLong(4)!!.toInt(),
+            fcm_token = it.getString(5)
+          )
+        }
+
+      Log.d(TAG, "loadUserProfile: Success")
+      onSuccess(user)
+    } catch (e: Exception) {
+      Log.d(TAG, "loadUserProfile: fail to load user profile: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun loadUserProfiles(
+    onSuccess: (List<UserDto>) -> Unit,
+    onFailure: (Exception) -> Unit
+  ) {
+    try {
+      db.connect(connector)
+      sync()
+      val users: List<UserDto> =
+        db.getAll(
+          "SELECT name, imageUrl, description, dob, preferred_distance, fcm_token, locationGIS FROM $USERS",
+          listOf()
+        ) {
+          UserDto(
+            name = it.getString(0)!!,
+            imageUrl = it.getString(1)!!,
+            description = it.getString(2)!!,
+            dob = it.getString(3)!!,
+            preferred_distance = it.getLong(4)!!.toInt(),
+            fcm_token = it.getString(5)
+          )
+        }
+
+      Log.d(TAG, "loadUserProfiles: Success")
+      onSuccess(users)
+    } catch (e: Exception) {
+      Log.d(TAG, "loadUserProfiles: fail to load users profiles: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun createUserProfile(
+    user: User,
+    onSuccess: () -> Unit,
+    onFailure: (Exception) -> Unit
+  ) {
+    try {
+      db.connect(connector)
+      db.writeTransaction { tx ->
+        tx.execute(
+          "INSERT INTO $USERS (name, imageUrl, description, dob, preferred_distance, fcm_token) VALUES (?, ?, ?, ?, ?, ?);",
+          user.asList()
+        )
+      }
+      Log.d(TAG, "createUserProfile: Success")
+      onSuccess()
+      sync()
+    } catch (e: Exception) {
+      Log.d(TAG, "createUserProfile: fail to create user profile: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun upsertUserProfile(
+    userDto: UserDto,
+    onSuccess: (UserDto) -> Unit,
+    onFailure: (Exception) -> Unit
+  ) {
+    try {
+      db.connect(connector)
+      val currUser: String? = supabase.auth.currentUserOrNull()?.id
+      Log.d(TAG, "b4")
+      sync()
+      db.writeTransaction { tx ->
+        tx.execute(
+          """
+                        INSERT INTO $USERS(user_id, name, imageUrl, description, dob, preferred_distance, fcm_token)
+                        VALUES(?, ?, ?, ?, ?, ?, ?)
+                        ON CONFLICT(user_id)
+                        DO 
+                          UPDATE SET name = ?, imageUrl = ?, description = ?, dob = ?, preferred_distance = ?, fcm_token = ? 
+                          WHERE user_id = ?;
+                    """,
+          listOf(
+            currUser,
+            userDto.name,
+            userDto.imageUrl,
+            userDto.description,
+            userDto.dob,
+            userDto.preferred_distance,
+            userDto.fcm_token,
+            userDto.name,
+            userDto.imageUrl,
+            userDto.description,
+            userDto.dob,
+            userDto.preferred_distance,
+            userDto.fcm_token,
+            currUser
+          )
+        )
+      }
+      Log.d(TAG, "upsertUserProfile: Success")
+      sync()
+      onSuccess(userDto)
+    } catch (e: Exception) {
+      Log.d(TAG, "upsertUserProfile: fail to create user profile: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun deleteUserProfile(
+    idUser: String,
+    onSuccess: () -> Unit,
+    onFailure: (Exception) -> Unit
+  ) {
+    try {
+      val currUser =
+        supabase.auth.currentUserOrNull()?.id
+          ?: throw Exception("Supabase does not have a user logged in")
+
+      db.writeTransaction { tx ->
+        tx.execute("DELETE FROM $USERS WHERE user_id = ?", listOf(currUser))
+      }
+      Log.d(TAG, "deleteUserProfile: Success")
+      sync()
+      onSuccess()
+    } catch (e: Exception) {
+      Log.d(TAG, "deleteUserProfile: fail to delete user profile: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun uploadFile(
+    filePath: String,
+    bytes: ByteArray,
+    onSuccess: () -> Unit,
+    onFailure: (Exception) -> Unit,
+  ) {
+    try {
+      withContext(Dispatchers.Main) {
+        supabase.storage.from("avatars").upload("$filePath.jpg", bytes) { upsert = true }
+      }
+      Log.d(TAG, "uploadFile: Success")
+      onSuccess()
+    } catch (e: Exception) {
+      Log.d(TAG, "uploadFile: fail to upload file: ${e.message}")
+      onFailure(e)
+    }
+  }
+
+  override suspend fun downloadFile(
+    filePath: String,
+    onSuccess: (bytes: ByteArray) -> Unit,
+    onFailure: (Exception) -> Unit,
+  ) {
+    try {
+      withContext(Dispatchers.Main) {
+        val file = supabase.storage.from("avatars").downloadAuthenticated("$filePath.jpg")
+        Log.d(TAG, "downloadFile: Success")
+        onSuccess(file)
+      }
+    } catch (e: Exception) {
+      Log.d(TAG, "downloadFile: fail to download file: ${e.message}")
+      onFailure(e)
+    }
+  }
+}