Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

프로필 만들기 API 연결 #177

Merged
merged 6 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
tools:targetApi="31">
<activity
android:name=".presentation.ui.group.detail.GroupDetailActivity"
android:exported="false"/>
android:exported="false" />
<activity
android:name=".presentation.ui.group.add.GroupAddActivity"
android:exported="false" />
Expand All @@ -30,11 +30,18 @@
<activity
android:name=".presentation.ui.MainActivity"
android:exported="false" />
<activity android:name=".presentation.ui.chatlist.chat.ChatActivity"
android:exported="false"/>
<activity
android:name=".presentation.ui.chatlist.chat.ChatActivity"
android:exported="false" />
<activity
android:name=".presentation.ui.register.RegisterActivity"
android:exported="false">
android:exported="true"
android:theme="@style/Theme.Friendogly.Splash">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.canhub.cropper.CropImageActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,31 @@ import com.woowacourse.friendogly.BuildConfig
import com.woowacourse.friendogly.data.repository.ClubRepositoryImpl
import com.woowacourse.friendogly.data.repository.KakaoLoginRepositoryImpl
import com.woowacourse.friendogly.data.repository.LocalRepositoryImpl
import com.woowacourse.friendogly.data.repository.MemberRepositoryImpl
import com.woowacourse.friendogly.data.source.ClubDataSource
import com.woowacourse.friendogly.data.source.KakaoLoginDataSource
import com.woowacourse.friendogly.data.source.LocalDataSource
import com.woowacourse.friendogly.data.source.MemberDataSource
import com.woowacourse.friendogly.domain.repository.ClubRepository
import com.woowacourse.friendogly.domain.repository.KakaoLoginRepository
import com.woowacourse.friendogly.domain.repository.LocalRepository
import com.woowacourse.friendogly.domain.repository.MemberRepository
import com.woowacourse.friendogly.domain.usecase.DeleteClubUseCase
import com.woowacourse.friendogly.domain.usecase.DeleteLocalDataUseCase
import com.woowacourse.friendogly.domain.usecase.GetClubMineUseCase
import com.woowacourse.friendogly.domain.usecase.GetJwtTokenUseCase
import com.woowacourse.friendogly.domain.usecase.KakaoLoginUseCase
import com.woowacourse.friendogly.domain.usecase.PostClubParticipationUseCase
import com.woowacourse.friendogly.domain.usecase.PostClubUseCase
import com.woowacourse.friendogly.domain.usecase.PostMemberUseCase
import com.woowacourse.friendogly.domain.usecase.SaveJwtTokenUseCase
import com.woowacourse.friendogly.kakao.source.KakaoLoginDataSourceImpl
import com.woowacourse.friendogly.local.di.LocalModule
import com.woowacourse.friendogly.local.source.LocalDataSourceImpl
import com.woowacourse.friendogly.remote.api.BaseUrl
import com.woowacourse.friendogly.remote.di.RemoteModule
import com.woowacourse.friendogly.remote.source.ClubDataSourceImpl
import com.woowacourse.friendogly.remote.source.MemberDataSourceImpl

