[FEAT/#230] 여행 조회, 여행 수정, 여행 나가기 뷰 / 서버통신 구현

app/src/main/AndroidManifest.xml

@@ -171,7 +171,12 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.todo.editinfo.EditTripInfoActivity"
+            android:name="com.going.presentation.todo.edittrip.info.EditTripInfoActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.going.presentation.todo.edittrip.edit.EditTripActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

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.EditTripDataSource
 import com.going.data.datasource.EnterTripDataSource
 import com.going.data.datasource.ProfileDataSource
 import com.going.data.datasource.SettingDataSource
@@ -10,6 +11,7 @@ import com.going.data.datasource.TodoDataSource
 import com.going.data.datasource.TokenReissueDataSource
 import com.going.data.datasourceImpl.AuthDataSourceImpl
 import com.going.data.datasourceImpl.DashBoardDataSourceImpl
+import com.going.data.datasourceImpl.EditTripDataSourceImpl
 import com.going.data.datasourceImpl.EnterTripDataSourceImpl
 import com.going.data.datasourceImpl.ProfileDataSourceImpl
 import com.going.data.datasourceImpl.SettingDataSourceImpl
@@ -65,4 +67,9 @@ object DataSourceModule {
     @Singleton
     fun provideTokenReissueDataSource(tokenReissueDataSourceImpl: TokenReissueDataSourceImpl): TokenReissueDataSource =
         tokenReissueDataSourceImpl
+
+    @Provides
+    @Singleton
+    fun provideEditTripDataSource(editTripDataSourceImpl: EditTripDataSourceImpl): EditTripDataSource =
+        editTripDataSourceImpl
 }

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.EditTripRepositoryImpl
 import com.going.data.repositoryImpl.EnterTripRepositoryImpl
 import com.going.data.repositoryImpl.ProfileRepositoryImpl
 import com.going.data.repositoryImpl.SettingRepositoryImpl
@@ -11,6 +12,7 @@ import com.going.data.repositoryImpl.TokenReissueRepositoryImpl
 import com.going.data.repositoryImpl.TokenRepositoryImpl
 import com.going.domain.repository.AuthRepository
 import com.going.domain.repository.DashBoardRepository
+import com.going.domain.repository.EditTripRepository
 import com.going.domain.repository.EnterTripRepository
 import com.going.domain.repository.ProfileRepository
 import com.going.domain.repository.SettingRepository
@@ -72,4 +74,9 @@ object RepositoryModule {
     @Singleton
     fun provideTokenReissueRepository(tokenReissueRepositoryImpl: TokenReissueRepositoryImpl): TokenReissueRepository =
         tokenReissueRepositoryImpl
+
+    @Provides
+    @Singleton
+    fun provideEditTripRepository(editTripRepositoryImpl: EditTripRepositoryImpl): EditTripRepository =
+        editTripRepositoryImpl
 }

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

@@ -2,6 +2,7 @@ package com.going.doorip.di
 
 import com.going.data.service.AuthService
 import com.going.data.service.DashBoardService
+import com.going.data.service.EditTripService
 import com.going.data.service.EnterTripService
 import com.going.data.service.ProfileService
 import com.going.data.service.SettingService
@@ -60,4 +61,9 @@ object ServiceModule {
     @Singleton
     fun provideTokenReissueService(@REISSUE retrofit: Retrofit): TokenReissueService =
         retrofit.create(TokenReissueService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideEditTripService(@JWT retrofit: Retrofit): EditTripService =
+        retrofit.create(EditTripService::class.java)
 }

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

@@ -0,0 +1,22 @@
+package com.going.data.datasource
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.NonDataBaseResponse
+import com.going.data.dto.request.EditTripInfoRequestDto
+import com.going.data.dto.response.TripInfoResponseDto
+
+interface EditTripDataSource {
+    suspend fun getTripInfo(
+        tripId: Long
+    ): BaseResponse<TripInfoResponseDto>
+
+    suspend fun patchEditTripInfo(
+        tripId: Long,
+        request: EditTripInfoRequestDto
+    ): NonDataBaseResponse
+
+    suspend fun patchQuitTrip(
+        tripId: Long
+    ): NonDataBaseResponse
+
+}

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

@@ -0,0 +1,32 @@
+package com.going.data.datasourceImpl
+
+import com.going.data.datasource.EditTripDataSource
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.NonDataBaseResponse
+import com.going.data.dto.request.EditTripInfoRequestDto
+import com.going.data.dto.response.TripInfoResponseDto
+import com.going.data.service.EditTripService
+import javax.inject.Inject
+
+class EditTripDataSourceImpl @Inject constructor(
+    private val editTripService: EditTripService,
+) : EditTripDataSource {
+
+    override suspend fun getTripInfo(
+        tripId: Long
+    ): BaseResponse<TripInfoResponseDto> =
+        editTripService.getTripInfo(tripId)
+
+    override suspend fun patchEditTripInfo(
+        tripId: Long,
+        request: EditTripInfoRequestDto
+    ): NonDataBaseResponse = editTripService.patchEditTripInfo(
+        tripId, request
+    )
+
+    override suspend fun patchQuitTrip(
+        tripId: Long
+    ): NonDataBaseResponse = editTripService.patchQuitTrip(
+        tripId
+    )
+}

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

@@ -0,0 +1,19 @@
+package com.going.data.dto.request
+
+import com.going.domain.entity.request.EditTripRequestModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+class EditTripInfoRequestDto(
+    @SerialName("title")
+    val title: String,
+    @SerialName("startDate")
+    val startDate: String,
+    @SerialName("endDate")
+    val endDate: String,
+)
+
+fun EditTripRequestModel.toEditTrioRequestDto(): EditTripInfoRequestDto =
+    EditTripInfoRequestDto(title, startDate, endDate)
+

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

@@ -0,0 +1,20 @@
+package com.going.data.dto.response
+
+import com.going.domain.entity.response.TripInfoModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TripInfoResponseDto(
+    @SerialName("tripId")
+    val tripId: Long,
+    @SerialName("title")
+    val title: String,
+    @SerialName("startDate")
+    val startDate: String,
+    @SerialName("endDate")
+    val endDate: String,
+) {
+    fun toTripInfoModel(): TripInfoModel
+    = TripInfoModel(tripId, title, startDate, endDate)
+}

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

@@ -0,0 +1,37 @@
+package com.going.data.repositoryImpl
+
+import com.going.data.datasource.EditTripDataSource
+import com.going.data.dto.request.toEditTrioRequestDto
+import com.going.domain.entity.request.EditTripRequestModel
+import com.going.domain.entity.response.TripInfoModel
+import com.going.domain.repository.EditTripRepository
+import javax.inject.Inject
+
+class EditTripRepositoryImpl @Inject constructor(
+    private val editTripDataSource: EditTripDataSource,
+) : EditTripRepository {
+    override suspend fun getTripInfo(
+        tripId: Long
+    ): Result<TripInfoModel> =
+        runCatching {
+            editTripDataSource.getTripInfo(tripId).data.toTripInfoModel()
+        }
+
+    override suspend fun patchEditTripInfo(
+        tripId: Long, request: EditTripRequestModel
+    ): Result<Unit> =
+        runCatching {
+            editTripDataSource.patchEditTripInfo(
+                tripId, request.toEditTrioRequestDto()
+            )
+        }
+
+    override suspend fun patchQuitTrip(
+        tripId: Long
+    ): Result<Unit> =
+        runCatching {
+            editTripDataSource.patchQuitTrip(
+                tripId
+            )
+        }
+}

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

@@ -0,0 +1,30 @@
+package com.going.data.service
+
+import com.going.data.dto.BaseResponse
+import com.going.data.dto.NonDataBaseResponse
+import com.going.data.dto.request.EditTripInfoRequestDto
+import com.going.data.dto.response.TripInfoResponseDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.Path
+
+interface EditTripService {
+
+    @GET("api/trips/{tripId}")
+    suspend fun getTripInfo(
+        @Path("tripId") tripId: Long
+    ): BaseResponse<TripInfoResponseDto>
+
+    @PATCH("api/trips/{tripId}")
+    suspend fun patchEditTripInfo(
+        @Path("tripId") tripId: Long,
+        @Body request: EditTripInfoRequestDto,
+    ): NonDataBaseResponse
+
+    @PATCH("api/trips/{tripId}/leave")
+    suspend fun patchQuitTrip(
+        @Path("tripId") tripId: Long,
+    ): NonDataBaseResponse
+
+}

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

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

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

@@ -0,0 +1,8 @@
+package com.going.domain.entity.request
+
+data class TripInfoRequestModel(
+    val tripId: Long,
+    val title: String,
+    val startDate : String,
+    val endDate : String,
+)

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

@@ -0,0 +1,5 @@
+package com.going.domain.entity.response
+
+data class QuitTripModel(
+    val tripId: Long,
+)

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

@@ -0,0 +1,8 @@
+package com.going.domain.entity.response
+
+data class TripInfoModel(
+    val tripId: Long,
+    val title: String,
+    val startDate: String,
+    val endDate: String,
+)

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

@@ -0,0 +1,18 @@
+package com.going.domain.repository
+
+import com.going.domain.entity.request.EditTripRequestModel
+import com.going.domain.entity.response.TripInfoModel
+
+interface EditTripRepository {
+
+    suspend fun getTripInfo(
+        tripId: Long
+    ): Result<TripInfoModel>
+    suspend fun patchEditTripInfo(
+        tripId: Long,
+        request: EditTripRequestModel
+    ): Result<Unit>
+    suspend fun patchQuitTrip(
+        tripId: Long
+    ): Result<Unit>
+}

presentation/src/main/java/com/going/presentation/entertrip/invitetrip/finish/InviteFinishActivity.kt

@@ -80,7 +80,7 @@ class InviteFinishActivity :
             startDate: String,
             endDate: String,
             day: Int,
-        ): Intent = Intent(context, EnterTripActivity::class.java).apply {
+        ): Intent = Intent(context, InviteFinishActivity::class.java).apply {
             putExtra(TRIP_ID, tripId)
             putExtra(TITLE, title)
             putExtra(START, startDate)

presentation/src/main/java/com/going/presentation/todo/change/TodoChangeActivity.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
@@ -15,7 +14,6 @@ import com.going.presentation.R
 import com.going.presentation.databinding.ActivityTodoChangeBinding
 import com.going.presentation.todo.create.TodoCreateActivity.Companion.MAX_MEMO_LEN
 import com.going.presentation.todo.create.TodoCreateActivity.Companion.MAX_TODO_LEN
-import com.going.presentation.todo.detail.TodoDetailActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 import com.going.ui.extension.toast