[FEAT] 마이 프로필 및 회원 탈퇴

.github/workflows/android-pull-request-ci.yml

@@ -3,7 +3,7 @@ name: Android Pull Request CI
 on:
   pull_request:
     branches: [ "main", "develop", "dev" ]
-    
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -49,6 +49,16 @@ jobs:
         run: |
           echo "KAKAO_NATIVE_APP_KEY=\"$KAKAO_NATIVE_APP_KEY\"" >> local.properties
 
+      - name: Access Near PRIVACY URLS
+        env:
+          SERVICE_AGREED_TERMS_URL: ${{ secrets.SERVICE_AGREED_TERMS_URL }}
+          PERSONAL_INFO_TERMS_URL: ${{ secrets.PERSONAL_INFO_TERMS_URL }}
+          PRIVACY_POLICY_TERMS_URL: ${{ secrets.PRIVACY_POLICY_TERMS_URL }}
+        run: |
+          echo "SERVICE_AGREED_TERMS_URL=\"$SERVICE_AGREED_TERMS_URL\"" >> local.properties
+          echo "PERSONAL_INFO_TERMS_URL=\"$PERSONAL_INFO_TERMS_URL\"" >> local.properties
+          echo "PRIVACY_POLICY_TERMS_URL=\"$PRIVACY_POLICY_TERMS_URL\"" >> local.properties
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

Near/app/build.gradle.kts

@@ -34,12 +34,18 @@ android {
             buildConfigField("String", "NEAR_URL", getProperty("NEAR_PROD_URL"))
             buildConfigField("String", "TEMP_TOKEN", getProperty("TEMP_TOKEN")) // TODO 추후 삭제 필요
             buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getProperty("KAKAO_NATIVE_APP_KEY"))
+            buildConfigField("String", "SERVICE_AGREED_TERMS_URL", getProperty("SERVICE_AGREED_TERMS_URL"))
+            buildConfigField("String", "PERSONAL_INFO_TERMS_URL", getProperty("PERSONAL_INFO_TERMS_URL"))
+            buildConfigField("String", "PRIVACY_POLICY_TERMS_URL", getProperty("PRIVACY_POLICY_TERMS_URL"))
             manifestPlaceholders["kakaoAppKey"] = getProperty("KAKAO_NATIVE_APP_KEY").replace("\"", "")
         }
         debug {
             buildConfigField("String", "NEAR_URL", getProperty("NEAR_DEV_URL"))
             buildConfigField("String", "TEMP_TOKEN", getProperty("TEMP_TOKEN")) // TODO 추후 삭제 필요
             buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getProperty("KAKAO_NATIVE_APP_KEY"))
+            buildConfigField("String", "SERVICE_AGREED_TERMS_URL", getProperty("SERVICE_AGREED_TERMS_URL"))
+            buildConfigField("String", "PERSONAL_INFO_TERMS_URL", getProperty("PERSONAL_INFO_TERMS_URL"))
+            buildConfigField("String", "PRIVACY_POLICY_TERMS_URL", getProperty("PRIVACY_POLICY_TERMS_URL"))
             manifestPlaceholders["kakaoAppKey"] = getProperty("KAKAO_NATIVE_APP_KEY").replace("\"", "")
         }
     }
@@ -81,9 +87,8 @@ dependencies {
     implementation(libs.retrofit)
     implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.logging.interceptor)
-    // Glide
-    implementation(libs.glide)
-    kapt(libs.glide.compiler)
+    // Coil
+    implementation(libs.coil.compose)
     // Room
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)

Near/app/src/main/java/com/alarmy/near/data/di/DataStoreModule.kt

@@ -9,17 +9,35 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthDataStore
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class OnboardingDataStore
+
 // DataStore 확장 프로퍼티
-private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "auth_preferences")
+private val Context.authDataStore: DataStore<Preferences> by preferencesDataStore(name = "auth_preferences")
+private val Context.onboardingDataStore: DataStore<Preferences> by preferencesDataStore(name = "onboarding_preferences")
 
 @Module
 @InstallIn(SingletonComponent::class)
 object DataStoreModule {
     @Provides
     @Singleton
-    fun provideDataStore(
+    @AuthDataStore
+    fun provideAuthDataStore(
+        @ApplicationContext context: Context,
+    ): DataStore<Preferences> = context.authDataStore
+
+    @Provides
+    @Singleton
+    @OnboardingDataStore
+    fun provideOnboardingDataStore(
         @ApplicationContext context: Context,
-    ): DataStore<Preferences> = context.dataStore
+    ): DataStore<Preferences> = context.onboardingDataStore
 }

Near/app/src/main/java/com/alarmy/near/data/di/RepositoryModule.kt

@@ -6,6 +6,10 @@ import com.alarmy.near.data.repository.DefaultFriendRepository
 import com.alarmy.near.data.repository.ExampleRepository
 import com.alarmy.near.data.repository.ExampleRepositoryImpl
 import com.alarmy.near.data.repository.FriendRepository
