Feature/profile image (#47)

leesa-l · web-flow · commit b8e3e68841e7 · 2024-10-03T08:21:14.000Z
* 프로필 이미지 업로드 UI, UseCase구현

* image upload api 구현(미완)

* file provider 추가

* image upload api 수정

* 이미지 저장되지 않는 현상 수정
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,16 @@
                 android:value="androidx.startup" />
         </provider>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.dkin.chevit.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--Context.getFilesDir()-->
+    <files-path name="files" path="." />
+
+    <!--getCacheDir()-->
+    <cache-path name="cache" path="." />
+
+    <!--Environment.getExternalStorageDirectory()-->
+    <external-path name="external" path="." />
+
+    <!--Context.getExternalFilesDir(null)-->
+    <external-files-path name="external_files" path="."/>
+
+    <!--Context.getExternalCacheDir()-->
+    <external-cache-path name="external_cache" path="."/>
+
+    <!--only available on API 21+ devices.-->
+    <!--Context.getExternalMediaDirs()-->
+    <external-media-path name="external_media" path="."/>
+</paths>
diff --git a/data/src/debug/java/com/dkin/chevit/data/di/NetworkModule.kt b/data/src/debug/java/com/dkin/chevit/data/di/NetworkModule.kt
@@ -23,6 +23,7 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Converter
 import retrofit2.Retrofit
+import javax.inject.Named
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -86,6 +87,20 @@ internal object NetworkModule {
         .addInterceptor(tokenInterceptor)
         .build()
 
+    @Provides
+    @Singleton
+    @Named("Pure")
+    fun providePureOkHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
+        chuckerInterceptor: ChuckerInterceptor,
+    ) = OkHttpClient.Builder()
+        .connectTimeout(20, TimeUnit.SECONDS)
+        .readTimeout(20, TimeUnit.SECONDS)
+        .writeTimeout(20, TimeUnit.SECONDS)
+        .addInterceptor(httpLoggingInterceptor)
+        .addInterceptor(chuckerInterceptor)
+        .build()
+
     @Provides
     @Singleton
     fun provideRetrofit(
@@ -96,4 +111,16 @@ internal object NetworkModule {
         .addConverterFactory(jsonConverter)
         .baseUrl(BuildConfig.API_URL)
         .build()
+
+    @Provides
+    @Singleton
+    @Named("Pure")
+    fun providePureRetrofit(
+        @Named("Pure") okHttpClient: OkHttpClient,
+        @JsonConverter jsonConverter: Converter.Factory,
+    ): Retrofit = Retrofit.Builder()
+        .client(okHttpClient)
+        .addConverterFactory(jsonConverter)
+        .baseUrl(BuildConfig.API_URL)
+        .build()
 }
diff --git a/data/src/main/java/com/dkin/chevit/data/di/RetrofitModule.kt b/data/src/main/java/com/dkin/chevit/data/di/RetrofitModule.kt
@@ -1,6 +1,7 @@
 package com.dkin.chevit.data.di
 
 import com.dkin.chevit.data.remote.AuthAPI
+import com.dkin.chevit.data.remote.ImageAPI
 import com.dkin.chevit.data.remote.NotificationAPI
 import com.dkin.chevit.data.remote.PlanAPI
 import com.dkin.chevit.data.remote.ServiceAPI
@@ -10,6 +11,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 import retrofit2.Retrofit
+import javax.inject.Named
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -37,4 +39,10 @@ internal object RetrofitModule {
     fun providePlanAPI(
         retrofit: Retrofit
     ): PlanAPI = retrofit.create(PlanAPI::class.java)
+
+    @Provides
+    @Singleton
+    fun provideImageAPI(
+        @Named("Pure") retrofit: Retrofit
+    ): ImageAPI = retrofit.create(ImageAPI::class.java)
 }
diff --git a/data/src/main/java/com/dkin/chevit/data/di/usecase/AuthUseCaseModule.kt b/data/src/main/java/com/dkin/chevit/data/di/usecase/AuthUseCaseModule.kt
@@ -2,11 +2,13 @@ package com.dkin.chevit.data.di.usecase
 
 import com.dkin.chevit.domain.base.CoroutineDispatcherProvider
 import com.dkin.chevit.domain.repository.AuthRepository
+import com.dkin.chevit.domain.usecase.auth.GetProfileImageDataUseCase
 import com.dkin.chevit.domain.usecase.auth.GetUserStateUseCase
 import com.dkin.chevit.domain.usecase.auth.GetUserUseCase
 import com.dkin.chevit.domain.usecase.auth.SignOutUseCase
 import com.dkin.chevit.domain.usecase.auth.SignUpUserUseCase
 import com.dkin.chevit.domain.usecase.auth.UpdateUserUseCase
+import com.dkin.chevit.domain.usecase.auth.UploadProfileImageUseCase
 import com.dkin.chevit.domain.usecase.auth.WithDrawUserUseCase
 import dagger.Module
 import dagger.Provides
@@ -69,4 +71,22 @@ internal object AuthUseCaseModule {
         coroutineDispatcherProvider,
         authRepository
     )
+
+    @Provides
+    fun provideGetProfileImageDataUseCase(
+        coroutineDispatcherProvider: CoroutineDispatcherProvider,
+        authRepository: AuthRepository,
+    ) = GetProfileImageDataUseCase(
+        coroutineDispatcherProvider,
+        authRepository
+    )
+
+    @Provides
+    fun provideUploadProfileImageUseCase(
+        coroutineDispatcherProvider: CoroutineDispatcherProvider,
+        authRepository: AuthRepository,
+    ) = UploadProfileImageUseCase(
+        coroutineDispatcherProvider,
+        authRepository
+    )
 }
diff --git a/data/src/main/java/com/dkin/chevit/data/model/request/ProfileImageUploadPayload.kt b/data/src/main/java/com/dkin/chevit/data/model/request/ProfileImageUploadPayload.kt
@@ -0,0 +1,11 @@
+package com.dkin.chevit.data.model.request
+
+import com.dkin.chevit.data.DataModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ProfileImageUploadPayload(
+    @SerialName("fileSize") val fileSize: Int,
+    @SerialName("mimeType") val mimeType: String,
+) : DataModel
diff --git a/data/src/main/java/com/dkin/chevit/data/model/response/ProfileImageUploadResponse.kt b/data/src/main/java/com/dkin/chevit/data/model/response/ProfileImageUploadResponse.kt
@@ -0,0 +1,12 @@
+package com.dkin.chevit.data.model.response
+
+import com.dkin.chevit.data.DataModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ProfileImageUploadResponse(
+    @SerialName("uploadMethod") val uploadMethod: String = "",
+    @SerialName("uploadURL") val uploadURL: String = "",
+    @SerialName("imageURL") val imageURL: String = "",
+) : DataModel
diff --git a/data/src/main/java/com/dkin/chevit/data/remote/AuthAPI.kt b/data/src/main/java/com/dkin/chevit/data/remote/AuthAPI.kt
@@ -1,15 +1,23 @@
 package com.dkin.chevit.data.remote
 
+import com.dkin.chevit.data.model.request.ProfileImageUploadPayload
 import com.dkin.chevit.data.model.request.SignUpPayload
 import com.dkin.chevit.data.model.request.UpdateUserPayload
 import com.dkin.chevit.data.model.request.ValidationNicknamePayload
+import com.dkin.chevit.data.model.response.ProfileImageUploadResponse
 import com.dkin.chevit.data.model.response.UserResponse
+import com.dkin.chevit.domain.base.None
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.PUT
+import retrofit2.http.Part
+import retrofit2.http.Url
 
 /**
  * 유저 정보 및 인증 관련 API 모음
@@ -29,4 +37,7 @@ internal interface AuthAPI {
 
     @DELETE("deleteUser")
     suspend fun deleteUser(): Response<Unit>
+
+    @POST("getProfileUploadURL")
+    suspend fun getProfileUploadURL(@Body body: ProfileImageUploadPayload): ProfileImageUploadResponse
 }
diff --git a/data/src/main/java/com/dkin/chevit/data/remote/ImageAPI.kt b/data/src/main/java/com/dkin/chevit/data/remote/ImageAPI.kt
@@ -0,0 +1,14 @@
+package com.dkin.chevit.data.remote
+
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.PUT
+import retrofit2.http.Url
+
+internal interface ImageAPI {
+    @PUT
+    suspend fun uploadProfileImage(
+        @Url url: String,
+        @Body file: RequestBody
+    )
+}
diff --git a/data/src/main/java/com/dkin/chevit/data/repository/AuthRepositoryImpl.kt b/data/src/main/java/com/dkin/chevit/data/repository/AuthRepositoryImpl.kt
@@ -1,17 +1,27 @@
 package com.dkin.chevit.data.repository
 
+import com.dkin.chevit.data.model.request.ProfileImageUploadPayload
 import com.dkin.chevit.data.model.request.SignUpPayload
 import com.dkin.chevit.data.model.request.UpdateUserPayload
 import com.dkin.chevit.data.model.response.toUser
 import com.dkin.chevit.data.remote.AuthAPI
+import com.dkin.chevit.data.remote.ImageAPI
+import com.dkin.chevit.domain.base.None
+import com.dkin.chevit.domain.model.ProfileImageData
 import com.dkin.chevit.domain.model.UserState
 import com.dkin.chevit.domain.repository.AuthRepository
 import com.google.firebase.auth.FirebaseAuth
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
 import javax.inject.Inject
 
 internal class AuthRepositoryImpl @Inject constructor(
     private val authAPI: AuthAPI,
-    private val auth: FirebaseAuth
+    private val imageAPI: ImageAPI,
+    private val auth: FirebaseAuth,
 ) : AuthRepository {
     override suspend fun getUserState(): UserState {
         return runCatching {
@@ -43,4 +53,29 @@ internal class AuthRepositoryImpl @Inject constructor(
         auth.signOut()
         return getUserState()
     }
+
+    override suspend fun getProfileUploadURL(fileSize: Int): ProfileImageData {
+        val result = authAPI.getProfileUploadURL(
+            ProfileImageUploadPayload(
+                fileSize = fileSize,
+                mimeType = "image/jpeg"
+            )
+        )
+        return ProfileImageData(
+            uploadMethod = result.uploadMethod,
+            uploadURL = result.uploadURL,
+            uploadHeaders = "{\"Content-Type\": [\"image/jpeg\"]}",
+            imageURL = result.imageURL,
+        )
+    }
+
+    override suspend fun uploadProfileImage(
+        uploadURL: String,
+        uploadMethod: String,
+        uploadHeaders: String,
+        file: File
+    ) {
+        val requestFile: RequestBody = file.asRequestBody("image/jpeg".toMediaTypeOrNull())
+        return imageAPI.uploadProfileImage(uploadURL, requestFile)
+    }
 }
diff --git a/domain/src/main/java/com/dkin/chevit/domain/model/ProfileImageData.kt b/domain/src/main/java/com/dkin/chevit/domain/model/ProfileImageData.kt
@@ -0,0 +1,10 @@
+package com.dkin.chevit.domain.model
+
+import com.dkin.chevit.domain.base.DomainModel
+
+data class ProfileImageData(
+    val uploadMethod: String,
+    val uploadURL: String,
+    val uploadHeaders: String,
+    val imageURL: String
+) : DomainModel
diff --git a/domain/src/main/java/com/dkin/chevit/domain/model/UserState.kt b/domain/src/main/java/com/dkin/chevit/domain/model/UserState.kt
@@ -3,9 +3,9 @@ package com.dkin.chevit.domain.model
 import com.dkin.chevit.domain.base.DomainModel
 
 sealed interface UserState : DomainModel {
-    object Guest : UserState
+    data object Guest : UserState
 
-    object NotRegister : UserState
+    data object NotRegister : UserState
 
     data class User(
         val id: String,
diff --git a/domain/src/main/java/com/dkin/chevit/domain/repository/AuthRepository.kt b/domain/src/main/java/com/dkin/chevit/domain/repository/AuthRepository.kt
@@ -1,6 +1,9 @@
 package com.dkin.chevit.domain.repository
 
+import com.dkin.chevit.domain.base.None
+import com.dkin.chevit.domain.model.ProfileImageData
 import com.dkin.chevit.domain.model.UserState
+import java.io.File
 
 interface AuthRepository {
     suspend fun getUserState(): UserState
@@ -12,4 +15,8 @@ interface AuthRepository {
     suspend fun signOutUser(): UserState
 
     suspend fun withDrawUser(): UserState
+
+    suspend fun getProfileUploadURL(fileSize: Int): ProfileImageData
+
+    suspend fun uploadProfileImage(uploadURL: String, uploadMethod: String, uploadHeaders: String, file: File)
 }
diff --git a/domain/src/main/java/com/dkin/chevit/domain/usecase/auth/GetProfileImageDataUseCase.kt b/domain/src/main/java/com/dkin/chevit/domain/usecase/auth/GetProfileImageDataUseCase.kt
@@ -0,0 +1,18 @@
+package com.dkin.chevit.domain.usecase.auth
+
+import com.dkin.chevit.domain.base.CoroutineDispatcherProvider
+import com.dkin.chevit.domain.base.IOUseCase
+import com.dkin.chevit.domain.model.ProfileImageData
+import com.dkin.chevit.domain.repository.AuthRepository
+
+class GetProfileImageDataUseCase(
+    coroutineDispatcherProvider: CoroutineDispatcherProvider,
+    private val authRepository: AuthRepository,
+) : IOUseCase<GetProfileImageDataUseCase.Param, ProfileImageData>(coroutineDispatcherProvider = coroutineDispatcherProvider) {
+    override suspend fun execute(params: Param): ProfileImageData {
+        return authRepository.getProfileUploadURL(params.fileSize)
+    }
+
+    @JvmInline
+    value class Param(val fileSize: Int)
+}
diff --git a/domain/src/main/java/com/dkin/chevit/domain/usecase/auth/UploadProfileImageUseCase.kt b/domain/src/main/java/com/dkin/chevit/domain/usecase/auth/UploadProfileImageUseCase.kt
@@ -0,0 +1,29 @@
+package com.dkin.chevit.domain.usecase.auth
+
+import com.dkin.chevit.domain.base.CoroutineDispatcherProvider
+import com.dkin.chevit.domain.base.IOUseCase
+import com.dkin.chevit.domain.base.None
+import com.dkin.chevit.domain.repository.AuthRepository
+import java.io.File
+
+class UploadProfileImageUseCase(
+    coroutineDispatcherProvider: CoroutineDispatcherProvider,
+    private val authRepository: AuthRepository,
+) : IOUseCase<UploadProfileImageUseCase.Param, None>(coroutineDispatcherProvider = coroutineDispatcherProvider) {
+    override suspend fun execute(params: Param): None {
+        authRepository.uploadProfileImage(
+            uploadURL = params.uploadURL,
+            uploadMethod = params.uploadMethod,
+            uploadHeaders = params.uploadHeaders,
+            file = params.file
+        )
+        return None
+    }
+
+    data class Param(
+        val uploadURL: String,
+        val uploadMethod: String,
+        val uploadHeaders: String,
+        val file: File
+    )
+}
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/HomeTabContents.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/HomeTabContents.kt
@@ -238,7 +238,7 @@ private fun HomeStable(
                             .crossfade(true)
                             .build(),
                         contentDescription = "",
-                        contentScale = ContentScale.Fit,
+                        contentScale = ContentScale.FillBounds,
                         error = painterResource(id = R.drawable.ic_profile_empty)
                     )
                 }
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/UserContents.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/UserContents.kt
@@ -103,7 +103,7 @@ fun UserContents(
                         .crossfade(true)
                         .build(),
                     contentDescription = "",
-                    contentScale = ContentScale.Fit,
+                    contentScale = ContentScale.FillBounds,
                     error = painterResource(id = drawable.ic_profile_empty)
                 )
             }
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/EditProfileImageContents.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/EditProfileImageContents.kt
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSetting.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSetting.kt
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingContract.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingContract.kt
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingScreen.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingScreen.kt
diff --git a/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingViewModel.kt b/presentation/home/src/main/java/com/dkin/chevit/presentation/home/contents/user/profile/ProfileSettingViewModel.kt
