[MERGE] #96 -> develop

[FEAT/#96] 여행 생성 뷰 / 서버 통신 구현

app/src/main/AndroidManifest.xml

@@ -157,4 +157,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -2,6 +2,7 @@ package com.going.doorip.di
 
 import com.going.data.datasource.AuthDataSource
 import com.going.data.datasource.DashBoardDataSource
+import com.going.data.datasource.EnterPreferenceDataSource
 import com.going.data.datasource.EnterTripDataSource
 import com.going.data.datasource.MockDataSource
 import com.going.data.datasource.ProfileDataSource
@@ -11,6 +12,7 @@ import com.going.data.datasource.TendencyDataSource
 import com.going.data.datasource.TodoDataSource
 import com.going.data.datasourceImpl.AuthDataSourceImpl
 import com.going.data.datasourceImpl.DashBoardDataSourceImpl
+import com.going.data.datasourceImpl.EnterPreferenceDataSourceImpl
 import com.going.data.datasourceImpl.EnterTripDataSourceImpl
 import com.going.data.datasourceImpl.MockDataSourceImpl
 import com.going.data.datasourceImpl.ProfileDataSourceImpl
@@ -65,11 +67,16 @@ object DataSourceModule {
 
     @Provides
     @Singleton
-    fun provideEnterTripDataSource(entertripDataSourceImpl: EnterTripDataSourceImpl): EnterTripDataSource =
-        entertripDataSourceImpl
+    fun provideEnterTripDataSource(enterTripDataSourceImpl: EnterTripDataSourceImpl): EnterTripDataSource =
+        enterTripDataSourceImpl
 
     @Provides
     @Singleton
     fun provideStartInviteTripDataSource(startInviteTripDataSourceImpl: StartInviteTripDataSourceImpl): StartInviteTripDataSource =
         startInviteTripDataSourceImpl
+
+    @Provides
+    @Singleton
+    fun provideEnterPreferenceDataSource(enterPreferenceDataSourceImpl: EnterPreferenceDataSourceImpl): EnterPreferenceDataSource =
+        enterPreferenceDataSourceImpl
 }

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

@@ -2,6 +2,7 @@ package com.going.doorip.di
 
 import com.going.data.repositoryImpl.AuthRepositoryImpl
 import com.going.data.repositoryImpl.DashBoardRepositoryImpl
+import com.going.data.repositoryImpl.EnterPreferenceRepositoryImpl
 import com.going.data.repositoryImpl.EnterTripRepositoryImpl
 import com.going.data.repositoryImpl.MockRepositoryImpl
 import com.going.data.repositoryImpl.ProfileRepositoryImpl
@@ -12,6 +13,7 @@ import com.going.data.repositoryImpl.TodoRepositoryImpl
 import com.going.data.repositoryImpl.TokenRepositoryImpl
 import com.going.domain.repository.AuthRepository
 import com.going.domain.repository.DashBoardRepository
+import com.going.domain.repository.EnterPreferenceRepository
 import com.going.domain.repository.EnterTripRepository
 import com.going.domain.repository.MockRepository
 import com.going.domain.repository.ProfileRepository
@@ -79,4 +81,9 @@ object RepositoryModule {
     @Singleton
     fun provideStartInviteTripRepository(startInviteTripRepositoryImpl: StartInviteTripRepositoryImpl): StartInviteTripRepository =
         startInviteTripRepositoryImpl
+
+    @Provides
+    @Singleton
+    fun provideEnterPreferenceRepository(enterPreferenceRepositoryImpl: EnterPreferenceRepositoryImpl): EnterPreferenceRepository =
+        enterPreferenceRepositoryImpl
 }

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

@@ -1,8 +1,8 @@
 package com.going.doorip.di
 
-import android.provider.ContactsContract.Profile
 import com.going.data.service.AuthService
 import com.going.data.service.DashBoardService
+import com.going.data.service.EnterPreferenceService
 import com.going.data.service.EnterTripService
 import com.going.data.service.MockService
 import com.going.data.service.ProfileService
@@ -65,4 +65,9 @@ object ServiceModule {
     @Singleton
     fun provideStartInviteTripService(retrofit: Retrofit): StartInviteTripService =
         retrofit.create(StartInviteTripService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideEnterPreferenceService(retrofit: Retrofit): EnterPreferenceService =
+        retrofit.create(EnterPreferenceService::class.java)
 }

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

@@ -0,0 +1,13 @@
+package com.going.data.datasource
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.EnterPreferenceRequestDto
+import com.going.data.dto.response.EnterPreferenceResponseDto
+import retrofit2.http.Body
+
+interface EnterPreferenceDataSource {
+    suspend fun postTripInfo(
+        @Body request: EnterPreferenceRequestDto
+    ): BaseResponse<EnterPreferenceResponseDto>
+
+}

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

@@ -10,7 +10,9 @@ class DashBoardDataSourceImpl @Inject constructor(
     private val dashBoardService: DashBoardService
 ) : DashBoardDataSource {
 
-    override suspend fun getTripList(progress: String): BaseResponse<DashBoardResponseDto> =
+    override suspend fun getTripList(
+        progress: String
+    ): BaseResponse<DashBoardResponseDto> =
         dashBoardService.getTripList(progress)
 
 }

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

@@ -0,0 +1,19 @@
+package com.going.data.datasourceImpl
+
+import com.going.data.datasource.EnterPreferenceDataSource
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.EnterPreferenceRequestDto
+import com.going.data.dto.response.EnterPreferenceResponseDto
+import com.going.data.service.EnterPreferenceService
+import javax.inject.Inject
+
+class EnterPreferenceDataSourceImpl @Inject constructor(
+    private val enterPreferenceService: EnterPreferenceService
+) : EnterPreferenceDataSource {
+
+    override suspend fun postTripInfo(
+        request: EnterPreferenceRequestDto
+    ): BaseResponse<EnterPreferenceResponseDto> =
+        enterPreferenceService.postTripInfoFromServer(request)
+
+}

data/src/main/java/com/going/data/interceptor/AuthInterceptor.kt → data/src/main/java/com/going/data/dto/interceptor/AuthInterceptor.kt

@@ -84,8 +84,8 @@ class AuthInterceptor @Inject constructor(
         return response
     }
 
-    private fun Request.newAuthBuilder() =
-        this.newBuilder().addHeader(AUTHORIZATION, "$BEARER ${dataStore.accessToken}")
+     private fun Request.newAuthBuilder() =
+         this.newBuilder().addHeader(AUTHORIZATION, "$BEARER ${dataStore.accessToken}")
 
     companion object {
         private const val CODE_TOKEN_EXPIRED = 401

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

@@ -0,0 +1,28 @@
+package com.going.data.dto.request
+
+import com.going.domain.entity.request.EnterPreferenceRequestModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EnterPreferenceRequestDto(
+    @SerialName("title")
+    val title: String,
+    @SerialName("startDate")
+    val startDate: String,
+    @SerialName("endDate")
+    val endDate: String,
+    @SerialName("styleA")
+    val styleA: Int,
+    @SerialName("styleB")
+    val styleB: Int,
+    @SerialName("styleC")
+    val styleC: Int,
+    @SerialName("styleD")
+    val styleD: Int,
+    @SerialName("styleE")
+    val styleE: Int
+)
+
+fun EnterPreferenceRequestModel.toEnterPreferenceRequestDto(): EnterPreferenceRequestDto =
+    EnterPreferenceRequestDto(title, startDate, endDate, styleA, styleB, styleC, styleD, styleE)

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

@@ -12,4 +12,3 @@ data class EnterTripRequestDto(
 
 fun EnterTripRequestModel.toEnterTripRequestDto(): EnterTripRequestDto =
     EnterTripRequestDto(code)
-

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

@@ -0,0 +1,24 @@
+package com.going.data.dto.response
+
+import com.going.domain.entity.response.EnterPreferenceModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EnterPreferenceResponseDto(
+    @SerialName("tripId")
+    val tripId: Long,
+    @SerialName("title")
+    val title: String,
+    @SerialName("startDate")
+    val startDate: String,
+    @SerialName("endDate")
+    val endDate: String,
+    @SerialName("code")
+    val code: String,
+    @SerialName("day")
+    val day: Int,
+) {
+    fun toEnterPreferenceModel() =
+        EnterPreferenceModel(tripId, title, startDate, endDate, code, day)
+}

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

@@ -0,0 +1,23 @@
+package com.going.data.repositoryImpl
+
+import com.going.data.datasource.EnterPreferenceDataSource
+import com.going.data.dto.request.toEnterPreferenceRequestDto
+import com.going.domain.entity.request.EnterPreferenceRequestModel
+import com.going.domain.entity.response.EnterPreferenceModel
+import com.going.domain.repository.EnterPreferenceRepository
+import javax.inject.Inject
+
+class EnterPreferenceRepositoryImpl @Inject constructor(
+    private val enterPreferenceDataSource: EnterPreferenceDataSource
+) : EnterPreferenceRepository {
+
+    override suspend fun postTripInfo(
+        request: EnterPreferenceRequestModel
+    ): Result<EnterPreferenceModel> =
+        runCatching {
+            enterPreferenceDataSource.postTripInfo(
+                request.toEnterPreferenceRequestDto(),
+            ).data.toEnterPreferenceModel()
+        }
+
+}

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

@@ -0,0 +1,16 @@
+package com.going.data.service
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.request.EnterPreferenceRequestDto
+import com.going.data.dto.response.EnterPreferenceResponseDto
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface EnterPreferenceService {
+
+    @POST("api/trips")
+    suspend fun postTripInfoFromServer(
+        @Body request: EnterPreferenceRequestDto,
+    ): BaseResponse<EnterPreferenceResponseDto>
+
+}

domain/src/main/kotlin/com/going/domain/entity/request/EnterPreferenceRequestModel.kt

@@ -0,0 +1,12 @@
+package com.going.domain.entity.request
+
+data class EnterPreferenceRequestModel(
+    val title: String,
+    val startDate: String,
+    val endDate: String,
+    val styleA: Int,
+    val styleB: Int,
+    val styleC: Int,
+    val styleD: Int,
+    val styleE: Int
+)

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

@@ -0,0 +1,10 @@
+package com.going.domain.entity.response
+
+data class EnterPreferenceModel(
+    val tripId: Long,
+    val title: String,
+    val startDate: String,
+    val endDate: String,
+    val code: String,
+    val day: Int
+)

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

@@ -0,0 +1,12 @@
+package com.going.domain.repository
+
+import com.going.domain.entity.request.EnterPreferenceRequestModel
+import com.going.domain.entity.response.EnterPreferenceModel
+
+interface EnterPreferenceRepository {
+
+    suspend fun postTripInfo(
+        request: EnterPreferenceRequestModel
+    ): Result<EnterPreferenceModel>
+
+}

presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt

@@ -1,10 +1,13 @@
 package com.going.presentation.dashboard
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityTripDashBoardBinding
+import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity
 import com.going.ui.base.BaseActivity
+import com.going.ui.extension.setOnSingleClickListener
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -22,6 +25,7 @@ class DashBoardActivity :
         setTabLayout()
         setViewPager()
         setTravelerName()
+        initCreateTripBtnClickListener()
 
     }
 
@@ -51,6 +55,18 @@ class DashBoardActivity :
         }
     }
 
+    private fun initCreateTripBtnClickListener() {
+        binding.btnDashboardCreateTrip.setOnSingleClickListener {
+            navigateToDashboard()
+        }
+    }
+
+    private fun navigateToDashboard() {
+        Intent(this, CreateTripActivity::class.java).apply {
+            startActivity(this)
+        }
+    }
+
     companion object {
         const val TAB_ONGOING = "진행중인 여행"
         const val TAB_COMPLETED = "지나간 여행"

presentation/src/main/java/com/going/presentation/entertrip/starttrip/createtrip/BottomSheetDateContentFragment.kt

@@ -53,7 +53,7 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS
                 calendar.set(Calendar.DAY_OF_MONTH, viewModel.endDay.value ?: 0)
                 val endDate = calendar.time
 
-                if(startDate.before(endDate)) {
+                if (startDate.before(endDate)) {
                     dismiss()
                 } else {
                     toast(getString(R.string.create_trip_toast_error))