+import com.alarmy.near.data.repository.OnBoardingRepository
+import com.alarmy.near.data.repository.OnBoardingRepositoryImpl
+import com.alarmy.near.data.repository.MemberRepository
+import com.alarmy.near.data.repository.MemberRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -26,4 +30,12 @@ interface RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindOnBoardingRepository(onBoardingRepositoryImpl: OnBoardingRepositoryImpl): OnBoardingRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindMemberRepository(memberRepositoryImpl: MemberRepositoryImpl): MemberRepository
 }

Near/app/src/main/java/com/alarmy/near/data/entity/MemberInfoEntity.kt

@@ -0,0 +1,17 @@
+package com.alarmy.near.data.entity
+
+import kotlinx.serialization.Serializable
+
+/**
+ * 회원 정보 Data Layer 엔티티
+ * API 응답 데이터를 나타내는 모델
+ */
+@Serializable
+data class MemberInfoEntity(
+    val memberId: String,
+    val username: String,
+    val nickname: String,
+    val imageUrl: String?,
+    val notificationAgreedAt: String?,
+    val providerType: String,
+)

Near/app/src/main/java/com/alarmy/near/data/entity/WithdrawRequestEntity.kt

@@ -0,0 +1,13 @@
+package com.alarmy.near.data.entity
+
+import kotlinx.serialization.Serializable
+
+/**
+ * 회원 탈퇴 요청 Data Layer 엔티티
+ * Network Layer의 WithdrawRequest와 동일한 구조
+ */
+@Serializable
+data class WithdrawRequestEntity(
+    val reasonType: String,
+    val customReason: String? = null,
+)

Near/app/src/main/java/com/alarmy/near/data/local/datastore/OnboardingPreferences.kt

@@ -0,0 +1,48 @@
+package com.alarmy.near.data.local.datastore
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import com.alarmy.near.data.di.OnboardingDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 온보딩 완료 상태를 관리하는 DataStore
+ * 최초 접속 여부를 확인하여 온보딩 화면 표시 여부를 결정
+ */
+@Singleton
+class OnboardingPreferences @Inject constructor(
+    @OnboardingDataStore private val dataStore: DataStore<Preferences>,
+) {
+    companion object {
+        private val ONBOARDING_COMPLETED_KEY = booleanPreferencesKey("onboarding_completed")
+    }
+
+    /**
+     * 온보딩 완료 여부를 확인하는 Flow
+     * true: 온보딩 완료됨, false: 온보딩 미완료
+     */
+    val isOnboardingCompleted: Flow<Boolean> = dataStore.data.map { preferences ->
+        preferences[ONBOARDING_COMPLETED_KEY] ?: false
+    }
+
+    /**
+     * 온보딩 완료 상태를 저장
+     */
+    suspend fun setOnboardingCompleted(completed: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[ONBOARDING_COMPLETED_KEY] = completed
+        }
+    }
+
+    /**
+     * 온보딩 완료 상태를 true로 설정
+     */
+    suspend fun markOnboardingAsCompleted() {
+        setOnboardingCompleted(true)
+    }
+}

Near/app/src/main/java/com/alarmy/near/data/local/datastore/TokenPreferences.kt

@@ -5,9 +5,9 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
+import com.alarmy.near.data.di.AuthDataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,11 +16,9 @@ import javax.inject.Singleton
  * 액세스 토큰과 리프레시 토큰의 저장, 조회, 삭제를 담당
  */
 @Singleton
