update

lexwilliam · Jul 15, 2024 · 2693ae0 · 2693ae0
1 parent 6185ffb
commit 2693ae0
Show file tree

Hide file tree

Showing 83 changed files with 2,014 additions and 1,338 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
 
     defaultConfig {
         applicationId = "com.lexwilliam.invence"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"

diff --git a/app/src/main/java/com/lexwilliam/invence/ui/RootNavGraph.kt b/app/src/main/java/com/lexwilliam/invence/ui/RootNavGraph.kt
@@ -8,8 +8,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.example.barcode.navigation.barcodeNavigation
-import com.example.barcode.navigation.navigateToBarcode
 import com.lexwilliam.auth.navigation.loginNavigation
 import com.lexwilliam.auth.util.GoogleAuthUiClient
 import com.lexwilliam.company.navigation.companyFormNavigation
@@ -65,13 +63,10 @@ fun RootNavGraph(
             toProductForm = { productUUID ->
                 navController.navigateToProductForm(productUUID)
             },
-            toProductDetail = { productUUID -> navController.navigateToProductDetail(productUUID) },
-            toBarcode = { navController.navigateToBarcode() }
+            toProductDetail = { productUUID -> navController.navigateToProductDetail(productUUID) }
         )
         productFormNavigation(
-            onBackStack = navController::navigateUp,
-            toBarcode = { onlyID -> navController.navigateToBarcode(onlyID) },
-            toInventory = navController::navigateToInventory
+            onBackStack = navController::navigateUp
         )
         productDetailNavigation(
             onBackStack = navController::navigateUp,
@@ -86,26 +81,6 @@ fun RootNavGraph(
         companyFormNavigation(
             toHome = navController::navigateToHome
         )
-        barcodeNavigation(
-            onBackStack = navController::navigateUp,
-            toProductDetail = { productUUID ->
-                navController.navigateToProductDetail(
-                    productUUID,
-                    NavOptions.Builder()
-                        .setPopUpTo(Screen.BARCODE, true)
-                        .build()
-                )
-            },
-            toProductForm = { productUUID, onlyID ->
-                navController.navigateToProductForm(
-                    productUUID,
-                    onlyID,
-                    NavOptions.Builder()
-                        .setPopUpTo(Screen.BARCODE, true)
-                        .build()
-                )
-            }
-        )
         cartNavigation(
             toOrder = { orderUUID -> navController.navigateToOrder(orderUUID) }
         )

diff --git a/data/branch/build.gradle.kts b/data/branch/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/branch/src/main/java/com/lexwilliam/branch/di/RepositoryModule.kt b/data/branch/src/main/java/com/lexwilliam/branch/di/RepositoryModule.kt
@@ -1,22 +1,22 @@
-package com.lexwilliam.branch.di
-
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.firestore.FirebaseFirestore
-import com.lexwilliam.branch.repository.BranchRepository
-import com.lexwilliam.branch.repository.firebaseBranchRepository
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object RepositoryModule {
-    @Singleton
-    @Provides
-    fun providesBranchRepository(
-        analytics: FirebaseCrashlytics,
-        store: FirebaseFirestore
-    ): BranchRepository = firebaseBranchRepository(analytics, store)
+package com.lexwilliam.branch.di
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.firestore.FirebaseFirestore
+import com.lexwilliam.branch.repository.BranchRepository
+import com.lexwilliam.branch.repository.firebaseBranchRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+    @Singleton
+    @Provides
+    fun providesBranchRepository(
+        analytics: FirebaseCrashlytics,
+        store: FirebaseFirestore
+    ): BranchRepository = firebaseBranchRepository(analytics, store)
 }
diff --git a/data/company/build.gradle.kts b/data/company/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/log/build.gradle.kts b/data/log/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/log/src/main/java/com/lexwilliam/log/model/dto/LogDto.kt b/data/log/src/main/java/com/lexwilliam/log/model/dto/LogDto.kt
@@ -1,7 +1,5 @@
 package com.lexwilliam.log.model.dto
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import com.google.firebase.firestore.PropertyName
 import com.lexwilliam.core.util.validateUUID
 import com.lexwilliam.firebase.toDate
@@ -10,7 +8,6 @@ import com.lexwilliam.log.model.DataLog
 import kotlinx.datetime.Instant
 import java.util.Date
 
-@RequiresApi(Build.VERSION_CODES.O)
 data class LogDto(
     val uuid: String? = null,
     @JvmField @PropertyName("branch_uuid")

diff --git a/data/log/src/main/java/com/lexwilliam/log/repository/FirebaseLogRepository.kt b/data/log/src/main/java/com/lexwilliam/log/repository/FirebaseLogRepository.kt
@@ -1,7 +1,5 @@
 package com.lexwilliam.log.repository
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import arrow.core.Either
 import arrow.core.raise.catch
 import arrow.core.raise.either
@@ -18,7 +16,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import java.util.UUID
 
-@RequiresApi(Build.VERSION_CODES.O)
 fun firebaseLogRepository(
     analytics: FirebaseCrashlytics,
     store: FirebaseFirestore

diff --git a/data/order/build.gradle.kts b/data/order/build.gradle.kts
@@ -15,7 +15,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/product/build.gradle.kts b/data/product/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/product/src/main/java/com/lexwilliam/product/di/ProductModule.kt b/data/product/src/main/java/com/lexwilliam/product/di/ProductModule.kt
@@ -22,7 +22,12 @@ object ProductModule {
         analytics: FirebaseCrashlytics,
         store: FirebaseFirestore,
         storage: FirebaseStorage
-    ): ProductRepository = firebaseProductRepository(analytics, store, storage)
+    ): ProductRepository =
+        firebaseProductRepository(
+            analytics,
+            store,
+            storage
+        )
 
     @Singleton
     @Provides

diff --git a/data/product/src/main/java/com/lexwilliam/product/model/dto/ProductDto.kt b/data/product/src/main/java/com/lexwilliam/product/model/dto/ProductDto.kt
@@ -1,7 +1,5 @@
 package com.lexwilliam.product.model.dto
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.PropertyName
@@ -10,7 +8,6 @@ import com.lexwilliam.firebase.toTimestamp
 import com.lexwilliam.product.model.Product
 import kotlinx.datetime.Instant
 
-@RequiresApi(Build.VERSION_CODES.O)
 data class ProductDto(
     val uuid: String? = null,
     val name: String? = null,

diff --git a/data/transaction/build.gradle.kts b/data/transaction/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/user/build.gradle.kts b/data/user/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/data/user/src/main/java/com/lexwilliam/user/di/UserModule.kt b/data/user/src/main/java/com/lexwilliam/user/di/UserModule.kt
@@ -20,9 +20,8 @@ object UserModule {
     @Provides
     fun providesSessionManager(
         auth: FirebaseAuth,
-        crashlytics: FirebaseCrashlytics,
-        userRepository: UserRepository
-    ): SessionManager = firebaseSessionManager(auth, crashlytics, userRepository)
+        crashlytics: FirebaseCrashlytics
+    ): SessionManager = firebaseSessionManager(auth, crashlytics)
 
     @Singleton
     @Provides

diff --git a/data/user/src/main/java/com/lexwilliam/user/model/EmployeeShiftDto.kt b/data/user/src/main/java/com/lexwilliam/user/model/EmployeeShiftDto.kt
@@ -0,0 +1,31 @@
+package com.lexwilliam.user.model
+
+import com.google.firebase.firestore.PropertyName
+import com.lexwilliam.core.util.validateUUID
+
+data class EmployeeShiftDto(
+    @JvmField @PropertyName("user_uuid")
+    val userUUID: String? = null,
+    @JvmField @PropertyName("branch_uuid")
+    val branchUUID: String? = null,
+    val username: String? = null,
+    val shift: List<String>? = null
+) {
+    fun toDomain() =
+        EmployeeShift(
+            userUUID = userUUID ?: "",
+            branchUUID = branchUUID.validateUUID(),
+            username = username ?: "",
+            shift = shift ?: emptyList()
+        )
+
+    companion object {
+        fun fromDomain(domain: EmployeeShift) =
+            EmployeeShiftDto(
+                userUUID = domain.userUUID,
+                branchUUID = domain.branchUUID.toString(),
+                username = domain.username,
+                shift = domain.shift
+            )
+    }
+}
diff --git a/data/user/src/main/java/com/lexwilliam/user/repository/FirebaseUserRepository.kt b/data/user/src/main/java/com/lexwilliam/user/repository/FirebaseUserRepository.kt
@@ -6,10 +6,13 @@ import arrow.core.right
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.firestore.FirebaseFirestore
 import com.lexwilliam.firebase.FirestoreConfig
+import com.lexwilliam.user.model.EmployeeShift
+import com.lexwilliam.user.model.EmployeeShiftDto
 import com.lexwilliam.user.model.User
 import com.lexwilliam.user.model.UserDto
 import com.lexwilliam.user.util.FetchUserFailure
 import com.lexwilliam.user.util.UnknownFailure
+import com.lexwilliam.user.util.UpsertShiftFailure
 import com.lexwilliam.user.util.UpsertUserFailure
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -83,4 +86,44 @@ fun firebaseUserRepository(
             UnknownFailure(t.message)
         }
     }
+
+    override fun observeShift(uuid: String): Flow<EmployeeShift?> =
+        callbackFlow {
+            val reference =
+                store
+                    .collection(FirestoreConfig.COLLECTION_EMPLOYEE_SHIFT)
+                    .document(uuid)
+
+            val registration =
+                reference.addSnapshotListener { value, error ->
+                    error?.let { exception ->
+                        analytics.recordException(exception)
+                        trySend(null)
+                    }
+
+                    trySend(
+                        value
+                            ?.toObject(EmployeeShiftDto::class.java)
+                            ?.toDomain()
+                    )
+                }
+
+            awaitClose { registration.remove() }
+        }
+
+    override suspend fun upsertShift(
+        shift: EmployeeShift
+    ): Either<UpsertShiftFailure, EmployeeShift> {
+        return Either.catch {
+            store
+                .collection(FirestoreConfig.COLLECTION_EMPLOYEE_SHIFT)
+                .document(shift.userUUID.toString())
+                .set(EmployeeShiftDto.fromDomain(shift))
+            shift
+        }.mapLeft { t ->
+            t.printStackTrace()
+            analytics.recordException(t)
+            UnknownFailure(t.message)
+        }
+    }
 }
diff --git a/data/user/src/main/java/com/lexwilliam/user/session/FirebaseSessionManager.kt b/data/user/src/main/java/com/lexwilliam/user/session/FirebaseSessionManager.kt
@@ -4,7 +4,6 @@ import arrow.core.Either
 import arrow.core.right
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.lexwilliam.user.repository.UserRepository
 import com.lexwilliam.user.source.SessionManager
 import com.lexwilliam.user.util.LoginFailure
 import com.lexwilliam.user.util.LogoutFailure
@@ -14,8 +13,7 @@ import kotlinx.coroutines.flow.callbackFlow
 
 fun firebaseSessionManager(
     auth: FirebaseAuth,
-    crashlytics: FirebaseCrashlytics,
-    userRepository: UserRepository
+    crashlytics: FirebaseCrashlytics
 ) = object : SessionManager {
     override val sessionDataFlow: Flow<Session> =
         callbackFlow {
@@ -26,12 +24,9 @@ fun firebaseSessionManager(
                         ?.getIdToken(false)
                         ?.addOnSuccessListener {
                             val userUUID = firebaseAuth.currentUser?.uid
-//                            val userData =
-//                                runBlocking { userUUID?.let { userRepository.fetchUser(it) } }
                             val session =
                                 Session(
                                     userUUID = userUUID
-//                                    branchUUID = userData?.getOrNull()?.branchUUID?.toString()
                                 )
                             trySend(session)
                         }

diff --git a/domain/branch/build.gradle.kts b/domain/branch/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/domain/company/build.gradle.kts b/domain/company/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/domain/log/build.gradle.kts b/domain/log/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")