class AppModule(context: Context) {
private val baseUrl = BaseUrl(BuildConfig.base_url)
Expand All @@ -37,16 +42,24 @@ class AppModule(context: Context) {
localModule = localModule,
)

private val memberService =
RemoteModule.createMemberService(
baseUrl = baseUrl,
localModule = localModule,
)

// data source
private val clubDataSource: ClubDataSource = ClubDataSourceImpl(service = clubService)
private val localDataSource: LocalDataSource = LocalDataSourceImpl(localModule = localModule)
private val kakaoLoginDataSource: KakaoLoginDataSource = KakaoLoginDataSourceImpl()
private val memberDataSource: MemberDataSource = MemberDataSourceImpl(service = memberService)

// repository
private val clubRepository: ClubRepository = ClubRepositoryImpl(source = clubDataSource)
private val localRepository: LocalRepository = LocalRepositoryImpl(source = localDataSource)
private val kakaoLoginRepository: KakaoLoginRepository =
KakaoLoginRepositoryImpl(dataSource = kakaoLoginDataSource)
private val memberRepository: MemberRepository = MemberRepositoryImpl(source = memberDataSource)
Comment on lines 51 to +62
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

너무 과도하게 많아질 것 같아서, dataSourceModule과 RepositoryModule을 나눠도 좋을 것 같습니다!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

다음에 같이 나누어요~~


// use case
val kakaoLoginUseCase: KakaoLoginUseCase = KakaoLoginUseCase(repository = kakaoLoginRepository)
Expand All @@ -59,6 +72,7 @@ class AppModule(context: Context) {
val saveJwtTokenUseCase: SaveJwtTokenUseCase = SaveJwtTokenUseCase(repository = localRepository)
val deleteLocalDataUseCase: DeleteLocalDataUseCase =
DeleteLocalDataUseCase(repository = localRepository)
val postMemberUseCase: PostMemberUseCase = PostMemberUseCase(repository = memberRepository)

companion object {
private var instance: AppModule? = null
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.woowacourse.friendogly.data.mapper

import com.woowacourse.friendogly.data.model.MemberDto
import com.woowacourse.friendogly.domain.model.Member

fun MemberDto.toDomain(): Member {
return Member(
id = id,
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.woowacourse.friendogly.data.model

data class MemberDto(
val id: Long,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.woowacourse.friendogly.data.repository

import com.woowacourse.friendogly.data.mapper.toDomain
import com.woowacourse.friendogly.data.source.MemberDataSource
import com.woowacourse.friendogly.domain.model.Member
import com.woowacourse.friendogly.domain.repository.MemberRepository

class MemberRepositoryImpl(
private val source: MemberDataSource,
) : MemberRepository {
override suspend fun postMember(
name: String,
email: String,
): Result<Member> = source.postMember(name = name, email = email).mapCatching { result -> result.toDomain() }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.woowacourse.friendogly.data.source

import com.woowacourse.friendogly.data.model.MemberDto

interface MemberDataSource {
suspend fun postMember(
name: String,
email: String,
): Result<MemberDto>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.woowacourse.friendogly.domain.model

data class Member(
val id: Long,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.woowacourse.friendogly.domain.repository

import com.woowacourse.friendogly.domain.model.Member

interface MemberRepository {
suspend fun postMember(
name: String,
email: String,
): Result<Member>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.woowacourse.friendogly.domain.usecase

import com.woowacourse.friendogly.domain.model.Member
import com.woowacourse.friendogly.domain.repository.MemberRepository

class PostMemberUseCase(
private val repository: MemberRepository,
) {
suspend operator fun invoke(
name: String,
email: String,
): Result<Member> = repository.postMember(name = name, email = email)
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.canhub.cropper.CropImageContract
import com.canhub.cropper.CropImageContractOptions
import com.canhub.cropper.CropImageOptions
import com.woowacourse.friendogly.R
import com.woowacourse.friendogly.application.di.AppModule
import com.woowacourse.friendogly.databinding.ActivityProfileSettingBinding
import com.woowacourse.friendogly.presentation.base.BaseActivity
import com.woowacourse.friendogly.presentation.base.observeEvent
Expand All @@ -25,7 +26,12 @@ import com.woowacourse.friendogly.presentation.utils.toMultipartBody

class ProfileSettingActivity :
BaseActivity<ActivityProfileSettingBinding>(R.layout.activity_profile_setting) {
private val viewModel: ProfileSettingViewModel by viewModels()
private val viewModel: ProfileSettingViewModel by viewModels {
ProfileSettingViewModel.factory(
postMemberUseCase = AppModule.getInstance().postMemberUseCase,
saveJwtTokenUseCase = AppModule.getInstance().saveJwtTokenUseCase,
)
}

private lateinit var imagePickerLauncher: ActivityResultLauncher<String>
private lateinit var imageCropLauncher: ActivityResultLauncher<CropImageContractOptions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,22 @@ package com.woowacourse.friendogly.presentation.ui.profilesetting
import android.graphics.Bitmap
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import com.woowacourse.friendogly.domain.model.JwtToken
import com.woowacourse.friendogly.domain.usecase.PostMemberUseCase
import com.woowacourse.friendogly.domain.usecase.SaveJwtTokenUseCase
import com.woowacourse.friendogly.presentation.base.BaseViewModel
import com.woowacourse.friendogly.presentation.base.BaseViewModelFactory
import com.woowacourse.friendogly.presentation.base.Event
import com.woowacourse.friendogly.presentation.base.emit
import kotlinx.coroutines.launch
import okhttp3.MultipartBody

class ProfileSettingViewModel : BaseViewModel() {
class ProfileSettingViewModel(
private val postMemberUseCase: PostMemberUseCase,
private val saveJwtTokenUseCase: SaveJwtTokenUseCase,
) : BaseViewModel() {
private val _uiState: MutableLiveData<ProfileSettingUiState> =
MutableLiveData(ProfileSettingUiState())
val uiState: LiveData<ProfileSettingUiState> get() = _uiState
Expand All @@ -24,7 +34,29 @@ class ProfileSettingViewModel : BaseViewModel() {
}

fun submitProfileSelection() {
_navigateAction.emit(ProfileSettingNavigationAction.NavigateToHome)
val nickname = nickname.value ?: return
if (nickname.isBlank()) return
if (regex.matches(nickname)) return
viewModelScope.launch {
// TODO email 필드는 임시로 넣어두었습니다.
postMemberUseCase(
name = nickname,
email = "test@banggapge.com",
).onSuccess { member ->
saveJwaToken(member.id)
}.onFailure {
// TODO 예외처리
}
}
}

private suspend fun saveJwaToken(memberId: Long) {
val jwtToken = JwtToken(accessToken = memberId.toString(), refreshToken = null)
saveJwtTokenUseCase(jwtToken = jwtToken).onSuccess {
_navigateAction.emit(ProfileSettingNavigationAction.NavigateToHome)
}.onFailure {
// TODO 예외처리
}
}

fun updateProfileImage(bitmap: Bitmap) {
Expand All @@ -41,4 +73,20 @@ class ProfileSettingViewModel : BaseViewModel() {
val state = _uiState.value ?: return
_uiState.value = state.copy(profilePath = file)
}

companion object {
private val regex = "^[ㄱ-ㅎㅏ-ㅣ]+$".toRegex()

fun factory(
postMemberUseCase: PostMemberUseCase,
saveJwtTokenUseCase: SaveJwtTokenUseCase,
): ViewModelProvider.Factory {
return BaseViewModelFactory { _ ->
ProfileSettingViewModel(
postMemberUseCase = postMemberUseCase,
saveJwtTokenUseCase = saveJwtTokenUseCase,
)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
package com.woowacourse.friendogly.presentation.ui.register

import android.os.Bundle
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import com.google.android.gms.common.api.ApiException
import com.woowacourse.friendogly.R
import com.woowacourse.friendogly.application.di.AppModule
import com.woowacourse.friendogly.databinding.ActivityRegisterBinding
import com.woowacourse.friendogly.presentation.base.BaseActivity
import com.woowacourse.friendogly.presentation.base.observeEvent
import com.woowacourse.friendogly.presentation.ui.MainActivity
import com.woowacourse.friendogly.presentation.ui.profilesetting.ProfileSettingActivity

class RegisterActivity : BaseActivity<ActivityRegisterBinding>(R.layout.activity_register) {
class RegisterActivity : AppCompatActivity() {
private var _binding: ActivityRegisterBinding? = null
val binding get() = requireNotNull(_binding)

private val viewModel: RegisterViewModel by viewModels {
RegisterViewModel.factory(kakaoLoginUseCase = AppModule.getInstance().kakaoLoginUseCase)
RegisterViewModel.factory(
kakaoLoginUseCase = AppModule.getInstance().kakaoLoginUseCase,
getJwtTokenUseCase = AppModule.getInstance().getJwtTokenUseCase,
)
}

private val googleSignInLauncher =
Expand All @@ -22,18 +30,39 @@ class RegisterActivity : BaseActivity<ActivityRegisterBinding>(R.layout.activity
viewModel.handleGoogleLogin(idToken = idToken)
}

override fun initCreateView() {
override fun onCreate(savedInstanceState: Bundle?) {
val splashScreen = installSplashScreen()
super.onCreate(savedInstanceState)

_binding = ActivityRegisterBinding.inflate(layoutInflater)
setContentView(binding.root)

initCreateView()
splashScreen.setKeepOnScreenCondition {
viewModel.splashLoading.value == true
}
}

private fun initCreateView() {
initDataBinding()
initObserve()
}

private fun initDataBinding() {
binding.vm = viewModel
binding.apply {
vm = viewModel
lifecycleOwner = this@RegisterActivity
}
}

private fun initObserve() {
viewModel.navigateAction.observeEvent(this) { action ->
when (action) {
is RegisterNavigationAction.NavigateToAlreadyLogin -> {
startActivity(MainActivity.getIntent(this))
finish()
}

is RegisterNavigationAction.NavigateToGoogleLogin ->
googleSignInLauncher.launch(
SIGN_IN_REQUEST_CODE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.woowacourse.friendogly.presentation.ui.register

sealed interface RegisterNavigationAction {
data object NavigateToAlreadyLogin : RegisterNavigationAction

data object NavigateToGoogleLogin : RegisterNavigationAction

data class NavigateToProfileSetting(val idToken: String) : RegisterNavigationAction
Expand Down
Loading
Loading