-class TokenPreferences
-    @Inject
-    constructor(
-        private val dataStore: DataStore<Preferences>,
-    ) {
+class TokenPreferences @Inject constructor(
+    @AuthDataStore private val dataStore: DataStore<Preferences>,
+) {
         private val accessTokenKey = stringPreferencesKey("access_token")
         private val refreshTokenKey = stringPreferencesKey("refresh_token")
         private val expiresAtKey = longPreferencesKey("expires_at")

Near/app/src/main/java/com/alarmy/near/data/mapper/MemberMapper.kt

@@ -0,0 +1,70 @@
+package com.alarmy.near.data.mapper
+
+import com.alarmy.near.data.entity.MemberInfoEntity
+import com.alarmy.near.data.entity.WithdrawRequestEntity
+import com.alarmy.near.model.member.MemberInfo
+import com.alarmy.near.network.request.WithdrawRequest
+import com.alarmy.near.presentation.feature.myprofile.model.LoginType
+import com.alarmy.near.presentation.feature.myprofile.model.MyProfileInfoUIModel
+import com.alarmy.near.presentation.feature.myprofile.model.WithdrawReason
+
+/**
+ * Data Layer Entity를 Model Layer로 변환
+ */
+fun MemberInfoEntity.toModel(): MemberInfo =
+    MemberInfo(
+        memberId = memberId,
+        username = username,
+        nickname = nickname,
+        imageUrl = imageUrl,
+        notificationAgreedAt = notificationAgreedAt,
+        providerType = providerType,
+    )
+
+/**
+ * Model Layer를 Data Layer Entity로 변환
+ */
+fun MemberInfo.toEntity(): MemberInfoEntity =
+    MemberInfoEntity(
+        memberId = memberId,
+        username = username,
+        nickname = nickname,
+        imageUrl = imageUrl,
+        notificationAgreedAt = notificationAgreedAt,
+        providerType = providerType,
+    )
+
+/**
+ * WithdrawReason을 Network Layer로 변환
+ */
+fun WithdrawReason.toRequest(customReason: String? = null): WithdrawRequest =
+    WithdrawRequest(
+        reasonType = this.name,
+        customReason = customReason,
+    )
+
+fun WithdrawRequest.toEntity(): WithdrawRequestEntity =
+    WithdrawRequestEntity(
+        reasonType = reasonType,
+        customReason = customReason,
+    )
+
+/**
+ * Model 계층 모델을 UI 계층 모델로 변환
+ */
+fun MemberInfo.toMyProfileInfoUIModel(): MyProfileInfoUIModel =
+    MyProfileInfoUIModel(
+        nickname = nickname,
+        imageUrl = imageUrl,
+        notificationAgreedAt = notificationAgreedAt,
+        providerType = mapProviderType(providerType),
+    )
+
+/**
+ * ProviderType 문자열을 LoginType enum으로 변환
+ */
+private fun mapProviderType(providerType: String): LoginType =
+    when (providerType.uppercase()) {
+        "KAKAO" -> LoginType.KAKAO
+        else -> LoginType.ETC
+    }

Near/app/src/main/java/com/alarmy/near/data/repository/MemberRepository.kt

@@ -0,0 +1,13 @@
+package com.alarmy.near.data.repository
+
+import com.alarmy.near.model.member.MemberInfo
+import com.alarmy.near.presentation.feature.myprofile.model.WithdrawReason
+import kotlinx.coroutines.flow.Flow
+
+interface MemberRepository {
+    // 현재 로그인한 회원의 정보를 조회
+    fun getMyInfo(): Flow<MemberInfo>
+
+    // 회원 탈퇴
+    fun withdraw(reason: WithdrawReason, customReason: String? = null): Flow<Unit>
+}

Near/app/src/main/java/com/alarmy/near/data/repository/MemberRepositoryImpl.kt

@@ -0,0 +1,38 @@
+package com.alarmy.near.data.repository
+
+import com.alarmy.near.data.mapper.toEntity
+import com.alarmy.near.data.mapper.toModel
+import com.alarmy.near.data.mapper.toRequest
+import com.alarmy.near.model.member.MemberInfo
+import com.alarmy.near.network.service.MemberApiService
+import com.alarmy.near.presentation.feature.myprofile.model.WithdrawReason
+import com.alarmy.near.utils.extensions.apiCallFlow
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 회원 정보 Repository 구현체
+ */
+@Singleton
+class MemberRepositoryImpl
+    @Inject
+    constructor(
+        private val memberApiService: MemberApiService,
+    ) : MemberRepository {
+        // 현재 로그인한 회원의 정보를 조회
+        override fun getMyInfo(): Flow<MemberInfo> =
+            apiCallFlow {
+                memberApiService.getMyInfo().toModel()
+            }
+
+        // 회원 탈퇴
+        override fun withdraw(
+            reason: WithdrawReason,
+            customReason: String?,
+        ): Flow<Unit> =
+            apiCallFlow {
+                val request = reason.toRequest(customReason)
+                memberApiService.withdraw(request.toEntity())
+            }
+    }

Near/app/src/main/java/com/alarmy/near/data/repository/OnBoardingRepository.kt

@@ -0,0 +1,37 @@
+package com.alarmy.near.data.repository
+
+import kotlinx.coroutines.flow.Flow
+
+/**
+ * 온보딩 관련 데이터를 관리하는 Repository 인터페이스
+ * 온보딩 완료 상태의 저장, 조회, 확인 기능을 제공
+ */
+interface OnBoardingRepository {
+
+    /**
+     * 온보딩 완료 여부를 확인하는 Flow
+     * true: 온보딩 완료됨, false: 온보딩 미완료
+     */
+    fun observeOnboardingStatus(): Flow<Boolean>
+
+    /**
+     * 온보딩 완료 상태를 저장
+     * completed: 온보딩 완료 여부
+     */
+    suspend fun setOnboardingCompleted(completed: Boolean)
+
+    /**
+     * 온보딩을 완료로 표시
+     */
+    suspend fun markOnboardingAsCompleted()
+
+    /**
+     * 온보딩 완료 상태를 확인
+     */
+    suspend fun isOnboardingCompleted(): Boolean
+
+    /**
+     * 온보딩 상태를 초기화 (테스트용 또는 재온보딩용)
+     */
+    suspend fun resetOnboardingStatus()
+}