[FEAT/#30] 진행중 여행, 완료된 여행 리스트 구현

app/src/main/AndroidManifest.xml

@@ -41,6 +41,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.going.presentation.auth.LoginActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.going.presentation.todo.TodoActivity"
             android:exported="false"
@@ -72,6 +77,11 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.going.presentation.tendencytest.result.TendencyTestResultActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"/>
+
     </application>
 
 </manifest>

app/src/main/java/com/going/going/di/DataSourceModule.kt

@@ -1,6 +1,8 @@
 package com.going.going.di
 
+import com.going.data.datasource.LoginDataSource
 import com.going.data.datasource.MockDataSource
+import com.going.data.datasourceImpl.LoginDataSourceImpl
 import com.going.data.datasourceImpl.MockDataSourceImpl
 import dagger.Module
 import dagger.Provides
@@ -17,4 +19,10 @@ object DataSourceModule {
     fun provideMockDataSource(mockDataSourceImpl: MockDataSourceImpl): MockDataSource =
         mockDataSourceImpl
 
-}
+    @Provides
+    @Singleton
+    fun provideLoginDataSource(loginDataSourceImpl: LoginDataSourceImpl): LoginDataSource =
+        loginDataSourceImpl
+
+
+}

app/src/main/java/com/going/going/di/RepositoryModule.kt

@@ -1,6 +1,8 @@
 package com.going.going.di
 
+import com.going.data.repositoryImpl.LoginRepositoryImpl
 import com.going.data.repositoryImpl.MockRepositoryImpl
+import com.going.domain.repository.LoginRepository
 import com.going.domain.repository.MockRepository
 import dagger.Module
 import dagger.Provides
@@ -17,4 +19,8 @@ object RepositoryModule {
     fun provideMockRepository(mockRepositoryImpl: MockRepositoryImpl): MockRepository =
         mockRepositoryImpl
 
-}
+    @Provides
+    @Singleton
+    fun provideLoginRepository(loginRepositoryImpl: LoginRepositoryImpl): LoginRepository =
+        loginRepositoryImpl
+}

app/src/main/java/com/going/going/di/ServiceModule.kt

@@ -1,5 +1,6 @@
 package com.going.going.di
 
+import com.going.data.service.LoginService
 import com.going.data.service.MockService
 import dagger.Module
 import dagger.Provides
@@ -17,4 +18,9 @@ object ServiceModule {
     fun provideMockService(retrofit: Retrofit): MockService =
         retrofit.create(MockService::class.java)
 
-}
+    @Provides
+    @Singleton
+    fun provideLoginService(retrofit: Retrofit): LoginService =
+        retrofit.create(LoginService::class.java)
+
+}

data/src/main/java/com/going/data/datasource/LoginDataSource.kt

@@ -0,0 +1,12 @@
+package com.going.data.datasource
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.RequestLoginDto
+import com.going.data.dto.response.LoginResponseDto
+
+interface LoginDataSource {
+    suspend fun postLogin(
+        Authorization: String,
+        platform: RequestLoginDto,
+    ): BaseResponse<LoginResponseDto>
+}

data/src/main/java/com/going/data/datasourceImpl/LoginDataSourceImpl.kt

@@ -0,0 +1,18 @@
+package com.going.data.datasourceImpl
+
+import com.going.data.datasource.LoginDataSource
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.RequestLoginDto
+import com.going.data.dto.response.LoginResponseDto
+import com.going.data.service.LoginService
+import javax.inject.Inject
+
+class LoginDataSourceImpl @Inject constructor(
+    private val loginService: LoginService,
+) : LoginDataSource {
+    override suspend fun postLogin(
+        Authorization: String,
+        platform: RequestLoginDto,
+    ): BaseResponse<LoginResponseDto> =
+        loginService.postSignin(Authorization, platform)
+}

data/src/main/java/com/going/data/dto/BaseResponse.kt

@@ -0,0 +1,14 @@
+package com.going.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BaseResponse<T>(
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: T,
+)

data/src/main/java/com/going/data/dto/request/RequestLoginDto.kt

@@ -0,0 +1,10 @@
+package com.going.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestLoginDto(
+    @SerialName("platform")
+    val platform: String
+)

data/src/main/java/com/going/data/dto/response/LoginResponseDto.kt

@@ -0,0 +1,37 @@
+package com.going.data.dto.response
+
+import com.going.domain.entity.response.AuthTokenModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LoginResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+) {
+    fun toAuthTokenModel() =
+        AuthTokenModel(accessToken = accessToken, refreshToken = refreshToken)
+}
+
+// @Serializable
+// data class LoginResponseDto(
+//    @SerialName("status")
+//    val status: Int,
+//    @SerialName("message")
+//    val message: String,
+//    @SerialName("data")
+//    val data: Data,
+// ) {
+//    @Serializable
+//    data class Data(
+//        @SerialName("accessToken")
+//        val accessToken: String,
+//        @SerialName("refreshToken")
+//        val refreshToken: String,
+//    )
+//
+//    fun toAuthTokenModel() =
+//        AuthTokenModel(accessToken = data.accessToken, refreshToken = data.refreshToken)
+// }

