Merge pull request #158 from Dan-Bam/develop

버전 업그레이드
Dan-Bam · Oct 10, 2023 · 82fda28 · 82fda28
2 parents 7ec16b9 + 6b05cc3
commit 82fda28
Show file tree

Hide file tree

Showing 188 changed files with 460 additions and 483 deletions.
diff --git a/data/src/main/java/com/danbam/data/local/dao/RecentSearchDAO.kt b/data/src/main/java/com/danbam/data/local/dao/RecentSearchDAO.kt
@@ -6,7 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy.REPLACE
 import androidx.room.Query
 import androidx.room.Transaction
-import com.danbam.data.local.entity.RecentSearchEntity
+import com.danbam.data.local.entity.search.RecentSearchEntity
 
 @Dao
 interface RecentSearchDao {

diff --git a/data/src/main/java/com/danbam/data/local/database/IndiStrawDataBase.kt b/data/src/main/java/com/danbam/data/local/database/IndiStrawDataBase.kt
@@ -3,7 +3,7 @@ package com.danbam.data.local.database
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import com.danbam.data.local.dao.RecentSearchDao
-import com.danbam.data.local.entity.RecentSearchEntity
+import com.danbam.data.local.entity.search.RecentSearchEntity
 
 @Database(entities = [RecentSearchEntity::class], version = 1)
 abstract class IndiStrawDataBase : RoomDatabase() {

diff --git a/data/src/main/java/com/danbam/data/local/datasource/SearchLocalDataSource.kt b/data/src/main/java/com/danbam/data/local/datasource/SearchLocalDataSource.kt
@@ -1,6 +1,6 @@
 package com.danbam.data.local.datasource
 
-import com.danbam.data.local.entity.RecentSearchEntity
+import com.danbam.data.local.entity.search.RecentSearchEntity
 
 interface SearchLocalDataSource {
     suspend fun search(recentSearchEntity: RecentSearchEntity)

diff --git a/data/src/main/java/com/danbam/data/local/datasource/SearchLocalDataSourceImpl.kt b/data/src/main/java/com/danbam/data/local/datasource/SearchLocalDataSourceImpl.kt
@@ -1,7 +1,7 @@
 package com.danbam.data.local.datasource
 
 import com.danbam.data.local.dao.RecentSearchDao
-import com.danbam.data.local.entity.RecentSearchEntity
+import com.danbam.data.local.entity.search.RecentSearchEntity
 import javax.inject.Inject
 
 class SearchLocalDataSourceImpl @Inject constructor(

diff --git a/...m/data/local/entity/RecentSearchEntity.kt → ...local/entity/search/RecentSearchEntity.kt b/...m/data/local/entity/RecentSearchEntity.kt → ...local/entity/search/RecentSearchEntity.kt
@@ -1,8 +1,8 @@
-package com.danbam.data.local.entity
+package com.danbam.data.local.entity.search
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.danbam.domain.entity.RecentSearchEntity as RecentSearchDomainEntity
+import com.danbam.domain.entity.search.RecentSearchEntity as RecentSearchDomainEntity
 
 @Entity(tableName = "recent_search")
 data class RecentSearchEntity(

diff --git a/data/src/main/java/com/danbam/data/remote/api/AccountAPI.kt b/data/src/main/java/com/danbam/data/remote/api/AccountAPI.kt
@@ -1,10 +1,10 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.ChangeAddressRequest
-import com.danbam.data.remote.request.ChangePasswordRequest
-import com.danbam.data.remote.request.EditProfileRequest
-import com.danbam.data.remote.response.FindIdResponse
-import com.danbam.data.remote.response.ProfileResponse
+import com.danbam.data.remote.request.auth.ChangeAddressRequest
+import com.danbam.data.remote.request.auth.ChangePasswordRequest
+import com.danbam.data.remote.request.auth.EditProfileRequest
+import com.danbam.data.remote.response.funding.FindIdResponse
+import com.danbam.data.remote.response.auth.ProfileResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body

diff --git a/data/src/main/java/com/danbam/data/remote/api/AddressAPI.kt b/data/src/main/java/com/danbam/data/remote/api/AddressAPI.kt
@@ -1,7 +1,7 @@
 package com.danbam.data.remote.api
 
 import com.danbam.data.BuildConfig
-import com.danbam.data.remote.response.AddressResponse
+import com.danbam.data.remote.response.auth.AddressResponse
 import retrofit2.http.GET
 import retrofit2.http.Query
 import retrofit2.http.Url

diff --git a/data/src/main/java/com/danbam/data/remote/api/AuthAPI.kt b/data/src/main/java/com/danbam/data/remote/api/AuthAPI.kt
@@ -1,8 +1,8 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.LoginRequest
-import com.danbam.data.remote.request.SignUpRequest
-import com.danbam.data.remote.response.LoginResponse
+import com.danbam.data.remote.request.auth.LoginRequest
+import com.danbam.data.remote.request.auth.SignUpRequest
+import com.danbam.data.remote.response.auth.LoginResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body

diff --git a/data/src/main/java/com/danbam/data/remote/api/BannerAPI.kt b/data/src/main/java/com/danbam/data/remote/api/BannerAPI.kt
@@ -1,6 +1,6 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.response.BannerResponse
+import com.danbam.data.remote.response.banner.BannerResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.http.GET
 

diff --git a/data/src/main/java/com/danbam/data/remote/api/CrowdFundingAPI.kt b/data/src/main/java/com/danbam/data/remote/api/CrowdFundingAPI.kt
@@ -1,10 +1,10 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.FundingCreateRequest
-import com.danbam.data.remote.response.FundingPageResponse
-import com.danbam.data.remote.response.FundingDetailResponse
-import com.danbam.data.remote.response.FundingResponse
-import com.danbam.data.remote.response.MyFundingResponse
+import com.danbam.data.remote.request.funding.FundingCreateRequest
+import com.danbam.data.remote.response.funding.FundingPageResponse
+import com.danbam.data.remote.response.funding.FundingDetailResponse
+import com.danbam.data.remote.response.funding.FundingResponse
+import com.danbam.data.remote.response.funding.MyFundingResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body
@@ -24,7 +24,7 @@ interface CrowdFundingAPI {
 
     @GET("${EndPoint.CROWD_FUNDING}/{idx}")
     suspend fun fundingDetail(
-        @Path("idx") fundingIndex: Long
+        @Path("idx") fundingIdx: Long
     ): FundingDetailResponse
 
     @GET("${EndPoint.CROWD_FUNDING}/list")
@@ -36,8 +36,8 @@ interface CrowdFundingAPI {
     @GET("${EndPoint.CROWD_FUNDING}/my")
     suspend fun fundingMy(): List<FundingResponse>
 
-    @GET("${EndPoint.CROWD_FUNDING}/my/{crowdfundingIdx}")
+    @GET("${EndPoint.CROWD_FUNDING}/my/{idx}")
     suspend fun fundingMyDetail(
-        @Path("crowdfundingIdx") crowdfundingIdx: Long
+        @Path("idx") fundingIdx: Long
     ): MyFundingResponse
 }
diff --git a/data/src/main/java/com/danbam/data/remote/api/FileAPI.kt b/data/src/main/java/com/danbam/data/remote/api/FileAPI.kt
@@ -1,6 +1,6 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.response.FileResponse
+import com.danbam.data.remote.response.file.FileResponse
 import com.danbam.data.remote.util.EndPoint
 import okhttp3.MultipartBody
 import retrofit2.http.Multipart

diff --git a/data/src/main/java/com/danbam/data/remote/api/FundingAPI.kt b/data/src/main/java/com/danbam/data/remote/api/FundingAPI.kt
@@ -1,8 +1,8 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.FundingRequest
-import com.danbam.data.remote.response.FundingResponse
-import com.danbam.data.remote.response.ReceiptResponse
+import com.danbam.data.remote.request.funding.FundingRequest
+import com.danbam.data.remote.response.funding.FundingResponse
+import com.danbam.data.remote.response.funding.ReceiptResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body
@@ -16,7 +16,7 @@ interface FundingAPI {
 
     @POST("${EndPoint.FUNDING}/crowdfunding/{crowdfundingIdx}/reword/{rewordIdx}")
     suspend fun funding(
-        @Path("crowdfundingIdx") crowdfundingIdx: Long,
+        @Path("crowdfundingIdx") fundingIdx: Long,
         @Path("rewordIdx") rewardIdx: Long,
         @Body fundingRequest: FundingRequest
     ): Response<Void?>

diff --git a/data/src/main/java/com/danbam/data/remote/api/MovieAPI.kt b/data/src/main/java/com/danbam/data/remote/api/MovieAPI.kt
@@ -1,16 +1,16 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.MovieHistoryRequest
-import com.danbam.data.remote.request.MovieCreateRequest
-import com.danbam.data.remote.request.MoviePeopleRequest
-import com.danbam.data.remote.response.AddMoviePeopleResponse
-import com.danbam.data.remote.response.DetailMovieHistoryResponse
-import com.danbam.data.remote.response.MovieDetailResponse
-import com.danbam.data.remote.response.MovieHistoryResponse
-import com.danbam.data.remote.response.MoviePageResponse
-import com.danbam.data.remote.response.MoviePeopleDetailResponse
-import com.danbam.data.remote.response.MoviePeopleResponse
-import com.danbam.data.remote.response.MovieResponse
+import com.danbam.data.remote.request.movie.MovieHistoryRequest
+import com.danbam.data.remote.request.movie.MovieCreateRequest
+import com.danbam.data.remote.request.movie.MoviePeopleRequest
+import com.danbam.data.remote.response.movie.AddMoviePeopleResponse
+import com.danbam.data.remote.response.movie.DetailMovieHistoryResponse
+import com.danbam.data.remote.response.movie.MovieDetailResponse
+import com.danbam.data.remote.response.movie.MovieHistoryResponse
+import com.danbam.data.remote.response.movie.MoviePageResponse
+import com.danbam.data.remote.response.movie.MoviePeopleDetailResponse
+import com.danbam.data.remote.response.movie.MoviePeopleResponse
+import com.danbam.data.remote.response.movie.MovieResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body
@@ -32,9 +32,9 @@ interface MovieAPI {
         @Query("keyword") genre: String? = null
     ): MoviePageResponse
 
-    @GET("${EndPoint.Movie}/{movieId}/")
+    @GET("${EndPoint.Movie}/{idx}/")
     suspend fun movieDetail(
-        @Path("movieId") movieIdx: Long,
+        @Path("idx") movieIdx: Long,
     ): MovieDetailResponse
 
     @GET("${EndPoint.Movie}/{actorType}/")
@@ -52,7 +52,7 @@ interface MovieAPI {
     @GET("${EndPoint.Movie}/{actorType}/{idx}/")
     suspend fun moviePeopleDetail(
         @Path("actorType") actorType: String,
-        @Path("idx") idx: Long,
+        @Path("idx") actorIdx: Long,
     ): MoviePeopleDetailResponse
 
     @GET("${EndPoint.Movie}/popular/")
@@ -69,8 +69,8 @@ interface MovieAPI {
         @Body movieHistoryRequest: MovieHistoryRequest
     ): Response<Void?>
 
-    @GET("${EndPoint.Movie}/history/{movieIdx}/")
+    @GET("${EndPoint.Movie}/history/{idx}/")
     suspend fun movieHistory(
-        @Path("movieIdx") movieIdx: Long,
+        @Path("idx") movieIdx: Long,
     ): DetailMovieHistoryResponse
 }
diff --git a/data/src/main/java/com/danbam/data/remote/api/QRCodeAPI.kt b/data/src/main/java/com/danbam/data/remote/api/QRCodeAPI.kt
@@ -1,14 +1,11 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.request.CheckQRCodeRequest
-import com.danbam.data.remote.response.GetQRCodeResponse
+import com.danbam.data.remote.request.auth.CheckQRCodeRequest
+import com.danbam.data.remote.response.auth.GetQRCodeResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.Response
 import retrofit2.http.Body
-import retrofit2.http.HEAD
 import retrofit2.http.POST
-import retrofit2.http.Path
-import java.util.UUID
 
 interface QRCodeAPI {
     @POST(EndPoint.QRCODE)

diff --git a/data/src/main/java/com/danbam/data/remote/api/SearchAPI.kt b/data/src/main/java/com/danbam/data/remote/api/SearchAPI.kt
@@ -1,9 +1,9 @@
 package com.danbam.data.remote.api
 
-import com.danbam.data.remote.response.FundingPageResponse
-import com.danbam.data.remote.response.MoviePageResponse
-import com.danbam.data.remote.response.PopularTagResponse
-import com.danbam.data.remote.response.RelatedSearchResponse
+import com.danbam.data.remote.response.funding.FundingPageResponse
+import com.danbam.data.remote.response.movie.MoviePageResponse
+import com.danbam.data.remote.response.search.PopularTagResponse
+import com.danbam.data.remote.response.search.RelatedSearchResponse
 import com.danbam.data.remote.util.EndPoint
 import retrofit2.http.GET
 import retrofit2.http.Query

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AccountRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/AccountRemoteDataSource.kt
@@ -1,10 +1,10 @@
 package com.danbam.data.remote.datasource
 
-import com.danbam.data.remote.request.ChangeAddressRequest
-import com.danbam.data.remote.request.ChangePasswordRequest
-import com.danbam.data.remote.request.EditProfileRequest
-import com.danbam.data.remote.response.FindIdResponse
-import com.danbam.data.remote.response.ProfileResponse
+import com.danbam.data.remote.request.auth.ChangeAddressRequest
+import com.danbam.data.remote.request.auth.ChangePasswordRequest
+import com.danbam.data.remote.request.auth.EditProfileRequest
+import com.danbam.data.remote.response.funding.FindIdResponse
+import com.danbam.data.remote.response.auth.ProfileResponse
 
 interface AccountRemoteDataSource {
     suspend fun findId(phoneNumber: String): FindIdResponse

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AccountRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/AccountRemoteDataSourceImpl.kt
@@ -1,11 +1,11 @@
 package com.danbam.data.remote.datasource
 
 import com.danbam.data.remote.api.AccountAPI
-import com.danbam.data.remote.request.ChangeAddressRequest
-import com.danbam.data.remote.request.ChangePasswordRequest
-import com.danbam.data.remote.request.EditProfileRequest
-import com.danbam.data.remote.response.FindIdResponse
-import com.danbam.data.remote.response.ProfileResponse
+import com.danbam.data.remote.request.auth.ChangeAddressRequest
+import com.danbam.data.remote.request.auth.ChangePasswordRequest
+import com.danbam.data.remote.request.auth.EditProfileRequest
+import com.danbam.data.remote.response.funding.FindIdResponse
+import com.danbam.data.remote.response.auth.ProfileResponse
 import com.danbam.data.remote.util.errorHandling
 import com.danbam.data.remote.util.indiStrawApiCall
 import javax.inject.Inject

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AddressRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/AddressRemoteDataSource.kt
@@ -1,7 +1,7 @@
 package com.danbam.data.remote.datasource
 
 import androidx.paging.PagingData
-import com.danbam.data.remote.response.AddressResponse
+import com.danbam.data.remote.response.auth.AddressResponse
 import kotlinx.coroutines.flow.Flow
 
 interface AddressRemoteDataSource {

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AddressRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/AddressRemoteDataSourceImpl.kt
@@ -5,7 +5,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.danbam.data.remote.api.AddressAPI
 import com.danbam.data.remote.pagingsource.AddressPagingSource
-import com.danbam.data.remote.response.AddressResponse
+import com.danbam.data.remote.response.auth.AddressResponse
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AuthRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/AuthRemoteDataSource.kt
@@ -1,8 +1,8 @@
 package com.danbam.data.remote.datasource
 
-import com.danbam.data.remote.request.LoginRequest
-import com.danbam.data.remote.request.SignUpRequest
-import com.danbam.data.remote.response.LoginResponse
+import com.danbam.data.remote.request.auth.LoginRequest
+import com.danbam.data.remote.request.auth.SignUpRequest
+import com.danbam.data.remote.response.auth.LoginResponse
 
 interface AuthRemoteDataSource {
     suspend fun signup(signUpRequest: SignUpRequest)

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/AuthRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/AuthRemoteDataSourceImpl.kt
@@ -1,9 +1,9 @@
 package com.danbam.data.remote.datasource
 
 import com.danbam.data.remote.api.AuthAPI
-import com.danbam.data.remote.request.LoginRequest
-import com.danbam.data.remote.request.SignUpRequest
-import com.danbam.data.remote.response.LoginResponse
+import com.danbam.data.remote.request.auth.LoginRequest
+import com.danbam.data.remote.request.auth.SignUpRequest
+import com.danbam.data.remote.response.auth.LoginResponse
 import com.danbam.data.remote.util.errorHandling
 import com.danbam.data.remote.util.indiStrawApiCall
 import javax.inject.Inject

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/BannerRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/BannerRemoteDataSource.kt
@@ -1,6 +1,6 @@
 package com.danbam.data.remote.datasource
 
-import com.danbam.data.remote.response.BannerResponse
+import com.danbam.data.remote.response.banner.BannerResponse
 
 interface BannerRemoteDataSource {
     suspend fun getBanner(): List<BannerResponse>

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/BannerRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/BannerRemoteDataSourceImpl.kt
@@ -1,7 +1,7 @@
 package com.danbam.data.remote.datasource
 
 import com.danbam.data.remote.api.BannerAPI
-import com.danbam.data.remote.response.BannerResponse
+import com.danbam.data.remote.response.banner.BannerResponse
 import com.danbam.data.remote.util.indiStrawApiCall
 import javax.inject.Inject
 

diff --git a/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSource.kt
@@ -1,17 +1,17 @@
 package com.danbam.data.remote.datasource
 
 import androidx.paging.PagingData
-import com.danbam.data.remote.request.FundingCreateRequest
-import com.danbam.data.remote.response.FundingDetailResponse
-import com.danbam.data.remote.response.FundingResponse
-import com.danbam.data.remote.response.MyFundingResponse
+import com.danbam.data.remote.request.funding.FundingCreateRequest
+import com.danbam.data.remote.response.funding.FundingDetailResponse
+import com.danbam.data.remote.response.funding.FundingResponse
+import com.danbam.data.remote.response.funding.MyFundingResponse
 import kotlinx.coroutines.flow.Flow
 
 interface CrowdFundingRemoteDataSource {
     suspend fun fundingCreate(fundingCreateRequest: FundingCreateRequest)
     suspend fun fundingPopularList(): List<FundingResponse>
-    suspend fun fundingDetail(fundingIndex: Long): FundingDetailResponse
+    suspend fun fundingDetail(fundingIdx: Long): FundingDetailResponse
     suspend fun fundingAll(): Flow<PagingData<FundingResponse>>
     suspend fun fundingMy(): List<FundingResponse>
-    suspend fun fundingMyDetail(crowdfundingIdx: Long): MyFundingResponse
+    suspend fun fundingMyDetail(fundingIdx: Long): MyFundingResponse
 }