[MOVE/#109] 세연 담당 뷰 패키징 재구성

app/src/main/AndroidManifest.xml

@@ -76,12 +76,12 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.createtrip.EnterPreferenceActivity"
+            android:name="com.going.presentation.entertrip.createtrip.preference.EnterPreferenceActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.invitetrip.FinishPreferenceActivity"
+            android:name="com.going.presentation.entertrip.invitetrip.preference.FinishPreferenceActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -96,12 +96,12 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity"
+            android:name="com.going.presentation.entertrip.invitetrip.invitecode.CreateTripActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.StartTripSplashActivity"
+            android:name="com.going.presentation.entertrip.StartTripSplashActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -126,7 +126,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.createtrip.FinishTripActivity"
+            android:name="com.going.presentation.entertrip.createtrip.finish.FinishTripActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -141,12 +141,12 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity"
+            android:name="com.going.presentation.entertrip.createtrip.choosedate.EnterTripActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity"
+            android:name="com.going.presentation.entertrip.invitetrip.finish.InviteFinishActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -157,4 +157,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -7,7 +7,6 @@ import com.going.data.datasource.EnterTripDataSource
 import com.going.data.datasource.MockDataSource
 import com.going.data.datasource.ProfileDataSource
 import com.going.data.datasource.SettingDataSource
-import com.going.data.datasource.StartInviteTripDataSource
 import com.going.data.datasource.TendencyDataSource
 import com.going.data.datasource.TodoDataSource
 import com.going.data.datasourceImpl.AuthDataSourceImpl
@@ -17,7 +16,6 @@ import com.going.data.datasourceImpl.EnterTripDataSourceImpl
 import com.going.data.datasourceImpl.MockDataSourceImpl
 import com.going.data.datasourceImpl.ProfileDataSourceImpl
 import com.going.data.datasourceImpl.SettingDataSourceImpl
-import com.going.data.datasourceImpl.StartInviteTripDataSourceImpl
 import com.going.data.datasourceImpl.TendencyDataSourceImpl
 import com.going.data.datasourceImpl.TodoDataSourceImpl
 import dagger.Module
@@ -70,11 +68,6 @@ object DataSourceModule {
     fun provideEnterTripDataSource(enterTripDataSourceImpl: EnterTripDataSourceImpl): EnterTripDataSource =
         enterTripDataSourceImpl
 
-    @Provides
-    @Singleton
-    fun provideStartInviteTripDataSource(startInviteTripDataSourceImpl: StartInviteTripDataSourceImpl): StartInviteTripDataSource =
-        startInviteTripDataSourceImpl
-
     @Provides
     @Singleton
     fun provideEnterPreferenceDataSource(enterPreferenceDataSourceImpl: EnterPreferenceDataSourceImpl): EnterPreferenceDataSource =

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

@@ -7,7 +7,6 @@ import com.going.data.repositoryImpl.EnterTripRepositoryImpl
 import com.going.data.repositoryImpl.MockRepositoryImpl
 import com.going.data.repositoryImpl.ProfileRepositoryImpl
 import com.going.data.repositoryImpl.SettingRepositoryImpl
-import com.going.data.repositoryImpl.StartInviteTripRepositoryImpl
 import com.going.data.repositoryImpl.TendencyRepositoryImpl
 import com.going.data.repositoryImpl.TodoRepositoryImpl
 import com.going.data.repositoryImpl.TokenRepositoryImpl
@@ -18,7 +17,6 @@ import com.going.domain.repository.EnterTripRepository
 import com.going.domain.repository.MockRepository
 import com.going.domain.repository.ProfileRepository
 import com.going.domain.repository.SettingRepository
-import com.going.domain.repository.StartInviteTripRepository
 import com.going.domain.repository.TendencyRepository
 import com.going.domain.repository.TodoRepository
 import com.going.domain.repository.TokenRepository
@@ -77,11 +75,6 @@ object RepositoryModule {
     fun provideProfileRepository(profileRepositoryImpl: ProfileRepositoryImpl): ProfileRepository =
         profileRepositoryImpl
 
-    @Provides
-    @Singleton
-    fun provideStartInviteTripRepository(startInviteTripRepositoryImpl: StartInviteTripRepositoryImpl): StartInviteTripRepository =
-        startInviteTripRepositoryImpl
-
     @Provides
     @Singleton
     fun provideEnterPreferenceRepository(enterPreferenceRepositoryImpl: EnterPreferenceRepositoryImpl): EnterPreferenceRepository =

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

@@ -7,7 +7,6 @@ import com.going.data.service.EnterTripService
 import com.going.data.service.MockService
 import com.going.data.service.ProfileService
 import com.going.data.service.SettingService
-import com.going.data.service.StartInviteTripService
 import com.going.data.service.TendencyService
 import com.going.data.service.TodoService
 import dagger.Module
@@ -61,11 +60,6 @@ object ServiceModule {
     fun provideProfileService(retrofit: Retrofit): ProfileService =
         retrofit.create(ProfileService::class.java)
 
-    @Provides
-    @Singleton
-    fun provideStartInviteTripService(retrofit: Retrofit): StartInviteTripService =
-        retrofit.create(StartInviteTripService::class.java)
-
     @Provides
     @Singleton
     fun provideEnterPreferenceService(retrofit: Retrofit): EnterPreferenceService =

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

@@ -2,11 +2,19 @@ package com.going.data.datasource;
 
 import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.EnterTripRequestDto
+import com.going.data.dto.request.StartInviteTripRequestDto
 import com.going.data.dto.response.EnterTripResponseDto
+import com.going.data.dto.response.StartInviteTripResponseDto
 import retrofit2.http.Body
+import retrofit2.http.Path
 
 interface EnterTripDataSource {
     suspend fun postEnterTrip(
         @Body request: EnterTripRequestDto,
     ): BaseResponse<EnterTripResponseDto>
+
+    suspend fun postStartInviteTrip(
+        @Path("tripId") tripId: Long,
+        @Body request: StartInviteTripRequestDto,
+    ): BaseResponse<StartInviteTripResponseDto>
 }

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

@@ -3,7 +3,9 @@ package com.going.data.datasourceImpl
 import com.going.data.datasource.EnterTripDataSource
 import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.EnterTripRequestDto
+import com.going.data.dto.request.StartInviteTripRequestDto
 import com.going.data.dto.response.EnterTripResponseDto
+import com.going.data.dto.response.StartInviteTripResponseDto
 import com.going.data.service.EnterTripService
 import javax.inject.Inject
 
@@ -14,4 +16,10 @@ class EnterTripDataSourceImpl @Inject constructor(
         code: EnterTripRequestDto
     ): BaseResponse<EnterTripResponseDto> =
         enterTripService.postEnterTrip(code)
+
+    override suspend fun postStartInviteTrip(
+        tripId: Long,
+        request: StartInviteTripRequestDto
+    ): BaseResponse<StartInviteTripResponseDto> =
+        enterTripService.postStartInviteTrip(tripId, request)
 }

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

@@ -2,8 +2,11 @@ package com.going.data.repositoryImpl
 
 import com.going.data.datasource.EnterTripDataSource
 import com.going.data.dto.request.toEnterTripRequestDto
+import com.going.data.dto.request.toStartInviteTripRequestDto
 import com.going.domain.entity.request.EnterTripRequestModel
+import com.going.domain.entity.request.StartInviteTripRequestModel
 import com.going.domain.entity.response.EnterTripModel
+import com.going.domain.entity.response.StartInviteTripModel
 import com.going.domain.repository.EnterTripRepository
 import javax.inject.Inject
 
@@ -13,10 +16,17 @@ class EnterTripRepositoryImpl @Inject constructor(
 
     override suspend fun postEnterTrip(
         requestEnterTripModel: EnterTripRequestModel
-    ): Result<EnterTripModel> =
-        runCatching {
-            enterTripDataSource.postEnterTrip(
-                requestEnterTripModel.toEnterTripRequestDto(),
-            ).data.toEnterTripModel()
-        }
+    ): Result<EnterTripModel> = runCatching {
+        enterTripDataSource.postEnterTrip(
+            requestEnterTripModel.toEnterTripRequestDto(),
+        ).data.toEnterTripModel()
+    }
+
+    override suspend fun postStartInviteTrip(
+        tripId: Long, requestStartInviteTripModel: StartInviteTripRequestModel
+    ): Result<StartInviteTripModel> = runCatching {
+        enterTripDataSource.postStartInviteTrip(
+            tripId, requestStartInviteTripModel.toStartInviteTripRequestDto(),
+        ).data.toStartInviteTripModel()
+    }
 }

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

@@ -2,13 +2,22 @@ package com.going.data.service
 
 import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.EnterTripRequestDto
+import com.going.data.dto.request.StartInviteTripRequestDto
 import com.going.data.dto.response.EnterTripResponseDto
+import com.going.data.dto.response.StartInviteTripResponseDto
 import retrofit2.http.Body
 import retrofit2.http.POST
+import retrofit2.http.Path
 
 interface EnterTripService {
     @POST("/api/trips/verify")
     suspend fun postEnterTrip(
         @Body request: EnterTripRequestDto,
     ): BaseResponse<EnterTripResponseDto>
+
+    @POST("/api/trips/{tripId}/entry")
+    suspend fun postStartInviteTrip(
+        @Path("tripId") tripId: Long,
+        @Body request: StartInviteTripRequestDto,
+    ): BaseResponse<StartInviteTripResponseDto>
 }

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

@@ -1,10 +1,17 @@
 package com.going.domain.repository
 
 import com.going.domain.entity.request.EnterTripRequestModel
+import com.going.domain.entity.request.StartInviteTripRequestModel
 import com.going.domain.entity.response.EnterTripModel
+import com.going.domain.entity.response.StartInviteTripModel
 
 interface EnterTripRepository {
     suspend fun postEnterTrip(
         requestEnterTripModel: EnterTripRequestModel
     ): Result<EnterTripModel>
+
+    suspend fun postStartInviteTrip(
+        tripId: Long,
+        requestStartInviteTripModel: StartInviteTripRequestModel
+    ): Result<StartInviteTripModel>
 }

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

@@ -6,7 +6,7 @@ import androidx.activity.viewModels
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityTripDashBoardBinding
 import com.going.presentation.setting.SettingActivity
-import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity
+import com.going.presentation.entertrip.invitetrip.invitecode.CreateTripActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 import com.google.android.material.tabs.TabLayoutMediator

presentation/src/main/java/com/going/presentation/entertrip/starttrip/StartTripSplashActivity.kt → presentation/src/main/java/com/going/presentation/entertrip/StartTripSplashActivity.kt

@@ -1,11 +1,11 @@
-package com.going.presentation.entertrip.starttrip
+package com.going.presentation.entertrip
 
 import android.content.Intent
 import android.os.Bundle
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityStartTripSplashBinding
-import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity
-import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity
+import com.going.presentation.entertrip.createtrip.choosedate.EnterTripActivity
+import com.going.presentation.entertrip.invitetrip.invitecode.CreateTripActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 

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

@@ -1,10 +1,10 @@
-package com.going.presentation.entertrip.starttrip.createtrip
+package com.going.presentation.entertrip.createtrip.choosedate
 
 import android.os.Bundle
 import android.view.View
 import com.going.presentation.R
 import com.going.presentation.databinding.FragmentBottomSheetDateContentBinding
-import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripViewModel
+import com.going.presentation.entertrip.invitetrip.invitecode.CreateTripViewModel
 import com.going.ui.base.BaseBottomSheet
 import com.going.ui.extension.setOnSingleClickListener
 import com.going.ui.extension.toast

presentation/src/main/java/com/going/presentation/entertrip/starttrip/createtrip/EnterTripActivity.kt → presentation/src/main/java/com/going/presentation/entertrip/createtrip/choosedate/EnterTripActivity.kt

@@ -1,4 +1,4 @@
-package com.going.presentation.entertrip.starttrip.createtrip
+package com.going.presentation.entertrip.createtrip.choosedate
 
 import android.content.Intent
 import android.os.Bundle
@@ -10,7 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import com.going.domain.entity.CodeState
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityEnterTripBinding
-import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity
+import com.going.presentation.entertrip.invitetrip.finish.InviteFinishActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
 import com.going.ui.extension.setOnSingleClickListener