data/src/main/java/com/going/data/repositoryImpl/LoginRepositoryImpl.kt

@@ -0,0 +1,22 @@
+package com.going.data.repositoryImpl
+
+import com.going.data.datasource.LoginDataSource
+import com.going.data.dto.request.RequestLoginDto
+import com.going.domain.entity.response.AuthTokenModel
+import com.going.domain.repository.LoginRepository
+import javax.inject.Inject
+
+class LoginRepositoryImpl @Inject constructor(
+    private val loginDataSource: LoginDataSource,
+) : LoginRepository {
+    override suspend fun postSignin(
+        Authorization: String,
+        platform: String,
+    ): Result<AuthTokenModel> =
+        runCatching {
+            loginDataSource.postLogin(
+                Authorization,
+                RequestLoginDto(platform),
+            ).data.toAuthTokenModel()
+        }
+}

data/src/main/java/com/going/data/service/LoginService.kt

@@ -0,0 +1,16 @@
+package com.going.data.service
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.RequestLoginDto
+import com.going.data.dto.response.LoginResponseDto
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface LoginService {
+    @POST("api/users/signin")
+    suspend fun postSignin(
+        @Header("Authorization") Authorization: String,
+        @Body body: RequestLoginDto,
+    ): BaseResponse<LoginResponseDto>
+}

domain/src/main/kotlin/com/going/domain/entity/TendencyResultMock.kt

@@ -0,0 +1,15 @@
+package com.going.domain.entity
+
+data class TendencyResultMock(
+    val tendencyTitle: String,
+    val tendencySubTitle: String,
+    val tags: List<String>,
+    val tendencyBoxInfo: List<BoxInfo>,
+) {
+    data class BoxInfo(
+        val title: String,
+        val first: String,
+        val second: String,
+        val third: String,
+    )
+}

domain/src/main/kotlin/com/going/domain/entity/response/AuthTokenModel.kt

@@ -1,7 +1,6 @@
 package com.going.domain.entity.response
 
 data class AuthTokenModel(
-    val isResigned: Boolean,
     val accessToken: String,
     val refreshToken: String,
 )

domain/src/main/kotlin/com/going/domain/entity/response/CompletedListModel.kt

@@ -0,0 +1,7 @@
+package com.going.domain.entity.response
+
+data class CompletedListModel(
+    val title: String,
+    val startDate: String,
+    val endDate: String
+)

domain/src/main/kotlin/com/going/domain/entity/response/TripCreateListModel.kt → domain/src/main/kotlin/com/going/domain/entity/response/OngoingListModel.kt

@@ -1,6 +1,6 @@
 package com.going.domain.entity.response
 
-data class TripCreateListModel(
+data class OngoingListModel(
     val title : String,
     val startDate : String,
     val endDate : String,

domain/src/main/kotlin/com/going/domain/repository/LoginRepository.kt

@@ -0,0 +1,10 @@
+package com.going.domain.repository
+
+import com.going.domain.entity.response.AuthTokenModel
+
+interface LoginRepository {
+    suspend fun postSignin(
+        Authorization: String,
+        platform: String,
+    ): Result<AuthTokenModel>
+}

presentation/src/main/java/com/going/presentation/auth/LoginActivity.kt

@@ -9,9 +9,11 @@ import com.going.presentation.databinding.ActivityLoginBinding
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
 import com.going.ui.extension.setOnSingleClickListener
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+@AndroidEntryPoint
 class LoginActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_login) {
     private val viewModel by viewModels<LoginViewModel>()
 

presentation/src/main/java/com/going/presentation/auth/LoginViewModel.kt

@@ -4,16 +4,23 @@ import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.going.domain.entity.response.AuthTokenModel
+import com.going.domain.repository.LoginRepository
 import com.going.ui.extension.UiState
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.kakao.sdk.user.UserApiClient
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
 
-class LoginViewModel : ViewModel() {
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val loginRepository: LoginRepository,
+) : ViewModel() {
     private val _postChangeTokenState = MutableStateFlow<UiState<AuthTokenModel>>(UiState.Empty)
     val postChangeTokenState: StateFlow<UiState<AuthTokenModel?>> = _postChangeTokenState
 
@@ -64,19 +71,22 @@ class LoginViewModel : ViewModel() {
 
         viewModelScope.launch {
             // 통신 로직
-
-            // 성공시 서버에서 준 정보를 넣는 예시 코드
-            _postChangeTokenState.value = UiState.Success(
-                AuthTokenModel(
-                    isResigned = true,
-                    accessToken = "testAccessToekn",
-                    refreshToken = "testRefreshToekn",
-                ),
-            )
+            loginRepository.postSignin(accessToken, social).onSuccess {
+                // 성공시 서버에서 준 정보를 넣는 예시 코드
+                Timber.e("성공고오고오고공")
+                _postChangeTokenState.value = UiState.Success(
+                    AuthTokenModel(
+                        accessToken = "testAccessToekn",
+                        refreshToken = "testRefreshToekn",
+                    ),
+                )
+            }.onFailure { err ->
+                Timber.e("실패패패패패패")
+            }
         }
     }
 
     companion object {
-        const val KAKAO = "KAKAO"
+        const val KAKAO = "kakao"
     }
 }