feat/#196 : storage 모듈 삭제

boostcampwm-2024 · Dec 3, 2024 · 22b6cca · 22b6cca
1 parent da34527
commit 22b6cca
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 77 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -44,5 +44,4 @@ dependencies {
 	implementation(projects.data.episode)
 	implementation(projects.data.user)
 	implementation(projects.data.mygroup)
-	implementation(projects.data.storage)
 }
diff --git a/data/storage/build.gradle.kts b/data/storage/build.gradle.kts
diff --git a/data/storage/src/main/java/com/boostcamp/mapisode/storage/StorageRepositoryImpl.kt b/data/storage/src/main/java/com/boostcamp/mapisode/storage/StorageRepositoryImpl.kt
diff --git a/data/storage/src/main/java/com/boostcamp/mapisode/storage/di/StorageModule.kt b/data/storage/src/main/java/com/boostcamp/mapisode/storage/di/StorageModule.kt
diff --git a/data/user/build.gradle.kts b/data/user/build.gradle.kts
@@ -11,4 +11,5 @@ dependencies {
 	implementation(projects.core.firebase)
 	implementation(platform(libs.firebase.bom))
 	implementation(libs.firebase.firestore)
+	implementation(libs.firebase.storage)
 }
diff --git a/data/user/src/main/java/com/boostcamp/mapisode/user/UserRepositoryImpl.kt b/data/user/src/main/java/com/boostcamp/mapisode/user/UserRepositoryImpl.kt
@@ -1,14 +1,20 @@
 package com.boostcamp.mapisode.user
 
+import androidx.core.net.toUri
 import com.boostcamp.mapisode.firebase.firestore.FirestoreConstants
+import com.boostcamp.mapisode.firebase.firestore.StorageConstants.PATH_IMAGES
 import com.boostcamp.mapisode.model.UserModel
 import com.boostcamp.mapisode.user.model.toUserFirestoreModel
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.storage.FirebaseStorage
 import kotlinx.coroutines.tasks.await
 import java.util.Date
 import javax.inject.Inject
 
-class UserRepositoryImpl @Inject constructor(database: FirebaseFirestore) : UserRepository {
+class UserRepositoryImpl @Inject constructor(
+	private val database: FirebaseFirestore,
+	private val storage: FirebaseStorage,
+) : UserRepository {
 	private val userCollection = database.collection(FirestoreConstants.COLLECTION_USER)
 
 	override suspend fun createUser(userModel: UserModel) {
@@ -74,4 +80,18 @@ class UserRepositoryImpl @Inject constructor(database: FirebaseFirestore) : User
 			throw Exception("Failed to update user", e)
 		}
 	}
+
+	override suspend fun uploadSingleImageToStorage(
+		imageUri: String,
+		uid: String,
+	): String {
+		val imageRef = storage.reference.child("$PATH_IMAGES/$uid/0")
+		return try {
+			val uploadTask = imageRef.putFile(imageUri.toUri()).await()
+			val downloadUrl = uploadTask.task.result.storage.downloadUrl.await()
+			downloadUrl.toString()
+		} catch (e: Exception) {
+			throw e
+		}
+	}
 }
diff --git a/domain/storage/build.gradle.kts b/domain/storage/build.gradle.kts
diff --git a/domain/storage/src/main/java/com/boostcamp/mapisode/storage/StorageRepository.kt b/domain/storage/src/main/java/com/boostcamp/mapisode/storage/StorageRepository.kt
diff --git a/domain/user/src/main/java/com/boostcamp/mapisode/user/UserRepository.kt b/domain/user/src/main/java/com/boostcamp/mapisode/user/UserRepository.kt
@@ -9,4 +9,5 @@ interface UserRepository {
 	suspend fun isUserExist(uid: String): Boolean
 
 	suspend fun updateUserNameAndProfileUrl(uid: String, userName: String, profileUrl: String)
+	suspend fun uploadSingleImageToStorage(imageUri: String, uid: String): String
 }
diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
@@ -10,6 +10,5 @@ dependencies {
 	implementation(projects.core.auth)
 	implementation(projects.domain.user)
 	implementation(projects.domain.mygroup)
-	implementation(projects.domain.storage)
 	implementation(libs.bundles.coil)
 }
diff --git a/feature/mypage/build.gradle.kts b/feature/mypage/build.gradle.kts
@@ -26,6 +26,5 @@ dependencies {
 	implementation(libs.androidx.browser)
 	implementation(projects.core.auth)
 	implementation(projects.domain.user)
-	implementation(projects.domain.storage)
 	implementation(projects.domain.mygroup)
 }
diff --git a/feature/mypage/src/main/java/com/boostcamp/mapisode/mypage/viewmodel/ProfileEditViewModel.kt b/feature/mypage/src/main/java/com/boostcamp/mapisode/mypage/viewmodel/ProfileEditViewModel.kt
@@ -7,7 +7,6 @@ import com.boostcamp.mapisode.mypage.R
 import com.boostcamp.mapisode.mypage.intent.ProfileEditIntent
 import com.boostcamp.mapisode.mypage.sideeffect.ProfileEditSideEffect
 import com.boostcamp.mapisode.mypage.state.ProfileEditState
-import com.boostcamp.mapisode.storage.StorageRepository
 import com.boostcamp.mapisode.ui.base.BaseViewModel
 import com.boostcamp.mapisode.user.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -17,7 +16,6 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ProfileEditViewModel @Inject constructor(
-	private val storageRepository: StorageRepository,
 	private val groupRepository: GroupRepository,
 	private val userRepository: UserRepository,
 	private val userPreferenceDataStore: UserPreferenceDataStore,
@@ -109,7 +107,7 @@ class ProfileEditViewModel @Inject constructor(
 
 	private suspend fun getStorageUrl(): String {
 		try {
-			return storageRepository.uploadSingleImageToStorage(
+			return userRepository.uploadSingleImageToStorage(
 				imageUri = currentState.profileUrl,
 				uid = currentState.uid,
 			)