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 index 03bba8c3..af474add 100644 --- 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 index bf3ba16f..8da1b02c 100644 --- 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 index 9007cd52..3275dca9 100644 --- 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 index bb91e85f..68235ec1 100644 --- 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/data/src/main/java/com/danbam/data/local/entity/RecentSearchEntity.kt b/data/src/main/java/com/danbam/data/local/entity/search/RecentSearchEntity.kt similarity index 71% rename from data/src/main/java/com/danbam/data/local/entity/RecentSearchEntity.kt rename to data/src/main/java/com/danbam/data/local/entity/search/RecentSearchEntity.kt index 6d7e3742..9d6cd998 100644 --- a/data/src/main/java/com/danbam/data/local/entity/RecentSearchEntity.kt +++ b/data/src/main/java/com/danbam/data/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 index 22005f44..9150e974 100644 --- 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 index e2dae84c..205c89d9 100644 --- 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 index 5af63197..25c04490 100644 --- 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 index 1411f54c..b14ec7cd 100644 --- 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 index e7039489..bd870692 100644 --- 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 - @GET("${EndPoint.CROWD_FUNDING}/my/{crowdfundingIdx}") + @GET("${EndPoint.CROWD_FUNDING}/my/{idx}") suspend fun fundingMyDetail( - @Path("crowdfundingIdx") crowdfundingIdx: Long + @Path("idx") fundingIdx: Long ): MyFundingResponse } \ No newline at end of file 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 index 4111ebad..177e1178 100644 --- 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 index 2b1ecb00..ceb7694c 100644 --- 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 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 index cdae46b3..c566f13e 100644 --- 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 - @GET("${EndPoint.Movie}/history/{movieIdx}/") + @GET("${EndPoint.Movie}/history/{idx}/") suspend fun movieHistory( - @Path("movieIdx") movieIdx: Long, + @Path("idx") movieIdx: Long, ): DetailMovieHistoryResponse } \ No newline at end of file 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 index a6f1b257..e057da1f 100644 --- 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 index fb1557dd..ffa20ef1 100644 --- 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 index 0417672c..3f85ad3c 100644 --- 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 index be51016e..00cd5f42 100644 --- 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 index ff418494..5d4e4c63 100644 --- 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 index 655c699a..7b4667c2 100644 --- 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 index 0c8f146e..1ea96257 100644 --- 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 index b6fa1e8a..74f45362 100644 --- 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 index cf9aecd7..cfbaa595 100644 --- 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 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 index ea4c1677..9e108e20 100644 --- 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 index a75072eb..dbcbc199 100644 --- 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 - suspend fun fundingDetail(fundingIndex: Long): FundingDetailResponse + suspend fun fundingDetail(fundingIdx: Long): FundingDetailResponse suspend fun fundingAll(): Flow> suspend fun fundingMy(): List - suspend fun fundingMyDetail(crowdfundingIdx: Long): MyFundingResponse + suspend fun fundingMyDetail(fundingIdx: Long): MyFundingResponse } \ No newline at end of file diff --git a/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSourceImpl.kt index bd138651..52f3a985 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/CrowdFundingRemoteDataSourceImpl.kt @@ -5,10 +5,10 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.danbam.data.remote.api.CrowdFundingAPI import com.danbam.data.remote.pagingsource.FundingPagingSource -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 com.danbam.data.remote.util.errorHandling import com.danbam.data.remote.util.indiStrawApiCall import kotlinx.coroutines.flow.Flow @@ -27,9 +27,9 @@ class CrowdFundingRemoteDataSourceImpl @Inject constructor( crowdFundingAPI.fundingPopularList() } - override suspend fun fundingDetail(fundingIndex: Long): FundingDetailResponse = + override suspend fun fundingDetail(fundingIdx: Long): FundingDetailResponse = indiStrawApiCall { - crowdFundingAPI.fundingDetail(fundingIndex = fundingIndex) + crowdFundingAPI.fundingDetail(fundingIdx = fundingIdx) } override suspend fun fundingAll(): Flow> = @@ -44,8 +44,8 @@ class CrowdFundingRemoteDataSourceImpl @Inject constructor( crowdFundingAPI.fundingMy() } - override suspend fun fundingMyDetail(crowdfundingIdx: Long): MyFundingResponse = + override suspend fun fundingMyDetail(fundingIdx: Long): MyFundingResponse = indiStrawApiCall { - crowdFundingAPI.fundingMyDetail(crowdfundingIdx = crowdfundingIdx) + crowdFundingAPI.fundingMyDetail(fundingIdx = fundingIdx) } } \ No newline at end of file diff --git a/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSource.kt index 2dee59f3..724a70fd 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSource.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSource.kt @@ -1,6 +1,6 @@ package com.danbam.data.remote.datasource -import com.danbam.data.remote.response.FileResponse +import com.danbam.data.remote.response.file.FileResponse import okhttp3.MultipartBody interface FileRemoteDataSource { diff --git a/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSourceImpl.kt index fca34aee..f95fb411 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/FileRemoteDataSourceImpl.kt @@ -1,7 +1,7 @@ package com.danbam.data.remote.datasource import com.danbam.data.remote.api.FileAPI -import com.danbam.data.remote.response.FileResponse +import com.danbam.data.remote.response.file.FileResponse import com.danbam.data.remote.util.indiStrawApiCall import okhttp3.MultipartBody import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSource.kt index c740efec..17d95216 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSource.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSource.kt @@ -1,11 +1,11 @@ package com.danbam.data.remote.datasource -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 interface FundingRemoteDataSource { suspend fun getReceipt(): ReceiptResponse - suspend fun funding(crowdfundingIdx: Long, rewardIdx: Long, fundingRequest: FundingRequest) + suspend fun funding(fundingIdx: Long, rewardIdx: Long, fundingRequest: FundingRequest) suspend fun fundingList(): List } \ No newline at end of file diff --git a/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSourceImpl.kt index 27e8aaab..10ce7e4f 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/FundingRemoteDataSourceImpl.kt @@ -1,9 +1,9 @@ package com.danbam.data.remote.datasource import com.danbam.data.remote.api.FundingAPI -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.errorHandling import com.danbam.data.remote.util.indiStrawApiCall import javax.inject.Inject @@ -16,12 +16,12 @@ class FundingRemoteDataSourceImpl @Inject constructor( } override suspend fun funding( - crowdfundingIdx: Long, + fundingIdx: Long, rewardIdx: Long, fundingRequest: FundingRequest ) = indiStrawApiCall { fundingAPI.funding( - crowdfundingIdx = crowdfundingIdx, + fundingIdx = fundingIdx, rewardIdx = rewardIdx, fundingRequest = fundingRequest ).errorHandling() diff --git a/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSource.kt index bbc39aa7..2722c7e0 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSource.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSource.kt @@ -1,16 +1,16 @@ package com.danbam.data.remote.datasource import androidx.paging.PagingData -import com.danbam.data.remote.request.MovieCreateRequest -import com.danbam.data.remote.request.MovieHistoryRequest -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.MoviePeopleDetailResponse -import com.danbam.data.remote.response.MoviePeopleResponse -import com.danbam.data.remote.response.MovieResponse +import com.danbam.data.remote.request.movie.MovieCreateRequest +import com.danbam.data.remote.request.movie.MovieHistoryRequest +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.MoviePeopleDetailResponse +import com.danbam.data.remote.response.movie.MoviePeopleResponse +import com.danbam.data.remote.response.movie.MovieResponse import kotlinx.coroutines.flow.Flow interface MovieRemoteDataSource { @@ -18,7 +18,7 @@ interface MovieRemoteDataSource { suspend fun movieList(genre: String? = null): Flow> suspend fun movieDetail(movieIdx: Long): MovieDetailResponse suspend fun searchMoviePeople(actorType: String, name: String): List - suspend fun moviePeopleDetail(actorType: String, idx: Long): MoviePeopleDetailResponse + suspend fun moviePeopleDetail(actorType: String, actorIdx: Long): MoviePeopleDetailResponse suspend fun addMoviePeople( actorType: String, moviePeopleRequest: MoviePeopleRequest diff --git a/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSourceImpl.kt index 9fcfa27c..cf8ec3d0 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/MovieRemoteDataSourceImpl.kt @@ -5,15 +5,15 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.danbam.data.remote.api.MovieAPI import com.danbam.data.remote.pagingsource.MoviePagingSource -import com.danbam.data.remote.request.MovieCreateRequest -import com.danbam.data.remote.request.MovieHistoryRequest -import com.danbam.data.remote.request.MoviePeopleRequest -import com.danbam.data.remote.response.DetailMovieHistoryResponse -import com.danbam.data.remote.response.MoviePeopleDetailResponse -import com.danbam.data.remote.response.MovieDetailResponse -import com.danbam.data.remote.response.MovieHistoryResponse -import com.danbam.data.remote.response.MoviePeopleResponse -import com.danbam.data.remote.response.MovieResponse +import com.danbam.data.remote.request.movie.MovieCreateRequest +import com.danbam.data.remote.request.movie.MovieHistoryRequest +import com.danbam.data.remote.request.movie.MoviePeopleRequest +import com.danbam.data.remote.response.movie.DetailMovieHistoryResponse +import com.danbam.data.remote.response.movie.MoviePeopleDetailResponse +import com.danbam.data.remote.response.movie.MovieDetailResponse +import com.danbam.data.remote.response.movie.MovieHistoryResponse +import com.danbam.data.remote.response.movie.MoviePeopleResponse +import com.danbam.data.remote.response.movie.MovieResponse import com.danbam.data.remote.util.errorHandling import com.danbam.data.remote.util.indiStrawApiCall import kotlinx.coroutines.flow.Flow @@ -53,10 +53,10 @@ class MovieRemoteDataSourceImpl @Inject constructor( override suspend fun moviePeopleDetail( actorType: String, - idx: Long + actorIdx: Long ): MoviePeopleDetailResponse = indiStrawApiCall { - movieAPI.moviePeopleDetail(actorType = actorType, idx = idx) + movieAPI.moviePeopleDetail(actorType = actorType, actorIdx = actorIdx) } override suspend fun movieRecentList(): List = indiStrawApiCall { diff --git a/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSource.kt index 382829fe..55606d20 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSource.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSource.kt @@ -1,7 +1,7 @@ package com.danbam.data.remote.datasource -import com.danbam.data.remote.response.GetQRCodeResponse -import com.danbam.data.remote.response.LoginResponse +import com.danbam.data.remote.response.auth.GetQRCodeResponse +import com.danbam.data.remote.response.auth.LoginResponse import java.util.UUID interface QRCodeRemoteDataSource { diff --git a/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSourceImpl.kt index c6c9e645..978333e9 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/QRCodeRemoteDataSourceImpl.kt @@ -2,9 +2,9 @@ package com.danbam.data.remote.datasource import com.danbam.data.BuildConfig import com.danbam.data.remote.api.QRCodeAPI -import com.danbam.data.remote.request.CheckQRCodeRequest -import com.danbam.data.remote.response.GetQRCodeResponse -import com.danbam.data.remote.response.LoginResponse +import com.danbam.data.remote.request.auth.CheckQRCodeRequest +import com.danbam.data.remote.response.auth.GetQRCodeResponse +import com.danbam.data.remote.response.auth.LoginResponse import com.danbam.data.remote.util.EndPoint import com.danbam.data.remote.util.errorHandling import com.danbam.data.remote.util.indiStrawApiCall @@ -12,7 +12,6 @@ import com.google.gson.Gson import okhttp3.CacheControl import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.Response import okhttp3.sse.EventSource import okhttp3.sse.EventSourceListener import okhttp3.sse.EventSources diff --git a/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSource.kt b/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSource.kt index ca6b67c6..b0441b7d 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSource.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSource.kt @@ -1,12 +1,10 @@ package com.danbam.data.remote.datasource import androidx.paging.PagingData -import com.danbam.data.remote.response.FundingResponse -import com.danbam.data.remote.response.MoviePageResponse -import com.danbam.data.remote.response.MovieResponse -import com.danbam.data.remote.response.PopularTagResponse -import com.danbam.data.remote.response.RelatedSearchResponse -import com.danbam.domain.entity.MovieEntity +import com.danbam.data.remote.response.funding.FundingResponse +import com.danbam.data.remote.response.movie.MovieResponse +import com.danbam.data.remote.response.search.PopularTagResponse +import com.danbam.data.remote.response.search.RelatedSearchResponse import kotlinx.coroutines.flow.Flow interface SearchRemoteDataSource { diff --git a/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSourceImpl.kt b/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSourceImpl.kt index bf18b51e..8049b8da 100644 --- a/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSourceImpl.kt +++ b/data/src/main/java/com/danbam/data/remote/datasource/SearchRemoteDataSourceImpl.kt @@ -6,13 +6,11 @@ import androidx.paging.PagingData import com.danbam.data.remote.api.SearchAPI import com.danbam.data.remote.pagingsource.SearchFundingPagingSource import com.danbam.data.remote.pagingsource.SearchMoviePagingSource -import com.danbam.data.remote.response.FundingResponse -import com.danbam.data.remote.response.MoviePageResponse -import com.danbam.data.remote.response.MovieResponse -import com.danbam.data.remote.response.PopularTagResponse -import com.danbam.data.remote.response.RelatedSearchResponse +import com.danbam.data.remote.response.funding.FundingResponse +import com.danbam.data.remote.response.movie.MovieResponse +import com.danbam.data.remote.response.search.PopularTagResponse +import com.danbam.data.remote.response.search.RelatedSearchResponse import com.danbam.data.remote.util.indiStrawApiCall -import com.danbam.domain.entity.MovieEntity import kotlinx.coroutines.flow.Flow import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/remote/interceptor/IndiStrawInterceptor.kt b/data/src/main/java/com/danbam/data/remote/interceptor/IndiStrawInterceptor.kt index c74b5349..ca00ac13 100644 --- a/data/src/main/java/com/danbam/data/remote/interceptor/IndiStrawInterceptor.kt +++ b/data/src/main/java/com/danbam/data/remote/interceptor/IndiStrawInterceptor.kt @@ -5,7 +5,7 @@ import android.net.ConnectivityManager import android.net.NetworkInfo import com.danbam.data.BuildConfig import com.danbam.data.local.datasource.AuthLocalDataSource -import com.danbam.data.remote.response.LoginResponse +import com.danbam.data.remote.response.auth.LoginResponse import com.danbam.data.util.default import com.danbam.domain.exception.ExpiredTokenException import com.google.gson.Gson diff --git a/data/src/main/java/com/danbam/data/remote/pagingsource/AddressPagingSource.kt b/data/src/main/java/com/danbam/data/remote/pagingsource/AddressPagingSource.kt index 5251642e..0c0bb40a 100644 --- a/data/src/main/java/com/danbam/data/remote/pagingsource/AddressPagingSource.kt +++ b/data/src/main/java/com/danbam/data/remote/pagingsource/AddressPagingSource.kt @@ -3,7 +3,7 @@ package com.danbam.data.remote.pagingsource import androidx.paging.PagingSource import androidx.paging.PagingState import com.danbam.data.remote.api.AddressAPI -import com.danbam.data.remote.response.AddressResponse +import com.danbam.data.remote.response.auth.AddressResponse import javax.inject.Inject class AddressPagingSource( diff --git a/data/src/main/java/com/danbam/data/remote/pagingsource/FundingPagingSource.kt b/data/src/main/java/com/danbam/data/remote/pagingsource/FundingPagingSource.kt index aae817d3..2c213c2e 100644 --- a/data/src/main/java/com/danbam/data/remote/pagingsource/FundingPagingSource.kt +++ b/data/src/main/java/com/danbam/data/remote/pagingsource/FundingPagingSource.kt @@ -3,7 +3,7 @@ package com.danbam.data.remote.pagingsource import androidx.paging.PagingSource import androidx.paging.PagingState import com.danbam.data.remote.api.CrowdFundingAPI -import com.danbam.data.remote.response.FundingResponse +import com.danbam.data.remote.response.funding.FundingResponse import javax.inject.Inject class FundingPagingSource( diff --git a/data/src/main/java/com/danbam/data/remote/pagingsource/MoviePagingSource.kt b/data/src/main/java/com/danbam/data/remote/pagingsource/MoviePagingSource.kt index b74e052c..486ccadc 100644 --- a/data/src/main/java/com/danbam/data/remote/pagingsource/MoviePagingSource.kt +++ b/data/src/main/java/com/danbam/data/remote/pagingsource/MoviePagingSource.kt @@ -3,7 +3,7 @@ package com.danbam.data.remote.pagingsource import androidx.paging.PagingSource import androidx.paging.PagingState import com.danbam.data.remote.api.MovieAPI -import com.danbam.data.remote.response.MovieResponse +import com.danbam.data.remote.response.movie.MovieResponse import javax.inject.Inject class MoviePagingSource( diff --git a/data/src/main/java/com/danbam/data/remote/pagingsource/SearchFundingPagingSource.kt b/data/src/main/java/com/danbam/data/remote/pagingsource/SearchFundingPagingSource.kt index 002be037..fab073de 100644 --- a/data/src/main/java/com/danbam/data/remote/pagingsource/SearchFundingPagingSource.kt +++ b/data/src/main/java/com/danbam/data/remote/pagingsource/SearchFundingPagingSource.kt @@ -3,7 +3,7 @@ package com.danbam.data.remote.pagingsource import androidx.paging.PagingSource import androidx.paging.PagingState import com.danbam.data.remote.api.SearchAPI -import com.danbam.data.remote.response.FundingResponse +import com.danbam.data.remote.response.funding.FundingResponse import javax.inject.Inject class SearchFundingPagingSource( diff --git a/data/src/main/java/com/danbam/data/remote/pagingsource/SearchMoviePagingSource.kt b/data/src/main/java/com/danbam/data/remote/pagingsource/SearchMoviePagingSource.kt index ef448844..a594f230 100644 --- a/data/src/main/java/com/danbam/data/remote/pagingsource/SearchMoviePagingSource.kt +++ b/data/src/main/java/com/danbam/data/remote/pagingsource/SearchMoviePagingSource.kt @@ -3,7 +3,7 @@ package com.danbam.data.remote.pagingsource import androidx.paging.PagingSource import androidx.paging.PagingState import com.danbam.data.remote.api.SearchAPI -import com.danbam.data.remote.response.MovieResponse +import com.danbam.data.remote.response.movie.MovieResponse import javax.inject.Inject class SearchMoviePagingSource( diff --git a/data/src/main/java/com/danbam/data/remote/request/ChangeAddressRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/ChangeAddressRequest.kt similarity index 81% rename from data/src/main/java/com/danbam/data/remote/request/ChangeAddressRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/ChangeAddressRequest.kt index 27138c25..c15a03d3 100644 --- a/data/src/main/java/com/danbam/data/remote/request/ChangeAddressRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/ChangeAddressRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth -import com.danbam.domain.param.ChangeAddressParam +import com.danbam.domain.param.auth.ChangeAddressParam import com.google.gson.annotations.SerializedName data class ChangeAddressRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/ChangePasswordRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/ChangePasswordRequest.kt similarity index 76% rename from data/src/main/java/com/danbam/data/remote/request/ChangePasswordRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/ChangePasswordRequest.kt index 911dbfe4..af4abea1 100644 --- a/data/src/main/java/com/danbam/data/remote/request/ChangePasswordRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/ChangePasswordRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth -import com.danbam.domain.param.ChangePasswordParam +import com.danbam.domain.param.auth.ChangePasswordParam import com.google.gson.annotations.SerializedName data class ChangePasswordRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/CheckQRCodeRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/CheckQRCodeRequest.kt similarity index 77% rename from data/src/main/java/com/danbam/data/remote/request/CheckQRCodeRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/CheckQRCodeRequest.kt index 6d7140e7..3845df2e 100644 --- a/data/src/main/java/com/danbam/data/remote/request/CheckQRCodeRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/CheckQRCodeRequest.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth import com.google.gson.annotations.SerializedName import java.util.UUID diff --git a/data/src/main/java/com/danbam/data/remote/request/EditProfileRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/EditProfileRequest.kt similarity index 75% rename from data/src/main/java/com/danbam/data/remote/request/EditProfileRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/EditProfileRequest.kt index 681e0c16..baa5c6c7 100644 --- a/data/src/main/java/com/danbam/data/remote/request/EditProfileRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/EditProfileRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth -import com.danbam.domain.param.EditProfileParam +import com.danbam.domain.param.auth.EditProfileParam import com.google.gson.annotations.SerializedName data class EditProfileRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/LoginRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/LoginRequest.kt similarity index 71% rename from data/src/main/java/com/danbam/data/remote/request/LoginRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/LoginRequest.kt index 465fdf42..8e02d51b 100644 --- a/data/src/main/java/com/danbam/data/remote/request/LoginRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/LoginRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth -import com.danbam.domain.param.LoginParam +import com.danbam.domain.param.auth.LoginParam import com.google.gson.annotations.SerializedName data class LoginRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/SignUpRequest.kt b/data/src/main/java/com/danbam/data/remote/request/auth/SignUpRequest.kt similarity index 85% rename from data/src/main/java/com/danbam/data/remote/request/SignUpRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/auth/SignUpRequest.kt index b79dc087..4fedc4f0 100644 --- a/data/src/main/java/com/danbam/data/remote/request/SignUpRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/auth/SignUpRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.auth -import com.danbam.domain.param.SignUpParam +import com.danbam.domain.param.auth.SignUpParam import com.google.gson.annotations.SerializedName data class SignUpRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/FundingCreateRequest.kt b/data/src/main/java/com/danbam/data/remote/request/funding/FundingCreateRequest.kt similarity index 95% rename from data/src/main/java/com/danbam/data/remote/request/FundingCreateRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/funding/FundingCreateRequest.kt index 958c732a..2ce90f9a 100644 --- a/data/src/main/java/com/danbam/data/remote/request/FundingCreateRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/funding/FundingCreateRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.funding -import com.danbam.domain.param.FundingCreateParam +import com.danbam.domain.param.funding.FundingCreateParam import com.google.gson.annotations.SerializedName data class FundingCreateRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/FundingRequest.kt b/data/src/main/java/com/danbam/data/remote/request/funding/FundingRequest.kt similarity index 79% rename from data/src/main/java/com/danbam/data/remote/request/FundingRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/funding/FundingRequest.kt index 416efbf4..07ad70f6 100644 --- a/data/src/main/java/com/danbam/data/remote/request/FundingRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/funding/FundingRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.funding -import com.danbam.domain.param.FundingParam +import com.danbam.domain.param.funding.FundingParam import com.google.gson.annotations.SerializedName data class FundingRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/MovieCreateRequest.kt b/data/src/main/java/com/danbam/data/remote/request/movie/MovieCreateRequest.kt similarity index 89% rename from data/src/main/java/com/danbam/data/remote/request/MovieCreateRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/movie/MovieCreateRequest.kt index 1eabe8b3..704ea0cc 100644 --- a/data/src/main/java/com/danbam/data/remote/request/MovieCreateRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/movie/MovieCreateRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.movie -import com.danbam.domain.param.MovieCreateParam +import com.danbam.domain.param.movie.MovieCreateParam import com.google.gson.annotations.SerializedName data class MovieCreateRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/MovieHistoryRequest.kt b/data/src/main/java/com/danbam/data/remote/request/movie/MovieHistoryRequest.kt similarity index 75% rename from data/src/main/java/com/danbam/data/remote/request/MovieHistoryRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/movie/MovieHistoryRequest.kt index 577bd11c..085ed71a 100644 --- a/data/src/main/java/com/danbam/data/remote/request/MovieHistoryRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/movie/MovieHistoryRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.movie -import com.danbam.domain.param.MovieHistoryParam +import com.danbam.domain.param.movie.MovieHistoryParam import com.google.gson.annotations.SerializedName data class MovieHistoryRequest( diff --git a/data/src/main/java/com/danbam/data/remote/request/MoviePeopleRequest.kt b/data/src/main/java/com/danbam/data/remote/request/movie/MoviePeopleRequest.kt similarity index 75% rename from data/src/main/java/com/danbam/data/remote/request/MoviePeopleRequest.kt rename to data/src/main/java/com/danbam/data/remote/request/movie/MoviePeopleRequest.kt index a41328eb..b0506ceb 100644 --- a/data/src/main/java/com/danbam/data/remote/request/MoviePeopleRequest.kt +++ b/data/src/main/java/com/danbam/data/remote/request/movie/MoviePeopleRequest.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.request +package com.danbam.data.remote.request.movie -import com.danbam.domain.param.MoviePeopleParam +import com.danbam.domain.param.movie.MoviePeopleParam import com.google.gson.annotations.SerializedName data class MoviePeopleRequest( diff --git a/data/src/main/java/com/danbam/data/remote/response/AddressResponse.kt b/data/src/main/java/com/danbam/data/remote/response/auth/AddressResponse.kt similarity index 86% rename from data/src/main/java/com/danbam/data/remote/response/AddressResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/auth/AddressResponse.kt index 44b7e85c..9511fd83 100644 --- a/data/src/main/java/com/danbam/data/remote/response/AddressResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/auth/AddressResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.auth -import com.danbam.domain.entity.AddressEntity +import com.danbam.domain.entity.auth.AddressEntity import com.google.gson.annotations.SerializedName data class AddressResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/GetQRCodeResponse.kt b/data/src/main/java/com/danbam/data/remote/response/auth/GetQRCodeResponse.kt similarity index 77% rename from data/src/main/java/com/danbam/data/remote/response/GetQRCodeResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/auth/GetQRCodeResponse.kt index c2ea8866..3317172e 100644 --- a/data/src/main/java/com/danbam/data/remote/response/GetQRCodeResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/auth/GetQRCodeResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.auth import com.google.gson.annotations.SerializedName import java.util.UUID diff --git a/data/src/main/java/com/danbam/data/remote/response/LoginResponse.kt b/data/src/main/java/com/danbam/data/remote/response/auth/LoginResponse.kt similarity index 82% rename from data/src/main/java/com/danbam/data/remote/response/LoginResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/auth/LoginResponse.kt index a6902c5d..eac5e349 100644 --- a/data/src/main/java/com/danbam/data/remote/response/LoginResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/auth/LoginResponse.kt @@ -1,8 +1,7 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.auth -import com.danbam.domain.entity.LoginEntity +import com.danbam.domain.entity.auth.LoginEntity import com.google.gson.annotations.SerializedName -import java.time.LocalDateTime data class LoginResponse( @SerializedName("accessToken") diff --git a/data/src/main/java/com/danbam/data/remote/response/ProfileResponse.kt b/data/src/main/java/com/danbam/data/remote/response/auth/ProfileResponse.kt similarity index 86% rename from data/src/main/java/com/danbam/data/remote/response/ProfileResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/auth/ProfileResponse.kt index ec84cb78..01295588 100644 --- a/data/src/main/java/com/danbam/data/remote/response/ProfileResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/auth/ProfileResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.auth -import com.danbam.domain.entity.ProfileEntity +import com.danbam.domain.entity.auth.ProfileEntity import com.google.gson.annotations.SerializedName data class ProfileResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/BannerResponse.kt b/data/src/main/java/com/danbam/data/remote/response/banner/BannerResponse.kt similarity index 69% rename from data/src/main/java/com/danbam/data/remote/response/BannerResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/banner/BannerResponse.kt index 1698625b..a9481608 100644 --- a/data/src/main/java/com/danbam/data/remote/response/BannerResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/banner/BannerResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.banner -import com.danbam.domain.entity.BannerEntity +import com.danbam.domain.entity.banner.BannerEntity import com.google.gson.annotations.SerializedName data class BannerResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/FileResponse.kt b/data/src/main/java/com/danbam/data/remote/response/file/FileResponse.kt similarity index 72% rename from data/src/main/java/com/danbam/data/remote/response/FileResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/file/FileResponse.kt index 28ec9056..4c87e992 100644 --- a/data/src/main/java/com/danbam/data/remote/response/FileResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/file/FileResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.file -import com.danbam.domain.entity.FileEntity +import com.danbam.domain.entity.file.FileEntity import com.google.gson.annotations.SerializedName data class FileResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/FindIdResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/FindIdResponse.kt similarity index 65% rename from data/src/main/java/com/danbam/data/remote/response/FindIdResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/FindIdResponse.kt index 83977875..eb4cd4fb 100644 --- a/data/src/main/java/com/danbam/data/remote/response/FindIdResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/FindIdResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding -import com.danbam.domain.entity.FindIdEntity +import com.danbam.domain.entity.auth.FindIdEntity import com.google.gson.annotations.SerializedName data class FindIdResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/FundingDetailResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/FundingDetailResponse.kt similarity index 96% rename from data/src/main/java/com/danbam/data/remote/response/FundingDetailResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/FundingDetailResponse.kt index ce2c0808..6ac57284 100644 --- a/data/src/main/java/com/danbam/data/remote/response/FundingDetailResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/FundingDetailResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding -import com.danbam.domain.entity.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingDetailEntity import com.google.gson.annotations.SerializedName import java.util.UUID diff --git a/data/src/main/java/com/danbam/data/remote/response/FundingPageResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/FundingPageResponse.kt similarity index 81% rename from data/src/main/java/com/danbam/data/remote/response/FundingPageResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/FundingPageResponse.kt index e828c2da..043daa40 100644 --- a/data/src/main/java/com/danbam/data/remote/response/FundingPageResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/FundingPageResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding import com.google.gson.annotations.SerializedName diff --git a/data/src/main/java/com/danbam/data/remote/response/FundingResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/FundingResponse.kt similarity index 85% rename from data/src/main/java/com/danbam/data/remote/response/FundingResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/FundingResponse.kt index 1385e03b..a98cb387 100644 --- a/data/src/main/java/com/danbam/data/remote/response/FundingResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/FundingResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding -import com.danbam.domain.entity.FundingEntity +import com.danbam.domain.entity.funding.FundingEntity import com.google.gson.annotations.SerializedName data class FundingResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/MyFundingResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/MyFundingResponse.kt similarity index 96% rename from data/src/main/java/com/danbam/data/remote/response/MyFundingResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/MyFundingResponse.kt index d20ecb97..367279f2 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MyFundingResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/MyFundingResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding -import com.danbam.domain.entity.MyFundingEntity +import com.danbam.domain.entity.funding.MyFundingEntity import com.google.gson.annotations.SerializedName import java.util.UUID diff --git a/data/src/main/java/com/danbam/data/remote/response/ReceiptResponse.kt b/data/src/main/java/com/danbam/data/remote/response/funding/ReceiptResponse.kt similarity index 74% rename from data/src/main/java/com/danbam/data/remote/response/ReceiptResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/funding/ReceiptResponse.kt index 70d14af2..a3741905 100644 --- a/data/src/main/java/com/danbam/data/remote/response/ReceiptResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/funding/ReceiptResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.funding import com.google.gson.annotations.SerializedName diff --git a/data/src/main/java/com/danbam/data/remote/response/AddMoviePeopleResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/AddMoviePeopleResponse.kt similarity index 75% rename from data/src/main/java/com/danbam/data/remote/response/AddMoviePeopleResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/AddMoviePeopleResponse.kt index 75eb319d..d5f9476d 100644 --- a/data/src/main/java/com/danbam/data/remote/response/AddMoviePeopleResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/AddMoviePeopleResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie import com.google.gson.annotations.SerializedName diff --git a/data/src/main/java/com/danbam/data/remote/response/DetailMovieHistoryResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/DetailMovieHistoryResponse.kt similarity index 70% rename from data/src/main/java/com/danbam/data/remote/response/DetailMovieHistoryResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/DetailMovieHistoryResponse.kt index d4068c99..1969dbd1 100644 --- a/data/src/main/java/com/danbam/data/remote/response/DetailMovieHistoryResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/DetailMovieHistoryResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.DetailMovieHistoryEntity +import com.danbam.domain.entity.movie.DetailMovieHistoryEntity import com.google.gson.annotations.SerializedName data class DetailMovieHistoryResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/MovieDetailResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MovieDetailResponse.kt similarity index 90% rename from data/src/main/java/com/danbam/data/remote/response/MovieDetailResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MovieDetailResponse.kt index f3a03c93..77f05b37 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MovieDetailResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MovieDetailResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.MovieDetailEntity +import com.danbam.domain.entity.movie.MovieDetailEntity import com.google.gson.annotations.SerializedName data class MovieDetailResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/MovieHistoryResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MovieHistoryResponse.kt similarity index 82% rename from data/src/main/java/com/danbam/data/remote/response/MovieHistoryResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MovieHistoryResponse.kt index 4afa96b2..73fb4b45 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MovieHistoryResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MovieHistoryResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.MovieHistoryEntity +import com.danbam.domain.entity.movie.MovieHistoryEntity import com.google.gson.annotations.SerializedName data class MovieHistoryResponse( diff --git a/data/src/main/java/com/danbam/data/remote/response/MoviePageResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePageResponse.kt similarity index 81% rename from data/src/main/java/com/danbam/data/remote/response/MoviePageResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MoviePageResponse.kt index 34da081a..34272b5c 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MoviePageResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePageResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie import com.google.gson.annotations.SerializedName diff --git a/data/src/main/java/com/danbam/data/remote/response/MoviePeopleDetailResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleDetailResponse.kt similarity index 74% rename from data/src/main/java/com/danbam/data/remote/response/MoviePeopleDetailResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleDetailResponse.kt index 30461d79..b9d73883 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MoviePeopleDetailResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleDetailResponse.kt @@ -1,11 +1,11 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.MoviePeopleDetailEntity +import com.danbam.domain.entity.movie.MoviePeopleDetailEntity import com.google.gson.annotations.SerializedName data class MoviePeopleDetailResponse( @SerializedName("idx") - val idx: Long, + val actorIdx: Long, @SerializedName("name") val name: String, @SerializedName("profileUrl") @@ -15,7 +15,7 @@ data class MoviePeopleDetailResponse( ) fun MoviePeopleDetailResponse.toEntity() = MoviePeopleDetailEntity( - idx = idx, + actorIdx = actorIdx, name = name, profileUrl = profileUrl, movieList = movieList.map { it.toEntity() } diff --git a/data/src/main/java/com/danbam/data/remote/response/MoviePeopleResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleResponse.kt similarity index 68% rename from data/src/main/java/com/danbam/data/remote/response/MoviePeopleResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleResponse.kt index 670d4355..5b68674d 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MoviePeopleResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MoviePeopleResponse.kt @@ -1,11 +1,11 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.MoviePeopleEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity import com.google.gson.annotations.SerializedName data class MoviePeopleResponse( @SerializedName("idx") - val idx: Long, + val actorIdx: Long, @SerializedName("name") val name: String, @SerializedName("profileUrl") @@ -13,7 +13,7 @@ data class MoviePeopleResponse( ) fun MoviePeopleResponse.toEntity() = MoviePeopleEntity( - idx = idx, + actorIdx = actorIdx, name = name, profileUrl = profileUrl ) \ No newline at end of file diff --git a/data/src/main/java/com/danbam/data/remote/response/MovieResponse.kt b/data/src/main/java/com/danbam/data/remote/response/movie/MovieResponse.kt similarity index 63% rename from data/src/main/java/com/danbam/data/remote/response/MovieResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/movie/MovieResponse.kt index be241470..e7a76a54 100644 --- a/data/src/main/java/com/danbam/data/remote/response/MovieResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/movie/MovieResponse.kt @@ -1,16 +1,16 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.movie -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieEntity import com.google.gson.annotations.SerializedName data class MovieResponse( @SerializedName("idx") - val idx: Long, + val movieIdx: Long, @SerializedName("thumbnailUrl") val thumbnailUrl: String, ) fun MovieResponse.toEntity() = MovieEntity( - idx = idx, + movieIdx = movieIdx, thumbnailUrl = thumbnailUrl ) diff --git a/data/src/main/java/com/danbam/data/remote/response/PopularTagResponse.kt b/data/src/main/java/com/danbam/data/remote/response/search/PopularTagResponse.kt similarity index 75% rename from data/src/main/java/com/danbam/data/remote/response/PopularTagResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/search/PopularTagResponse.kt index d9644d79..ca4c3fa0 100644 --- a/data/src/main/java/com/danbam/data/remote/response/PopularTagResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/search/PopularTagResponse.kt @@ -1,4 +1,4 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.search import com.google.gson.annotations.SerializedName diff --git a/data/src/main/java/com/danbam/data/remote/response/RelatedSearchResponse.kt b/data/src/main/java/com/danbam/data/remote/response/search/RelatedSearchResponse.kt similarity index 72% rename from data/src/main/java/com/danbam/data/remote/response/RelatedSearchResponse.kt rename to data/src/main/java/com/danbam/data/remote/response/search/RelatedSearchResponse.kt index 71e124aa..2170bc32 100644 --- a/data/src/main/java/com/danbam/data/remote/response/RelatedSearchResponse.kt +++ b/data/src/main/java/com/danbam/data/remote/response/search/RelatedSearchResponse.kt @@ -1,6 +1,6 @@ -package com.danbam.data.remote.response +package com.danbam.data.remote.response.search -import com.danbam.domain.entity.RelatedSearchEntity +import com.danbam.domain.entity.search.RelatedSearchEntity import com.google.gson.annotations.SerializedName data class RelatedSearchResponse( diff --git a/data/src/main/java/com/danbam/data/repository/AccountRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/AccountRepositoryImpl.kt index a1ee77ff..566a8fb0 100644 --- a/data/src/main/java/com/danbam/data/repository/AccountRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/AccountRepositoryImpl.kt @@ -1,13 +1,14 @@ package com.danbam.data.repository import com.danbam.data.remote.datasource.AccountRemoteDataSource -import com.danbam.data.remote.request.toRequest -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.FindIdEntity -import com.danbam.domain.entity.ProfileEntity -import com.danbam.domain.param.ChangeAddressParam -import com.danbam.domain.param.ChangePasswordParam -import com.danbam.domain.param.EditProfileParam +import com.danbam.data.remote.request.auth.toRequest +import com.danbam.data.remote.response.auth.toEntity +import com.danbam.data.remote.response.funding.toEntity +import com.danbam.domain.entity.auth.FindIdEntity +import com.danbam.domain.entity.auth.ProfileEntity +import com.danbam.domain.param.auth.ChangeAddressParam +import com.danbam.domain.param.auth.ChangePasswordParam +import com.danbam.domain.param.auth.EditProfileParam import com.danbam.domain.repository.AccountRepository import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/repository/AddressRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/AddressRepositoryImpl.kt index 581a0202..4f577f9e 100644 --- a/data/src/main/java/com/danbam/data/repository/AddressRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/AddressRepositoryImpl.kt @@ -3,8 +3,8 @@ package com.danbam.data.repository import androidx.paging.PagingData import androidx.paging.map import com.danbam.data.remote.datasource.AddressRemoteDataSource -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.AddressEntity +import com.danbam.data.remote.response.auth.toEntity +import com.danbam.domain.entity.auth.AddressEntity import com.danbam.domain.repository.AddressRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/data/src/main/java/com/danbam/data/repository/AuthRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/AuthRepositoryImpl.kt index 5c30f848..4f2543d1 100644 --- a/data/src/main/java/com/danbam/data/repository/AuthRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/AuthRepositoryImpl.kt @@ -2,12 +2,12 @@ package com.danbam.data.repository import com.danbam.data.local.datasource.AuthLocalDataSource import com.danbam.data.remote.datasource.AuthRemoteDataSource -import com.danbam.data.remote.request.toRequest -import com.danbam.data.remote.response.LoginResponse +import com.danbam.data.remote.request.auth.toRequest +import com.danbam.data.remote.response.auth.LoginResponse import com.danbam.data.util.default import com.danbam.domain.exception.ExpiredTokenException -import com.danbam.domain.param.LoginParam -import com.danbam.domain.param.SignUpParam +import com.danbam.domain.param.auth.LoginParam +import com.danbam.domain.param.auth.SignUpParam import com.danbam.domain.repository.AuthRepository import java.time.LocalDateTime import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/repository/BannerRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/BannerRepositoryImpl.kt index 8d5d07ad..9d3725cc 100644 --- a/data/src/main/java/com/danbam/data/repository/BannerRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/BannerRepositoryImpl.kt @@ -1,8 +1,8 @@ package com.danbam.data.repository import com.danbam.data.remote.datasource.BannerRemoteDataSource -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.BannerEntity +import com.danbam.data.remote.response.banner.toEntity +import com.danbam.domain.entity.banner.BannerEntity import com.danbam.domain.repository.BannerRepository import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/repository/CrowdFundingRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/CrowdFundingRepositoryImpl.kt index 568b0c73..9a781822 100644 --- a/data/src/main/java/com/danbam/data/repository/CrowdFundingRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/CrowdFundingRepositoryImpl.kt @@ -3,12 +3,12 @@ package com.danbam.data.repository import androidx.paging.PagingData import androidx.paging.map import com.danbam.data.remote.datasource.CrowdFundingRemoteDataSource -import com.danbam.data.remote.request.toRequest -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.FundingDetailEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MyFundingEntity -import com.danbam.domain.param.FundingCreateParam +import com.danbam.data.remote.request.funding.toRequest +import com.danbam.data.remote.response.funding.toEntity +import com.danbam.domain.entity.funding.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.funding.MyFundingEntity +import com.danbam.domain.param.funding.FundingCreateParam import com.danbam.domain.repository.CrowdFundingRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @@ -23,8 +23,8 @@ class CrowdFundingRepositoryImpl @Inject constructor( override suspend fun fundingPopularList(): List = crowdFundingRemoteDataSource.fundingPopularList().map { it.toEntity() } - override suspend fun fundingDetail(fundingIndex: Long): FundingDetailEntity = - crowdFundingRemoteDataSource.fundingDetail(fundingIndex = fundingIndex).toEntity() + override suspend fun fundingDetail(fundingIdx: Long): FundingDetailEntity = + crowdFundingRemoteDataSource.fundingDetail(fundingIdx = fundingIdx).toEntity() override suspend fun fundingAll(): Flow> = crowdFundingRemoteDataSource.fundingAll().map { it.map { it.toEntity() } } @@ -32,6 +32,6 @@ class CrowdFundingRepositoryImpl @Inject constructor( override suspend fun fundingMy(): List = crowdFundingRemoteDataSource.fundingMy().map { it.toEntity() } - override suspend fun fundingMyDetail(crowdfundingIdx: Long): MyFundingEntity = - crowdFundingRemoteDataSource.fundingMyDetail(crowdfundingIdx = crowdfundingIdx).toEntity() + override suspend fun fundingMyDetail(fundingIdx: Long): MyFundingEntity = + crowdFundingRemoteDataSource.fundingMyDetail(fundingIdx = fundingIdx).toEntity() } \ No newline at end of file diff --git a/data/src/main/java/com/danbam/data/repository/FileRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/FileRepositoryImpl.kt index fc776992..803505e7 100644 --- a/data/src/main/java/com/danbam/data/repository/FileRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/FileRepositoryImpl.kt @@ -1,9 +1,9 @@ package com.danbam.data.repository import com.danbam.data.remote.datasource.FileRemoteDataSource -import com.danbam.data.remote.response.toEntity +import com.danbam.data.remote.response.file.toEntity import com.danbam.data.util.toMultipartBody -import com.danbam.domain.entity.FileEntity +import com.danbam.domain.entity.file.FileEntity import com.danbam.domain.repository.FileRepository import java.io.File import javax.inject.Inject diff --git a/data/src/main/java/com/danbam/data/repository/FundingRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/FundingRepositoryImpl.kt index 31196afa..799b55d3 100644 --- a/data/src/main/java/com/danbam/data/repository/FundingRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/FundingRepositoryImpl.kt @@ -1,10 +1,10 @@ package com.danbam.data.repository import com.danbam.data.remote.datasource.FundingRemoteDataSource -import com.danbam.data.remote.request.toRequest -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.param.FundingParam +import com.danbam.data.remote.request.funding.toRequest +import com.danbam.data.remote.response.funding.toEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.param.funding.FundingParam import com.danbam.domain.repository.FundingRepository import javax.inject.Inject @@ -13,11 +13,11 @@ class FundingRepositoryImpl @Inject constructor( ) : FundingRepository { override suspend fun getReceipt(): String = fundingRemoteDataSource.getReceipt().receiptId override suspend fun funding( - crowdfundingIdx: Long, + fundingIdx: Long, rewardIdx: Long, fundingParam: FundingParam ) = fundingRemoteDataSource.funding( - crowdfundingIdx = crowdfundingIdx, + fundingIdx = fundingIdx, rewardIdx = rewardIdx, fundingRequest = fundingParam.toRequest() ) diff --git a/data/src/main/java/com/danbam/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/MovieRepositoryImpl.kt index ff800950..de41479a 100644 --- a/data/src/main/java/com/danbam/data/repository/MovieRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/MovieRepositoryImpl.kt @@ -3,17 +3,17 @@ package com.danbam.data.repository import androidx.paging.PagingData import androidx.paging.map import com.danbam.data.remote.datasource.MovieRemoteDataSource -import com.danbam.data.remote.request.toRequest -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.DetailMovieHistoryEntity -import com.danbam.domain.entity.MovieDetailEntity -import com.danbam.domain.entity.MovieEntity -import com.danbam.domain.entity.MovieHistoryEntity -import com.danbam.domain.entity.MoviePeopleDetailEntity -import com.danbam.domain.entity.MoviePeopleEntity -import com.danbam.domain.param.MovieCreateParam -import com.danbam.domain.param.MovieHistoryParam -import com.danbam.domain.param.MoviePeopleParam +import com.danbam.data.remote.request.movie.toRequest +import com.danbam.data.remote.response.movie.toEntity +import com.danbam.domain.entity.movie.DetailMovieHistoryEntity +import com.danbam.domain.entity.movie.MovieDetailEntity +import com.danbam.domain.entity.movie.MovieEntity +import com.danbam.domain.entity.movie.MovieHistoryEntity +import com.danbam.domain.entity.movie.MoviePeopleDetailEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity +import com.danbam.domain.param.movie.MovieCreateParam +import com.danbam.domain.param.movie.MovieHistoryParam +import com.danbam.domain.param.movie.MoviePeopleParam import com.danbam.domain.repository.MovieRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @@ -44,8 +44,8 @@ class MovieRepositoryImpl @Inject constructor( moviePeopleRequest = moviePeopleParam.toRequest() ).actorIdx - override suspend fun moviePeopleDetail(actorType: String, idx: Long): MoviePeopleDetailEntity = - movieRemoteDataSource.moviePeopleDetail(actorType = actorType, idx = idx).toEntity() + override suspend fun moviePeopleDetail(actorType: String, actorIdx: Long): MoviePeopleDetailEntity = + movieRemoteDataSource.moviePeopleDetail(actorType = actorType, actorIdx = actorIdx).toEntity() override suspend fun movieRecentList(): List = movieRemoteDataSource.movieRecentList().map { it.toEntity() } diff --git a/data/src/main/java/com/danbam/data/repository/SearchRepositoryImpl.kt b/data/src/main/java/com/danbam/data/repository/SearchRepositoryImpl.kt index 94bc6df0..5e2bbb22 100644 --- a/data/src/main/java/com/danbam/data/repository/SearchRepositoryImpl.kt +++ b/data/src/main/java/com/danbam/data/repository/SearchRepositoryImpl.kt @@ -3,14 +3,16 @@ package com.danbam.data.repository import androidx.paging.PagingData import androidx.paging.map import com.danbam.data.local.datasource.SearchLocalDataSource -import com.danbam.data.local.entity.toDB -import com.danbam.data.local.entity.toDomain +import com.danbam.data.local.entity.search.toDB +import com.danbam.data.local.entity.search.toDomain import com.danbam.data.remote.datasource.SearchRemoteDataSource -import com.danbam.data.remote.response.toEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity -import com.danbam.domain.entity.RecentSearchEntity -import com.danbam.domain.entity.RelatedSearchEntity +import com.danbam.data.remote.response.funding.toEntity +import com.danbam.data.remote.response.movie.toEntity +import com.danbam.data.remote.response.search.toEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity +import com.danbam.domain.entity.search.RecentSearchEntity +import com.danbam.domain.entity.search.RelatedSearchEntity import com.danbam.domain.repository.SearchRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/design-system/src/main/java/com/danbam/design_system/component/Item.kt b/design-system/src/main/java/com/danbam/design_system/component/Item.kt index c8087eb4..d503071a 100644 --- a/design-system/src/main/java/com/danbam/design_system/component/Item.kt +++ b/design-system/src/main/java/com/danbam/design_system/component/Item.kt @@ -2,17 +2,12 @@ package com.danbam.design_system.component import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.background -import androidx.compose.foundation.indication -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -20,9 +15,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -43,10 +36,10 @@ import com.danbam.design_system.attribute.IndiStrawIcon import com.danbam.design_system.attribute.IndiStrawIconList import com.danbam.design_system.util.indiStrawClickable import com.danbam.design_system.util.toCommaString -import com.danbam.domain.entity.FundingDetailEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity -import com.danbam.domain.entity.MyFundingEntity +import com.danbam.domain.entity.funding.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity +import com.danbam.domain.entity.funding.MyFundingEntity sealed class RewardType { object Default : RewardType() @@ -114,7 +107,7 @@ fun MovieItem( .height(150.dp), imgSrc = item.thumbnailUrl, shape = Shape.Rectangle, - onClick = { onClickItem(item.idx) } + onClick = { onClickItem(item.movieIdx) } ) } diff --git a/design-system/src/main/java/com/danbam/design_system/component/List.kt b/design-system/src/main/java/com/danbam/design_system/component/List.kt index 9480ab41..bc9ed3fd 100644 --- a/design-system/src/main/java/com/danbam/design_system/component/List.kt +++ b/design-system/src/main/java/com/danbam/design_system/component/List.kt @@ -30,7 +30,7 @@ import com.danbam.design_system.util.RemoveOverScrollLazyRow import com.danbam.design_system.util.indiStrawClickable import com.danbam.design_system.util.rememberLauncher import com.danbam.design_system.util.typedLaunch -import com.danbam.domain.entity.MoviePeopleEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity @Composable fun AddImageList( diff --git a/design-system/src/main/java/com/danbam/design_system/component/TabLayout.kt b/design-system/src/main/java/com/danbam/design_system/component/TabLayout.kt index c7a64cc2..66c39c6b 100644 --- a/design-system/src/main/java/com/danbam/design_system/component/TabLayout.kt +++ b/design-system/src/main/java/com/danbam/design_system/component/TabLayout.kt @@ -36,8 +36,8 @@ import com.danbam.design_system.R import com.danbam.design_system.util.RemoveOverScrollLazyRow import com.danbam.design_system.util.indiStrawClickable import com.danbam.design_system.util.toDp -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.withContext diff --git a/domain/src/main/java/com/danbam/domain/entity/MovieEntity.kt b/domain/src/main/java/com/danbam/domain/entity/MovieEntity.kt deleted file mode 100644 index 40f3e8ca..00000000 --- a/domain/src/main/java/com/danbam/domain/entity/MovieEntity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.danbam.domain.entity - -data class MovieEntity( - val idx: Long, - val thumbnailUrl: String, -) \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/entity/AddressEntity.kt b/domain/src/main/java/com/danbam/domain/entity/auth/AddressEntity.kt similarity index 74% rename from domain/src/main/java/com/danbam/domain/entity/AddressEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/auth/AddressEntity.kt index ee41fd53..26e62fa7 100644 --- a/domain/src/main/java/com/danbam/domain/entity/AddressEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/auth/AddressEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.auth data class AddressEntity( val zipcode: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/FindIdEntity.kt b/domain/src/main/java/com/danbam/domain/entity/auth/FindIdEntity.kt similarity index 55% rename from domain/src/main/java/com/danbam/domain/entity/FindIdEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/auth/FindIdEntity.kt index d61645dd..1e79b9ec 100644 --- a/domain/src/main/java/com/danbam/domain/entity/FindIdEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/auth/FindIdEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.auth data class FindIdEntity( val id: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/LoginEntity.kt b/domain/src/main/java/com/danbam/domain/entity/auth/LoginEntity.kt similarity index 80% rename from domain/src/main/java/com/danbam/domain/entity/LoginEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/auth/LoginEntity.kt index 4957a864..21064e6e 100644 --- a/domain/src/main/java/com/danbam/domain/entity/LoginEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/auth/LoginEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.auth data class LoginEntity( val accessToken: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/ProfileEntity.kt b/domain/src/main/java/com/danbam/domain/entity/auth/ProfileEntity.kt similarity index 82% rename from domain/src/main/java/com/danbam/domain/entity/ProfileEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/auth/ProfileEntity.kt index 4c5b091e..ec9d1098 100644 --- a/domain/src/main/java/com/danbam/domain/entity/ProfileEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/auth/ProfileEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.auth data class ProfileEntity( val id: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/BannerEntity.kt b/domain/src/main/java/com/danbam/domain/entity/banner/BannerEntity.kt similarity index 59% rename from domain/src/main/java/com/danbam/domain/entity/BannerEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/banner/BannerEntity.kt index f4751b68..20abe25d 100644 --- a/domain/src/main/java/com/danbam/domain/entity/BannerEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/banner/BannerEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.banner data class BannerEntity( val thumbnailUrl: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/FileEntity.kt b/domain/src/main/java/com/danbam/domain/entity/file/FileEntity.kt similarity index 55% rename from domain/src/main/java/com/danbam/domain/entity/FileEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/file/FileEntity.kt index 5ab4e69b..134e09a8 100644 --- a/domain/src/main/java/com/danbam/domain/entity/FileEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/file/FileEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.file data class FileEntity( val file: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/FundingDetailEntity.kt b/domain/src/main/java/com/danbam/domain/entity/funding/FundingDetailEntity.kt similarity index 95% rename from domain/src/main/java/com/danbam/domain/entity/FundingDetailEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/funding/FundingDetailEntity.kt index dff5b51a..ba055b3a 100644 --- a/domain/src/main/java/com/danbam/domain/entity/FundingDetailEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/funding/FundingDetailEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.funding import java.util.UUID diff --git a/domain/src/main/java/com/danbam/domain/entity/FundingEntity.kt b/domain/src/main/java/com/danbam/domain/entity/funding/FundingEntity.kt similarity index 81% rename from domain/src/main/java/com/danbam/domain/entity/FundingEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/funding/FundingEntity.kt index 2db4cf18..f058241c 100644 --- a/domain/src/main/java/com/danbam/domain/entity/FundingEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/funding/FundingEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.funding data class FundingEntity( val idx: Long, diff --git a/domain/src/main/java/com/danbam/domain/entity/MyFundingEntity.kt b/domain/src/main/java/com/danbam/domain/entity/funding/MyFundingEntity.kt similarity index 95% rename from domain/src/main/java/com/danbam/domain/entity/MyFundingEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/funding/MyFundingEntity.kt index c8fbae54..3a6bf655 100644 --- a/domain/src/main/java/com/danbam/domain/entity/MyFundingEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/funding/MyFundingEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.funding import java.util.UUID diff --git a/domain/src/main/java/com/danbam/domain/entity/DetailMovieHistoryEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/DetailMovieHistoryEntity.kt similarity index 63% rename from domain/src/main/java/com/danbam/domain/entity/DetailMovieHistoryEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/movie/DetailMovieHistoryEntity.kt index e13b212b..bb61d732 100644 --- a/domain/src/main/java/com/danbam/domain/entity/DetailMovieHistoryEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/movie/DetailMovieHistoryEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.movie data class DetailMovieHistoryEntity( val historyTime: Float, diff --git a/domain/src/main/java/com/danbam/domain/entity/MovieDetailEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/MovieDetailEntity.kt similarity index 89% rename from domain/src/main/java/com/danbam/domain/entity/MovieDetailEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/movie/MovieDetailEntity.kt index e618f16f..dac93ce0 100644 --- a/domain/src/main/java/com/danbam/domain/entity/MovieDetailEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/movie/MovieDetailEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.movie data class MovieDetailEntity( val title: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/movie/MovieEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/MovieEntity.kt new file mode 100644 index 00000000..42cc689f --- /dev/null +++ b/domain/src/main/java/com/danbam/domain/entity/movie/MovieEntity.kt @@ -0,0 +1,6 @@ +package com.danbam.domain.entity.movie + +data class MovieEntity( + val movieIdx: Long, + val thumbnailUrl: String, +) \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/entity/MovieHistoryEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/MovieHistoryEntity.kt similarity index 77% rename from domain/src/main/java/com/danbam/domain/entity/MovieHistoryEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/movie/MovieHistoryEntity.kt index 118511d7..5a856c68 100644 --- a/domain/src/main/java/com/danbam/domain/entity/MovieHistoryEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/movie/MovieHistoryEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.movie data class MovieHistoryEntity( val movieIdx: Long, diff --git a/domain/src/main/java/com/danbam/domain/entity/MoviePeopleDetailEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleDetailEntity.kt similarity index 66% rename from domain/src/main/java/com/danbam/domain/entity/MoviePeopleDetailEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleDetailEntity.kt index 6e03f227..a362330a 100644 --- a/domain/src/main/java/com/danbam/domain/entity/MoviePeopleDetailEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleDetailEntity.kt @@ -1,7 +1,7 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.movie data class MoviePeopleDetailEntity( - val idx: Long, + val actorIdx: Long, val name: String, val profileUrl: String, val movieList: List diff --git a/domain/src/main/java/com/danbam/domain/entity/MoviePeopleEntity.kt b/domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleEntity.kt similarity index 56% rename from domain/src/main/java/com/danbam/domain/entity/MoviePeopleEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleEntity.kt index 29257c3d..b338a73d 100644 --- a/domain/src/main/java/com/danbam/domain/entity/MoviePeopleEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/movie/MoviePeopleEntity.kt @@ -1,7 +1,7 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.movie data class MoviePeopleEntity( - val idx: Long, + val actorIdx: Long, val name: String, val profileUrl: String, ) diff --git a/domain/src/main/java/com/danbam/domain/entity/RecentSearchEntity.kt b/domain/src/main/java/com/danbam/domain/entity/search/RecentSearchEntity.kt similarity index 58% rename from domain/src/main/java/com/danbam/domain/entity/RecentSearchEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/search/RecentSearchEntity.kt index 6e438eec..03fb2a57 100644 --- a/domain/src/main/java/com/danbam/domain/entity/RecentSearchEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/search/RecentSearchEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.search data class RecentSearchEntity( val search: String, diff --git a/domain/src/main/java/com/danbam/domain/entity/RelatedSearchEntity.kt b/domain/src/main/java/com/danbam/domain/entity/search/RelatedSearchEntity.kt similarity index 64% rename from domain/src/main/java/com/danbam/domain/entity/RelatedSearchEntity.kt rename to domain/src/main/java/com/danbam/domain/entity/search/RelatedSearchEntity.kt index 3f0ac10e..cdd27fe6 100644 --- a/domain/src/main/java/com/danbam/domain/entity/RelatedSearchEntity.kt +++ b/domain/src/main/java/com/danbam/domain/entity/search/RelatedSearchEntity.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.entity +package com.danbam.domain.entity.search data class RelatedSearchEntity( val id: Int, diff --git a/domain/src/main/java/com/danbam/domain/param/ChangeAddressParam.kt b/domain/src/main/java/com/danbam/domain/param/auth/ChangeAddressParam.kt similarity index 76% rename from domain/src/main/java/com/danbam/domain/param/ChangeAddressParam.kt rename to domain/src/main/java/com/danbam/domain/param/auth/ChangeAddressParam.kt index 9d16a528..85188909 100644 --- a/domain/src/main/java/com/danbam/domain/param/ChangeAddressParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/auth/ChangeAddressParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.auth data class ChangeAddressParam( val zipCode: String, diff --git a/domain/src/main/java/com/danbam/domain/param/ChangePasswordParam.kt b/domain/src/main/java/com/danbam/domain/param/auth/ChangePasswordParam.kt similarity index 70% rename from domain/src/main/java/com/danbam/domain/param/ChangePasswordParam.kt rename to domain/src/main/java/com/danbam/domain/param/auth/ChangePasswordParam.kt index 45928dbc..abdb553a 100644 --- a/domain/src/main/java/com/danbam/domain/param/ChangePasswordParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/auth/ChangePasswordParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.auth data class ChangePasswordParam( val phoneNumber: String, diff --git a/domain/src/main/java/com/danbam/domain/param/EditProfileParam.kt b/domain/src/main/java/com/danbam/domain/param/auth/EditProfileParam.kt similarity index 68% rename from domain/src/main/java/com/danbam/domain/param/EditProfileParam.kt rename to domain/src/main/java/com/danbam/domain/param/auth/EditProfileParam.kt index 14a4e5d7..eab4f67d 100644 --- a/domain/src/main/java/com/danbam/domain/param/EditProfileParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/auth/EditProfileParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.auth data class EditProfileParam( val name: String, diff --git a/domain/src/main/java/com/danbam/domain/param/LoginParam.kt b/domain/src/main/java/com/danbam/domain/param/auth/LoginParam.kt similarity index 66% rename from domain/src/main/java/com/danbam/domain/param/LoginParam.kt rename to domain/src/main/java/com/danbam/domain/param/auth/LoginParam.kt index 8d096724..2af67cc2 100644 --- a/domain/src/main/java/com/danbam/domain/param/LoginParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/auth/LoginParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.auth data class LoginParam( val id: String, diff --git a/domain/src/main/java/com/danbam/domain/param/SignUpParam.kt b/domain/src/main/java/com/danbam/domain/param/auth/SignUpParam.kt similarity index 80% rename from domain/src/main/java/com/danbam/domain/param/SignUpParam.kt rename to domain/src/main/java/com/danbam/domain/param/auth/SignUpParam.kt index 2738a696..4c738409 100644 --- a/domain/src/main/java/com/danbam/domain/param/SignUpParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/auth/SignUpParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.auth data class SignUpParam( val id: String, diff --git a/domain/src/main/java/com/danbam/domain/param/FundingCreateParam.kt b/domain/src/main/java/com/danbam/domain/param/funding/FundingCreateParam.kt similarity index 94% rename from domain/src/main/java/com/danbam/domain/param/FundingCreateParam.kt rename to domain/src/main/java/com/danbam/domain/param/funding/FundingCreateParam.kt index df6ab5ee..42fbcb2d 100644 --- a/domain/src/main/java/com/danbam/domain/param/FundingCreateParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/funding/FundingCreateParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.funding data class FundingCreateParam( val title: String, diff --git a/domain/src/main/java/com/danbam/domain/param/FundingParam.kt b/domain/src/main/java/com/danbam/domain/param/funding/FundingParam.kt similarity index 71% rename from domain/src/main/java/com/danbam/domain/param/FundingParam.kt rename to domain/src/main/java/com/danbam/domain/param/funding/FundingParam.kt index e04a16fb..81f90015 100644 --- a/domain/src/main/java/com/danbam/domain/param/FundingParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/funding/FundingParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.funding data class FundingParam( val receiptId: String, diff --git a/domain/src/main/java/com/danbam/domain/param/MovieCreateParam.kt b/domain/src/main/java/com/danbam/domain/param/movie/MovieCreateParam.kt similarity index 87% rename from domain/src/main/java/com/danbam/domain/param/MovieCreateParam.kt rename to domain/src/main/java/com/danbam/domain/param/movie/MovieCreateParam.kt index 7e983197..deeaaf25 100644 --- a/domain/src/main/java/com/danbam/domain/param/MovieCreateParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/movie/MovieCreateParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.movie data class MovieCreateParam( val title: String, diff --git a/domain/src/main/java/com/danbam/domain/param/MovieHistoryParam.kt b/domain/src/main/java/com/danbam/domain/param/movie/MovieHistoryParam.kt similarity index 68% rename from domain/src/main/java/com/danbam/domain/param/MovieHistoryParam.kt rename to domain/src/main/java/com/danbam/domain/param/movie/MovieHistoryParam.kt index 2a1c4c0e..85ef304f 100644 --- a/domain/src/main/java/com/danbam/domain/param/MovieHistoryParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/movie/MovieHistoryParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.movie data class MovieHistoryParam( val movieIdx: Long, diff --git a/domain/src/main/java/com/danbam/domain/param/MoviePeopleParam.kt b/domain/src/main/java/com/danbam/domain/param/movie/MoviePeopleParam.kt similarity index 68% rename from domain/src/main/java/com/danbam/domain/param/MoviePeopleParam.kt rename to domain/src/main/java/com/danbam/domain/param/movie/MoviePeopleParam.kt index a3ebb1e7..64c2b88b 100644 --- a/domain/src/main/java/com/danbam/domain/param/MoviePeopleParam.kt +++ b/domain/src/main/java/com/danbam/domain/param/movie/MoviePeopleParam.kt @@ -1,4 +1,4 @@ -package com.danbam.domain.param +package com.danbam.domain.param.movie data class MoviePeopleParam( val name: String, diff --git a/domain/src/main/java/com/danbam/domain/repository/AccountRepository.kt b/domain/src/main/java/com/danbam/domain/repository/AccountRepository.kt index d73e64ad..bd56816f 100644 --- a/domain/src/main/java/com/danbam/domain/repository/AccountRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/AccountRepository.kt @@ -1,10 +1,10 @@ package com.danbam.domain.repository -import com.danbam.domain.entity.FindIdEntity -import com.danbam.domain.entity.ProfileEntity -import com.danbam.domain.param.ChangeAddressParam -import com.danbam.domain.param.ChangePasswordParam -import com.danbam.domain.param.EditProfileParam +import com.danbam.domain.entity.auth.FindIdEntity +import com.danbam.domain.entity.auth.ProfileEntity +import com.danbam.domain.param.auth.ChangeAddressParam +import com.danbam.domain.param.auth.ChangePasswordParam +import com.danbam.domain.param.auth.EditProfileParam interface AccountRepository { suspend fun findId(phoneNumber: String): FindIdEntity diff --git a/domain/src/main/java/com/danbam/domain/repository/AddressRepository.kt b/domain/src/main/java/com/danbam/domain/repository/AddressRepository.kt index f6c1679a..2b64e3e1 100644 --- a/domain/src/main/java/com/danbam/domain/repository/AddressRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/AddressRepository.kt @@ -1,7 +1,7 @@ package com.danbam.domain.repository import androidx.paging.PagingData -import com.danbam.domain.entity.AddressEntity +import com.danbam.domain.entity.auth.AddressEntity import kotlinx.coroutines.flow.Flow interface AddressRepository { diff --git a/domain/src/main/java/com/danbam/domain/repository/AuthRepository.kt b/domain/src/main/java/com/danbam/domain/repository/AuthRepository.kt index 226dd856..b92f0f49 100644 --- a/domain/src/main/java/com/danbam/domain/repository/AuthRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/AuthRepository.kt @@ -1,7 +1,7 @@ package com.danbam.domain.repository -import com.danbam.domain.param.LoginParam -import com.danbam.domain.param.SignUpParam +import com.danbam.domain.param.auth.LoginParam +import com.danbam.domain.param.auth.SignUpParam interface AuthRepository { suspend fun signup(signUpParam: SignUpParam) diff --git a/domain/src/main/java/com/danbam/domain/repository/BannerRepository.kt b/domain/src/main/java/com/danbam/domain/repository/BannerRepository.kt index 5a2f2dca..cb250f73 100644 --- a/domain/src/main/java/com/danbam/domain/repository/BannerRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/BannerRepository.kt @@ -1,6 +1,6 @@ package com.danbam.domain.repository -import com.danbam.domain.entity.BannerEntity +import com.danbam.domain.entity.banner.BannerEntity interface BannerRepository { suspend fun getBanner(): List diff --git a/domain/src/main/java/com/danbam/domain/repository/CrowdFundingRepository.kt b/domain/src/main/java/com/danbam/domain/repository/CrowdFundingRepository.kt index 870680e1..6ec940b0 100644 --- a/domain/src/main/java/com/danbam/domain/repository/CrowdFundingRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/CrowdFundingRepository.kt @@ -1,17 +1,17 @@ package com.danbam.domain.repository import androidx.paging.PagingData -import com.danbam.domain.entity.FundingDetailEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MyFundingEntity -import com.danbam.domain.param.FundingCreateParam +import com.danbam.domain.entity.funding.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.funding.MyFundingEntity +import com.danbam.domain.param.funding.FundingCreateParam import kotlinx.coroutines.flow.Flow interface CrowdFundingRepository { suspend fun fundingCreate(fundingCreateParam: FundingCreateParam) suspend fun fundingPopularList(): List - suspend fun fundingDetail(fundingIndex: Long): FundingDetailEntity + suspend fun fundingDetail(fundingIdx: Long): FundingDetailEntity suspend fun fundingAll(): Flow> suspend fun fundingMy(): List - suspend fun fundingMyDetail(crowdfundingIdx: Long): MyFundingEntity + suspend fun fundingMyDetail(fundingIdx: Long): MyFundingEntity } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/repository/FileRepository.kt b/domain/src/main/java/com/danbam/domain/repository/FileRepository.kt index ecb0c554..cd09fc6e 100644 --- a/domain/src/main/java/com/danbam/domain/repository/FileRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/FileRepository.kt @@ -1,6 +1,6 @@ package com.danbam.domain.repository -import com.danbam.domain.entity.FileEntity +import com.danbam.domain.entity.file.FileEntity import java.io.File interface FileRepository { diff --git a/domain/src/main/java/com/danbam/domain/repository/FundingRepository.kt b/domain/src/main/java/com/danbam/domain/repository/FundingRepository.kt index 57df1ef9..0d33a5c9 100644 --- a/domain/src/main/java/com/danbam/domain/repository/FundingRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/FundingRepository.kt @@ -1,10 +1,10 @@ package com.danbam.domain.repository -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.param.FundingParam +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.param.funding.FundingParam interface FundingRepository { suspend fun getReceipt(): String - suspend fun funding(crowdfundingIdx: Long, rewardIdx: Long, fundingParam: FundingParam) + suspend fun funding(fundingIdx: Long, rewardIdx: Long, fundingParam: FundingParam) suspend fun fundingList(): List } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/repository/MovieRepository.kt b/domain/src/main/java/com/danbam/domain/repository/MovieRepository.kt index 0cf1bbfc..34d6ccda 100644 --- a/domain/src/main/java/com/danbam/domain/repository/MovieRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/MovieRepository.kt @@ -1,15 +1,15 @@ package com.danbam.domain.repository import androidx.paging.PagingData -import com.danbam.domain.entity.DetailMovieHistoryEntity -import com.danbam.domain.entity.MovieDetailEntity -import com.danbam.domain.entity.MovieEntity -import com.danbam.domain.entity.MovieHistoryEntity -import com.danbam.domain.entity.MoviePeopleDetailEntity -import com.danbam.domain.entity.MoviePeopleEntity -import com.danbam.domain.param.MovieCreateParam -import com.danbam.domain.param.MovieHistoryParam -import com.danbam.domain.param.MoviePeopleParam +import com.danbam.domain.entity.movie.DetailMovieHistoryEntity +import com.danbam.domain.entity.movie.MovieDetailEntity +import com.danbam.domain.entity.movie.MovieEntity +import com.danbam.domain.entity.movie.MovieHistoryEntity +import com.danbam.domain.entity.movie.MoviePeopleDetailEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity +import com.danbam.domain.param.movie.MovieCreateParam +import com.danbam.domain.param.movie.MovieHistoryParam +import com.danbam.domain.param.movie.MoviePeopleParam import kotlinx.coroutines.flow.Flow interface MovieRepository { @@ -18,7 +18,7 @@ interface MovieRepository { suspend fun movieDetail(movieIdx: Long): MovieDetailEntity suspend fun searchMoviePeople(actorType: String, name: String): List suspend fun addMoviePeople(actorType: String, moviePeopleParam: MoviePeopleParam): Long - suspend fun moviePeopleDetail(actorType: String, idx: Long): MoviePeopleDetailEntity + suspend fun moviePeopleDetail(actorType: String, actorIdx: Long): MoviePeopleDetailEntity suspend fun movieRecentList(): List suspend fun moviePopularList(): List suspend fun movieRecommendList(): List diff --git a/domain/src/main/java/com/danbam/domain/repository/SearchRepository.kt b/domain/src/main/java/com/danbam/domain/repository/SearchRepository.kt index 8f1dd83a..0f37c676 100644 --- a/domain/src/main/java/com/danbam/domain/repository/SearchRepository.kt +++ b/domain/src/main/java/com/danbam/domain/repository/SearchRepository.kt @@ -1,10 +1,10 @@ package com.danbam.domain.repository import androidx.paging.PagingData -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity -import com.danbam.domain.entity.RecentSearchEntity -import com.danbam.domain.entity.RelatedSearchEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity +import com.danbam.domain.entity.search.RecentSearchEntity +import com.danbam.domain.entity.search.RelatedSearchEntity import kotlinx.coroutines.flow.Flow interface SearchRepository { diff --git a/domain/src/main/java/com/danbam/domain/usecase/account/ChangeAddressUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/account/ChangeAddressUseCase.kt index 708d2335..0d909bbf 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/account/ChangeAddressUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/account/ChangeAddressUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.account -import com.danbam.domain.param.ChangeAddressParam +import com.danbam.domain.param.auth.ChangeAddressParam import com.danbam.domain.repository.AccountRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/account/ChangePasswordUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/account/ChangePasswordUseCase.kt index 0e43c3ad..6907a1fb 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/account/ChangePasswordUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/account/ChangePasswordUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.account -import com.danbam.domain.param.ChangePasswordParam +import com.danbam.domain.param.auth.ChangePasswordParam import com.danbam.domain.repository.AccountRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/account/EditProfileUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/account/EditProfileUseCase.kt index fe93607b..e167a97b 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/account/EditProfileUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/account/EditProfileUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.account -import com.danbam.domain.param.EditProfileParam +import com.danbam.domain.param.auth.EditProfileParam import com.danbam.domain.repository.AccountRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/auth/LoginUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/auth/LoginUseCase.kt index 26f8689e..05d2badc 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/auth/LoginUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/auth/LoginUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.auth -import com.danbam.domain.param.LoginParam +import com.danbam.domain.param.auth.LoginParam import com.danbam.domain.repository.AuthRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/auth/SignUpUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/auth/SignUpUseCase.kt index 7dbd7aed..3f2587b4 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/auth/SignUpUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/auth/SignUpUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.auth -import com.danbam.domain.param.SignUpParam +import com.danbam.domain.param.auth.SignUpParam import com.danbam.domain.repository.AuthRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingCreateUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingCreateUseCase.kt index 08086339..2833b9c6 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingCreateUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingCreateUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.crowd_funding -import com.danbam.domain.param.FundingCreateParam +import com.danbam.domain.param.funding.FundingCreateParam import com.danbam.domain.repository.CrowdFundingRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingDetailUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingDetailUseCase.kt index 5646b1f8..b446023f 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingDetailUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingDetailUseCase.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class FundingDetailUseCase @Inject constructor( private val crowdFundingRepository: CrowdFundingRepository ) { - suspend operator fun invoke(fundingIndex: Long) = runCatching { - crowdFundingRepository.fundingDetail(fundingIndex = fundingIndex) + suspend operator fun invoke(fundingIdx: Long) = runCatching { + crowdFundingRepository.fundingDetail(fundingIdx = fundingIdx) } } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingMyDetailUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingMyDetailUseCase.kt index 37b1af2b..d52963ff 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingMyDetailUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/crowd_funding/FundingMyDetailUseCase.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class FundingMyDetailUseCase @Inject constructor( private val crowdFundingRepository: CrowdFundingRepository ) { - suspend operator fun invoke(crowdFundingIdx: Long) = runCatching { - crowdFundingRepository.fundingMyDetail(crowdfundingIdx = crowdFundingIdx) + suspend operator fun invoke(fundingIdx: Long) = runCatching { + crowdFundingRepository.fundingMyDetail(fundingIdx = fundingIdx) } } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/usecase/funding/FundingUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/funding/FundingUseCase.kt index e4120eac..d786cb08 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/funding/FundingUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/funding/FundingUseCase.kt @@ -1,13 +1,13 @@ package com.danbam.domain.usecase.funding -import com.danbam.domain.param.FundingParam +import com.danbam.domain.param.funding.FundingParam import com.danbam.domain.repository.FundingRepository import javax.inject.Inject class FundingUseCase @Inject constructor( private val fundingRepository: FundingRepository ) { - suspend operator fun invoke(crowdfundingIdx: Long, rewardIdx: Long, fundingParam: FundingParam) = runCatching { - fundingRepository.funding(crowdfundingIdx = crowdfundingIdx, rewardIdx = rewardIdx, fundingParam = fundingParam) + suspend operator fun invoke(fundingIdx: Long, rewardIdx: Long, fundingParam: FundingParam) = runCatching { + fundingRepository.funding(fundingIdx = fundingIdx, rewardIdx = rewardIdx, fundingParam = fundingParam) } } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/usecase/movie/AddMovieHistoryUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/movie/AddMovieHistoryUseCase.kt index 82472de3..6534548b 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/movie/AddMovieHistoryUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/movie/AddMovieHistoryUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.movie -import com.danbam.domain.param.MovieHistoryParam +import com.danbam.domain.param.movie.MovieHistoryParam import com.danbam.domain.repository.MovieRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/movie/AddMoviePeopleUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/movie/AddMoviePeopleUseCase.kt index e9e0a430..3f2940d9 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/movie/AddMoviePeopleUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/movie/AddMoviePeopleUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.movie -import com.danbam.domain.param.MoviePeopleParam +import com.danbam.domain.param.movie.MoviePeopleParam import com.danbam.domain.repository.MovieRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/movie/MovieCreateUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/movie/MovieCreateUseCase.kt index 1c860b10..1db8a5c1 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/movie/MovieCreateUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/movie/MovieCreateUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.movie -import com.danbam.domain.param.MovieCreateParam +import com.danbam.domain.param.movie.MovieCreateParam import com.danbam.domain.repository.MovieRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/movie/MovieDetailUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/movie/MovieDetailUseCase.kt index 63e3f0d9..c2496833 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/movie/MovieDetailUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/movie/MovieDetailUseCase.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MovieDetailUseCase @Inject constructor( private val movieRepository: MovieRepository ) { - suspend operator fun invoke(movieIndex: Long) = runCatching { - movieRepository.movieDetail(movieIdx = movieIndex) + suspend operator fun invoke(movieIdx: Long) = runCatching { + movieRepository.movieDetail(movieIdx = movieIdx) } } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/usecase/movie/MoviePeopleDetailUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/movie/MoviePeopleDetailUseCase.kt index 1ee0c458..94b9a2ed 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/movie/MoviePeopleDetailUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/movie/MoviePeopleDetailUseCase.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MoviePeopleDetailUseCase @Inject constructor( private val movieRepository: MovieRepository ) { - suspend operator fun invoke(actorType: String, idx: Long) = runCatching { - movieRepository.moviePeopleDetail(actorType = actorType, idx = idx) + suspend operator fun invoke(actorType: String, actorIdx: Long) = runCatching { + movieRepository.moviePeopleDetail(actorType = actorType, actorIdx = actorIdx) } } \ No newline at end of file diff --git a/domain/src/main/java/com/danbam/domain/usecase/search/SearchFundingUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/search/SearchFundingUseCase.kt index 84be6844..10fa5d36 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/search/SearchFundingUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/search/SearchFundingUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.search -import com.danbam.domain.entity.RecentSearchEntity +import com.danbam.domain.entity.search.RecentSearchEntity import com.danbam.domain.repository.SearchRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/danbam/domain/usecase/search/SearchMovieUseCase.kt b/domain/src/main/java/com/danbam/domain/usecase/search/SearchMovieUseCase.kt index 789043db..3fe4c298 100644 --- a/domain/src/main/java/com/danbam/domain/usecase/search/SearchMovieUseCase.kt +++ b/domain/src/main/java/com/danbam/domain/usecase/search/SearchMovieUseCase.kt @@ -1,6 +1,6 @@ package com.danbam.domain.usecase.search -import com.danbam.domain.entity.RecentSearchEntity +import com.danbam.domain.entity.search.RecentSearchEntity import com.danbam.domain.repository.SearchRepository import javax.inject.Inject diff --git a/mobile/src/main/java/com/danbam/mobile/ui/auth/find/find_password/FindPasswordViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/auth/find/find_password/FindPasswordViewModel.kt index 7a3a3bbc..41830e59 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/auth/find/find_password/FindPasswordViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/auth/find/find_password/FindPasswordViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.auth.find.find_password import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.ChangePasswordParam +import com.danbam.domain.param.auth.ChangePasswordParam import com.danbam.domain.usecase.account.ChangePasswordUseCase import com.danbam.mobile.util.android.errorHandling import com.danbam.mobile.util.parser.isPassword diff --git a/mobile/src/main/java/com/danbam/mobile/ui/auth/login/LoginViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/auth/login/LoginViewModel.kt index a62d53ee..290c7beb 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/auth/login/LoginViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/auth/login/LoginViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.auth.login import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.LoginParam +import com.danbam.domain.param.auth.LoginParam import com.danbam.domain.usecase.auth.LoginUseCase import com.danbam.mobile.util.android.errorHandling import com.danbam.mobile.util.parser.isId diff --git a/mobile/src/main/java/com/danbam/mobile/ui/auth/signup/SignUpViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/auth/signup/SignUpViewModel.kt index 198eff84..83dc2c56 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/auth/signup/SignUpViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/auth/signup/SignUpViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.auth.signup import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.SignUpParam +import com.danbam.domain.param.auth.SignUpParam import com.danbam.domain.usecase.auth.CheckIdUseCase import com.danbam.domain.usecase.auth.SignUpUseCase import com.danbam.domain.usecase.file.SendFileUseCase diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/all/FundingAllContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/all/FundingAllContract.kt index 719a5333..97620b40 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/all/FundingAllContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/all/FundingAllContract.kt @@ -1,7 +1,7 @@ package com.danbam.mobile.ui.funding.all import androidx.paging.PagingData -import com.danbam.domain.entity.FundingEntity +import com.danbam.domain.entity.funding.FundingEntity import kotlinx.coroutines.flow.Flow data class FundingAllState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailContract.kt index 51967df5..9bf67430 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailContract.kt @@ -1,6 +1,6 @@ package com.danbam.mobile.ui.funding.detail -import com.danbam.domain.entity.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingDetailEntity import java.util.UUID data class FundingDetailState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailScreen.kt index e2219c8b..a82266b8 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailScreen.kt @@ -33,7 +33,6 @@ import com.danbam.design_system.component.ExampleTextMedium import com.danbam.design_system.component.ExampleTextRegular import com.danbam.design_system.component.FindPasswordMedium import com.danbam.design_system.component.HeadLineBold -import com.danbam.design_system.component.IndiStrawButton import com.danbam.design_system.component.IndiStrawColumnBackground import com.danbam.design_system.component.IndiStrawHeader import com.danbam.design_system.component.IndiStrawProgress @@ -47,16 +46,15 @@ import com.danbam.design_system.component.IndiStrawSlider import com.danbam.design_system.component.RewardItem import com.danbam.design_system.component.RewardType import com.danbam.design_system.util.toCommaString -import com.danbam.domain.entity.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingDetailEntity import com.danbam.mobile.ui.funding.navigation.FundingDeepLinkKey import com.danbam.mobile.ui.funding.navigation.FundingNavigationItem -import com.danbam.mobile.util.parser.toCommaString @OptIn(ExperimentalMaterialApi::class) @Composable fun FundingDetailScreen( navController: NavController, - fundingIndex: Long, + fundingIdx: Long, fundingDetailViewModel: FundingDetailViewModel = hiltViewModel() ) { val container = fundingDetailViewModel.container @@ -67,13 +65,13 @@ fun FundingDetailScreen( var selectRewardItem: FundingDetailEntity.RewardEntity? by remember { mutableStateOf(null) } LaunchedEffect(Unit) { - fundingDetailViewModel.getDetail(fundingIndex = fundingIndex) + fundingDetailViewModel.getDetail(fundingIdx = fundingIdx) } IndiStrawBottomSheetLayout(sheetContent = { selectRewardItem?.let { RewardItem(rewardType = RewardType.Expand, item = it, onClickItem = { - navController.navigate(FundingNavigationItem.FundingReward.route + FundingDeepLinkKey.FUNDING_INDEX + fundingIndex + FundingDeepLinkKey.REWARD_INDEX + it.idx + FundingDeepLinkKey.REWARD_TITLE + it.title + FundingDeepLinkKey.REWARD_DESCRIPTION + it.description + FundingDeepLinkKey.REWARD_PRICE + it.price) + navController.navigate(FundingNavigationItem.FundingReward.route + FundingDeepLinkKey.FUNDING_INDEX + fundingIdx + FundingDeepLinkKey.REWARD_INDEX + it.idx + FundingDeepLinkKey.REWARD_TITLE + it.title + FundingDeepLinkKey.REWARD_DESCRIPTION + it.description + FundingDeepLinkKey.REWARD_PRICE + it.price) }) } }) { _, openSheet -> diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailViewModel.kt index 63f466f0..f4ca824e 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/detail/FundingDetailViewModel.kt @@ -18,9 +18,9 @@ class FundingDetailViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container = container(FundingDetailState()) - fun getDetail(fundingIndex: Long) = intent { + fun getDetail(fundingIdx: Long) = intent { viewModelScope.launch { - fundingDetailUseCase(fundingIndex = fundingIndex).onSuccess { + fundingDetailUseCase(fundingIdx = fundingIdx).onSuccess { reduce { state.copy(fundingDetailEntity = it) } }.onFailure { it.errorHandling(unknownAction = {}) diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/AddRewardScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/AddRewardScreen.kt index 41c0e7c7..02f75c14 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/AddRewardScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/AddRewardScreen.kt @@ -27,7 +27,7 @@ import com.danbam.design_system.component.RewardType import com.danbam.design_system.component.TitleRegular import com.danbam.design_system.util.RemoveOverScrollLazyColumn import com.danbam.design_system.util.indiStrawClickable -import com.danbam.domain.entity.FundingDetailEntity +import com.danbam.domain.entity.funding.FundingDetailEntity @Composable fun AddRewardScreen( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingContract.kt index 6bb538dd..a7286e95 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingContract.kt @@ -1,6 +1,6 @@ package com.danbam.mobile.ui.funding.make -import com.danbam.domain.param.FundingCreateParam +import com.danbam.domain.param.funding.FundingCreateParam import java.time.LocalDate data class MakeFundingState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingViewModel.kt index e00264c4..4ba850fe 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/make/MakeFundingViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.funding.make import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.FundingCreateParam +import com.danbam.domain.param.funding.FundingCreateParam import com.danbam.domain.usecase.file.SendFileUseCase import com.danbam.domain.usecase.crowd_funding.FundingCreateUseCase import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingContract.kt index 8ca425fc..8bb89caf 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingContract.kt @@ -1,6 +1,6 @@ package com.danbam.mobile.ui.funding.my -import com.danbam.domain.entity.MyFundingEntity +import com.danbam.domain.entity.funding.MyFundingEntity data class MyFundingState( val myFundingEntity: MyFundingEntity = MyFundingEntity( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingScreen.kt index c7fb3347..2ef9fc97 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material.Divider import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.runtime.Composable @@ -50,12 +49,12 @@ import com.danbam.design_system.component.TitleSemiBold import com.danbam.design_system.util.RemoveOverScrollLazyRow import com.danbam.design_system.util.indiStrawClickable import com.danbam.design_system.util.toCommaString -import com.danbam.domain.entity.MyFundingEntity +import com.danbam.domain.entity.funding.MyFundingEntity @OptIn(ExperimentalMaterialApi::class) @Composable fun MyFundingScreen( - crowdFundingIndex: Long, + fundingIdx: Long, navController: NavController, myFundingViewModel: MyFundingViewModel = hiltViewModel() ) { @@ -69,7 +68,7 @@ fun MyFundingScreen( var selectedReward: MyFundingEntity.RewardEntity? by remember { mutableStateOf(null) } LaunchedEffect(Unit) { - myFundingViewModel.myDetail(crowdFundingIdx = crowdFundingIndex) + myFundingViewModel.myDetail(fundingIdx = fundingIdx) } IndiStrawBottomSheetLayout(sheetContent = { diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingViewModel.kt index 2c8c5c97..ea729b7f 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/my/MyFundingViewModel.kt @@ -17,9 +17,9 @@ class MyFundingViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container = container(MyFundingState()) - fun myDetail(crowdFundingIdx: Long) = intent { + fun myDetail(fundingIdx: Long) = intent { viewModelScope.launch { - fundingMyDetailUseCase(crowdFundingIdx = crowdFundingIdx).onSuccess { + fundingMyDetailUseCase(fundingIdx = fundingIdx).onSuccess { reduce { state.copy(myFundingEntity = it) } } } diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/navigation/FundingGraph.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/navigation/FundingGraph.kt index 54c6a05f..3ebdfade 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/navigation/FundingGraph.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/navigation/FundingGraph.kt @@ -42,8 +42,8 @@ fun NavGraphBuilder.fundingGraph(navController: NavHostController) { } ) ) { - val fundingIndex = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L - FundingDetailScreen(navController = navController, fundingIndex = fundingIndex) + val fundingIdx = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L + FundingDetailScreen(navController = navController, fundingIdx = fundingIdx) } composable(route = FundingNavigationItem.All.route) { FundingAllScreen(navController = navController) @@ -73,14 +73,14 @@ fun NavGraphBuilder.fundingGraph(navController: NavHostController) { } ) ) { - val fundingIndex = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L + val fundingIdx = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L val rewardIndex = it.arguments?.getLong(FundingDeepLinkKey.REWARD_INDEX) ?: 0L val rewardTitle = it.arguments?.getString(FundingDeepLinkKey.REWARD_TITLE) ?: "" val rewardDescription = it.arguments?.getString(FundingDeepLinkKey.REWARD_DESCRIPTION) ?: "" val rewardPrice = it.arguments?.getLong(FundingDeepLinkKey.REWARD_PRICE) ?: 0L FundingRewardScreen( navController = navController, - fundingIndex = fundingIndex, + fundingIdx = fundingIdx, rewardIndex = rewardIndex, rewardTitle = rewardTitle, rewardDescription = rewardDescription, @@ -95,7 +95,7 @@ fun NavGraphBuilder.fundingGraph(navController: NavHostController) { } ) ) { - val fundingIndex = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L - MyFundingScreen(navController = navController, crowdFundingIndex = fundingIndex) + val fundingIdx = it.arguments?.getLong(FundingDeepLinkKey.FUNDING_INDEX) ?: 0L + MyFundingScreen(navController = navController, fundingIdx = fundingIdx) } } \ No newline at end of file diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardScreen.kt index cd48a388..dc00ac03 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardScreen.kt @@ -61,7 +61,7 @@ sealed class Payment(val stringId: Int, val method: String) { @Composable fun FundingRewardScreen( navController: NavController, - fundingIndex: Long, + fundingIdx: Long, rewardIndex: Long, rewardTitle: String, rewardDescription: String, @@ -305,7 +305,7 @@ fun FundingRewardScreen( ) { fundingRewardViewModel.funding( receiptId = it, - crowdfundingIdx = fundingIndex, + fundingIdx = fundingIdx, rewardIdx = rewardIndex, price = rewardPrice, extraPrice = addFundingMoney diff --git a/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardViewModel.kt index da0ff3dd..74aea305 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/funding/pay/FundingRewardViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.funding.pay import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.FundingParam +import com.danbam.domain.param.funding.FundingParam import com.danbam.domain.usecase.account.GetProfileUseCase import com.danbam.domain.usecase.funding.FundingUseCase import com.danbam.domain.usecase.funding.GetReceiptUseCase @@ -49,13 +49,13 @@ class FundingRewardViewModel @Inject constructor( fun funding( receiptId: String, - crowdfundingIdx: Long, + fundingIdx: Long, rewardIdx: Long, price: Long, extraPrice: Long ) = intent { fundingUseCase( - crowdfundingIdx = crowdfundingIdx, + fundingIdx = fundingIdx, rewardIdx = rewardIdx, fundingParam = FundingParam( receiptId = receiptId, diff --git a/mobile/src/main/java/com/danbam/mobile/ui/main/main/MainContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/main/main/MainContract.kt index c2fa216f..8d81b158 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/main/main/MainContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/main/main/MainContract.kt @@ -1,8 +1,8 @@ package com.danbam.mobile.ui.main.main -import com.danbam.domain.entity.BannerEntity -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.banner.BannerEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity data class MainState( val profileUrl: String? = null, diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/all/MovieAllContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/all/MovieAllContract.kt index 831d2bc4..16756c58 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/all/MovieAllContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/all/MovieAllContract.kt @@ -1,7 +1,7 @@ package com.danbam.mobile.ui.movie.all import androidx.paging.PagingData -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieEntity import kotlinx.coroutines.flow.Flow data class MovieAllState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailContract.kt index 44b5b08d..4a970f13 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailContract.kt @@ -1,7 +1,7 @@ package com.danbam.mobile.ui.movie.detail -import com.danbam.domain.entity.MovieDetailEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieDetailEntity +import com.danbam.domain.entity.movie.MovieEntity data class MovieDetailState( val movieDetailInfo: MovieDetailEntity = MovieDetailEntity( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailScreen.kt index baa742ac..48e645b7 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailScreen.kt @@ -47,17 +47,16 @@ import com.danbam.design_system.component.TitleSemiBold import com.danbam.design_system.util.RemoveOverScrollLazyRow import com.danbam.design_system.util.indiStrawClickable import com.danbam.design_system.R -import com.danbam.domain.entity.MoviePeopleEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity import com.danbam.mobile.ui.movie.navigation.MovieDeepLinkKey import com.danbam.mobile.ui.movie.navigation.MovieNavigationItem import com.danbam.mobile.util.android.getActivity -import okhttp3.internal.toNonNegativeInt @OptIn(ExperimentalMaterialApi::class) @Composable fun MovieDetailScreen( navController: NavController, - movieIndex: Long, + movieIdx: Long, movieDetailViewModel: MovieDetailViewModel = hiltViewModel() ) { getActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) @@ -69,8 +68,8 @@ fun MovieDetailScreen( val movieHeight = LocalConfiguration.current.screenHeightDp * 0.3 LaunchedEffect(Unit) { - movieDetailViewModel.movieDetail(movieIndex = movieIndex) - movieDetailViewModel.movieHistory(movieIndex = movieIndex) + movieDetailViewModel.movieDetail(movieIdx = movieIdx) + movieDetailViewModel.movieHistory(movieIdx = movieIdx) } var selectedPeople: MoviePeopleEntity? by remember { mutableStateOf(null) } @@ -115,7 +114,7 @@ fun MovieDetailScreen( imgSrc = it.thumbnailUrl, shape = Shape.Rectangle ) { - navController.navigate(MovieNavigationItem.Detail.route + MovieDeepLinkKey.MOVIE_INDEX + it.idx) + navController.navigate(MovieNavigationItem.Detail.route + MovieDeepLinkKey.MOVIE_INDEX + it.movieIdx) } Spacer(modifier = Modifier.width(16.dp)) } @@ -151,7 +150,7 @@ fun MovieDetailScreen( ?.toInt() ?: 0) it.release() navController.navigate( - MovieNavigationItem.Play.route + MovieDeepLinkKey.MOVIE_NAME + state.movieDetailInfo.title + MovieDeepLinkKey.MOVIE_INDEX + movieIndex + MovieDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl + MovieDeepLinkKey.MOVIE_POSITION + state.moviePosition + MovieDeepLinkKey.IS_VERTICAL + isVertical + MovieNavigationItem.Play.route + MovieDeepLinkKey.MOVIE_NAME + state.movieDetailInfo.title + MovieDeepLinkKey.MOVIE_INDEX + movieIdx + MovieDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl + MovieDeepLinkKey.MOVIE_POSITION + state.moviePosition + MovieDeepLinkKey.IS_VERTICAL + isVertical ) } } @@ -212,8 +211,8 @@ fun MovieDetailScreen( modifier = Modifier.indiStrawClickable(onClick = { selectedPeople = item movieDetailViewModel.moviePeopleDetail( - index >= state.movieDetailInfo.directorList.size, - item.idx + isActor = index >= state.movieDetailInfo.directorList.size, + actorIdx = item.actorIdx ) moreInfo() }), diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailViewModel.kt index ef3b3dd8..6702bb9f 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/detail/MovieDetailViewModel.kt @@ -21,23 +21,26 @@ class MovieDetailViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container = container(MovieDetailState()) - fun movieDetail(movieIndex: Long) = intent { + fun movieDetail(movieIdx: Long) = intent { viewModelScope.launch { - movieDetailUseCase(movieIndex = movieIndex).onSuccess { + movieDetailUseCase(movieIdx = movieIdx).onSuccess { reduce { state.copy(movieDetailInfo = it) } } } } - fun movieHistory(movieIndex: Long) = intent { - movieHistoryUseCase(movieIdx = movieIndex).onSuccess { + fun movieHistory(movieIdx: Long) = intent { + movieHistoryUseCase(movieIdx = movieIdx).onSuccess { reduce { state.copy(moviePosition = it.historyTime) } } } - fun moviePeopleDetail(isActor: Boolean, idx: Long) = intent { + fun moviePeopleDetail(isActor: Boolean, actorIdx: Long) = intent { viewModelScope.launch { - moviePeopleDetailUseCase(if (isActor) "actor" else "director", idx).onSuccess { + moviePeopleDetailUseCase( + actorType = if (isActor) "actor" else "director", + actorIdx = actorIdx + ).onSuccess { reduce { state.copy(appearanceMovieList = it.movieList) } } } diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieContract.kt index 5c8aeb98..928a7f46 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieContract.kt @@ -1,6 +1,6 @@ package com.danbam.mobile.ui.movie.make -import com.danbam.domain.entity.MoviePeopleEntity +import com.danbam.domain.entity.movie.MoviePeopleEntity data class MakeMovieState( val thumbnailUrl: String? = null, diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieViewModel.kt index be05e7b4..8c6daa2f 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/make/MakeMovieViewModel.kt @@ -2,9 +2,9 @@ package com.danbam.mobile.ui.movie.make import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.entity.MoviePeopleEntity -import com.danbam.domain.param.MovieCreateParam -import com.danbam.domain.param.MoviePeopleParam +import com.danbam.domain.entity.movie.MoviePeopleEntity +import com.danbam.domain.param.movie.MovieCreateParam +import com.danbam.domain.param.movie.MoviePeopleParam import com.danbam.domain.usecase.file.SendFileUseCase import com.danbam.domain.usecase.movie.AddMoviePeopleUseCase import com.danbam.domain.usecase.movie.MovieCreateUseCase @@ -104,7 +104,7 @@ class MakeMovieViewModel @Inject constructor( state.copy( actorList = state.actorList.plus( MoviePeopleEntity( - idx = it, + actorIdx = it, name = name, profileUrl = profileUrl ) @@ -115,7 +115,7 @@ class MakeMovieViewModel @Inject constructor( state.copy( directorList = state.directorList.plus( MoviePeopleEntity( - idx = it, + actorIdx = it, name = name, profileUrl = profileUrl ) @@ -150,8 +150,8 @@ class MakeMovieViewModel @Inject constructor( movieUrl = state.movieUrl!!, thumbnailUrl = state.thumbnailUrl!!, highlight = state.imageList, - director = state.directorList.map { it.idx }, - actor = state.actorList.map { it.idx }, + director = state.directorList.map { it.actorIdx }, + actor = state.actorList.map { it.actorIdx }, isMakeFunding = state.isFunding ) ).onSuccess { diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/navigation/MovieGraph.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/navigation/MovieGraph.kt index e22ea980..debd510d 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/navigation/MovieGraph.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/navigation/MovieGraph.kt @@ -52,8 +52,8 @@ fun NavGraphBuilder.movieGraph( } ) ) { - val movieIndex = it.arguments?.getLong(MovieDeepLinkKey.MOVIE_INDEX) ?: 0 - MovieDetailScreen(navController = navController, movieIndex = movieIndex) + val movieIdx = it.arguments?.getLong(MovieDeepLinkKey.MOVIE_INDEX) ?: 0 + MovieDetailScreen(navController = navController, movieIdx = movieIdx) } composable( route = MovieNavigationItem.Play.route diff --git a/mobile/src/main/java/com/danbam/mobile/ui/movie/play/MoviePlayViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/movie/play/MoviePlayViewModel.kt index ac0d93b0..b75a3352 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/movie/play/MoviePlayViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/movie/play/MoviePlayViewModel.kt @@ -2,14 +2,13 @@ package com.danbam.mobile.ui.movie.play import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.MovieHistoryParam +import com.danbam.domain.param.movie.MovieHistoryParam import com.danbam.domain.usecase.movie.AddMovieHistoryUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.orbitmvi.orbit.ContainerHost import org.orbitmvi.orbit.syntax.simple.intent import org.orbitmvi.orbit.syntax.simple.postSideEffect -import org.orbitmvi.orbit.syntax.simple.reduce import org.orbitmvi.orbit.viewmodel.container import javax.inject.Inject diff --git a/mobile/src/main/java/com/danbam/mobile/ui/profile/detail_address/DetailAddressViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/profile/detail_address/DetailAddressViewModel.kt index a2d2fefa..608d0520 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/profile/detail_address/DetailAddressViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/profile/detail_address/DetailAddressViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.profile.detail_address import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.ChangeAddressParam +import com.danbam.domain.param.auth.ChangeAddressParam import com.danbam.domain.usecase.account.ChangeAddressUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch diff --git a/mobile/src/main/java/com/danbam/mobile/ui/profile/edit_profile/EditProfileVieModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/profile/edit_profile/EditProfileVieModel.kt index 8077a647..37104459 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/profile/edit_profile/EditProfileVieModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/profile/edit_profile/EditProfileVieModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.profile.edit_profile import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.EditProfileParam +import com.danbam.domain.param.auth.EditProfileParam import com.danbam.domain.usecase.account.EditProfileUseCase import com.danbam.domain.usecase.account.GetProfileUseCase import com.danbam.domain.usecase.file.SendFileUseCase diff --git a/mobile/src/main/java/com/danbam/mobile/ui/profile/find_address/FindAddressContact.kt b/mobile/src/main/java/com/danbam/mobile/ui/profile/find_address/FindAddressContact.kt index 9f8dc093..72430305 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/profile/find_address/FindAddressContact.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/profile/find_address/FindAddressContact.kt @@ -1,7 +1,7 @@ package com.danbam.mobile.ui.profile.find_address import androidx.paging.PagingData -import com.danbam.domain.entity.AddressEntity +import com.danbam.domain.entity.auth.AddressEntity import kotlinx.coroutines.flow.Flow data class FindAddressState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileContract.kt index 51ae6f2e..92dea652 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileContract.kt @@ -1,7 +1,7 @@ package com.danbam.mobile.ui.profile.profile -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity data class ProfileState( val id: String = "", diff --git a/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileViewModel.kt index b8909441..bd8a95fc 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/profile/profile/ProfileViewModel.kt @@ -2,11 +2,10 @@ package com.danbam.mobile.ui.profile.profile import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieEntity import com.danbam.domain.usecase.account.GetProfileUseCase import com.danbam.domain.usecase.crowd_funding.FundingMyUseCase import com.danbam.domain.usecase.funding.FundingListUseCase -import com.danbam.domain.usecase.funding.FundingUseCase import com.danbam.domain.usecase.movie.MovieHistoryListUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch @@ -54,7 +53,7 @@ class ProfileViewModel @Inject constructor( reduce { state.copy(movieHistoryList = it.map { MovieEntity( - idx = it.movieIdx, + movieIdx = it.movieIdx, thumbnailUrl = it.thumbnailUrl ) }) diff --git a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchContract.kt index 4263306a..250360ce 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchContract.kt @@ -1,8 +1,8 @@ package com.danbam.mobile.ui.search.result_search import androidx.paging.PagingData -import com.danbam.domain.entity.FundingEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.funding.FundingEntity +import com.danbam.domain.entity.movie.MovieEntity import kotlinx.coroutines.flow.Flow data class ResultSearchState( diff --git a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchScreen.kt b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchScreen.kt index 4d7fb4dd..56216a3b 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchScreen.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchScreen.kt @@ -31,7 +31,6 @@ import com.danbam.design_system.component.FundingItem import com.danbam.design_system.component.MovieItem import com.danbam.design_system.component.SearchTab import com.danbam.design_system.util.RemoveOverScrollLazyColumn -import com.danbam.domain.entity.FundingEntity import com.danbam.mobile.ui.funding.navigation.FundingDeepLinkKey import com.danbam.mobile.ui.funding.navigation.FundingNavigationItem import com.danbam.mobile.ui.movie.navigation.MovieDeepLinkKey diff --git a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchViewModel.kt b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchViewModel.kt index e5ba0442..2eadfcab 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchViewModel.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/search/result_search/ResultSearchViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.mobile.ui.search.result_search import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.entity.RecentSearchEntity +import com.danbam.domain.entity.search.RecentSearchEntity import com.danbam.domain.usecase.search.SearchFundingUseCase import com.danbam.domain.usecase.search.SearchMovieUseCase import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/mobile/src/main/java/com/danbam/mobile/ui/search/searching/SearchingContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/search/searching/SearchingContract.kt index 3904e25c..e3d2cb1b 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/search/searching/SearchingContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/search/searching/SearchingContract.kt @@ -1,8 +1,6 @@ package com.danbam.mobile.ui.search.searching -import androidx.paging.PagingData -import com.danbam.domain.entity.RelatedSearchEntity -import kotlinx.coroutines.flow.Flow +import com.danbam.domain.entity.search.RelatedSearchEntity data class SearchingState( val relatedSearchPager: List? = null diff --git a/mobile/src/main/java/com/danbam/mobile/ui/search/start_search/StartSearchContract.kt b/mobile/src/main/java/com/danbam/mobile/ui/search/start_search/StartSearchContract.kt index 99c0c878..3b179813 100644 --- a/mobile/src/main/java/com/danbam/mobile/ui/search/start_search/StartSearchContract.kt +++ b/mobile/src/main/java/com/danbam/mobile/ui/search/start_search/StartSearchContract.kt @@ -1,6 +1,6 @@ package com.danbam.mobile.ui.search.start_search -import com.danbam.domain.entity.RecentSearchEntity +import com.danbam.domain.entity.search.RecentSearchEntity data class StartSearchState( val recentSearchList: List = listOf(), diff --git a/tv/src/main/java/com/danbam/tv/ui/home/HomeContract.kt b/tv/src/main/java/com/danbam/tv/ui/home/HomeContract.kt index c2d5607b..1129b635 100644 --- a/tv/src/main/java/com/danbam/tv/ui/home/HomeContract.kt +++ b/tv/src/main/java/com/danbam/tv/ui/home/HomeContract.kt @@ -1,7 +1,7 @@ package com.danbam.tv.ui.home -import com.danbam.domain.entity.BannerEntity -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.banner.BannerEntity +import com.danbam.domain.entity.movie.MovieEntity data class HomeState( val currentMovieIndex: Long = 0, diff --git a/tv/src/main/java/com/danbam/tv/ui/home/HomeScreen.kt b/tv/src/main/java/com/danbam/tv/ui/home/HomeScreen.kt index 18721627..7085c43d 100644 --- a/tv/src/main/java/com/danbam/tv/ui/home/HomeScreen.kt +++ b/tv/src/main/java/com/danbam/tv/ui/home/HomeScreen.kt @@ -101,11 +101,11 @@ fun HomeScreen( ) { items(state.movieList) { MovieTvItem( - modifier = Modifier.focusRequester(if (it.idx == state.currentMovieIndex) itemFocusRequester else FocusRequester()), + modifier = Modifier.focusRequester(if (it.movieIdx == state.currentMovieIndex) itemFocusRequester else FocusRequester()), item = it ) { - homeViewModel.saveCurrentIndex(it.idx) - navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.idx) + homeViewModel.saveCurrentIndex(it.movieIdx) + navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.movieIdx) } } } diff --git a/tv/src/main/java/com/danbam/tv/ui/main/login/LoginViewModel.kt b/tv/src/main/java/com/danbam/tv/ui/main/login/LoginViewModel.kt index a9b78736..9111b3b8 100644 --- a/tv/src/main/java/com/danbam/tv/ui/main/login/LoginViewModel.kt +++ b/tv/src/main/java/com/danbam/tv/ui/main/login/LoginViewModel.kt @@ -2,11 +2,8 @@ package com.danbam.tv.ui.main.login import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.design_system.util.Language -import com.danbam.domain.param.LoginParam -import com.danbam.domain.usecase.auth.IsLoginUseCase +import com.danbam.domain.param.auth.LoginParam import com.danbam.domain.usecase.auth.LoginUseCase -import com.danbam.domain.usecase.system.FetchLanguageUseCase import com.danbam.tv.util.android.errorHandling import com.danbam.tv.util.parser.isId import com.danbam.tv.util.parser.isPassword @@ -15,7 +12,6 @@ import kotlinx.coroutines.launch import org.orbitmvi.orbit.ContainerHost import org.orbitmvi.orbit.syntax.simple.intent import org.orbitmvi.orbit.syntax.simple.postSideEffect -import org.orbitmvi.orbit.syntax.simple.reduce import org.orbitmvi.orbit.viewmodel.container import javax.inject.Inject diff --git a/tv/src/main/java/com/danbam/tv/ui/main/navigation/MainGraph.kt b/tv/src/main/java/com/danbam/tv/ui/main/navigation/MainGraph.kt index 393472a4..766a7974 100644 --- a/tv/src/main/java/com/danbam/tv/ui/main/navigation/MainGraph.kt +++ b/tv/src/main/java/com/danbam/tv/ui/main/navigation/MainGraph.kt @@ -50,8 +50,8 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) { type = NavType.LongType } )) { - val movieIndex = it.arguments?.getLong(MainDeepLinkKey.MOVIE_INDEX) ?: 0 - MovieDetailScreen(navController = navController, movieIndex = movieIndex) + val movieIdx = it.arguments?.getLong(MainDeepLinkKey.MOVIE_INDEX) ?: 0 + MovieDetailScreen(navController = navController, movieIdx = movieIdx) } composable(route = MainNavigationItem.MoviePlay.route + MainDeepLinkKey.MOVIE_NAME + "{${MainDeepLinkKey.MOVIE_NAME}}" diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailContract.kt b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailContract.kt index 007f84cb..f9562ed1 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailContract.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailContract.kt @@ -1,6 +1,6 @@ package com.danbam.tv.ui.movie.detail -import com.danbam.domain.entity.MovieDetailEntity +import com.danbam.domain.entity.movie.MovieDetailEntity data class MovieDetailState( val movieDetailInfo: MovieDetailEntity = MovieDetailEntity( diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailScreen.kt b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailScreen.kt index 3fb9ff4e..e32c9e6e 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailScreen.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailScreen.kt @@ -62,7 +62,7 @@ sealed class MovieTabItem(val stringId: Int) { @Composable fun MovieDetailScreen( navController: NavController, - movieIndex: Long, + movieIdx: Long, movieDetailViewModel: MovieDetailViewModel = hiltViewModel() ) { val container = movieDetailViewModel.container @@ -72,8 +72,8 @@ fun MovieDetailScreen( var currentTab: MovieTabItem by remember { mutableStateOf(MovieTabItem.Highlight) } LaunchedEffect(Unit) { - movieDetailViewModel.movieDetail(movieIndex = movieIndex) - movieDetailViewModel.movieHistory(movieIndex = movieIndex) + movieDetailViewModel.movieDetail(movieIdx = movieIdx) + movieDetailViewModel.movieHistory(movieIdx = movieIdx) } IndiStrawTvBackground { @@ -115,7 +115,7 @@ fun MovieDetailScreen( title = stringResource(id = R.string.watch_going) ) { navController.navigate( - MainNavigationItem.MoviePlay.route + MainDeepLinkKey.MOVIE_NAME + state.movieDetailInfo.title + MainDeepLinkKey.MOVIE_INDEX + movieIndex + MainDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl.split( + MainNavigationItem.MoviePlay.route + MainDeepLinkKey.MOVIE_NAME + state.movieDetailInfo.title + MainDeepLinkKey.MOVIE_INDEX + movieIdx + MainDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl.split( "/" ).last() + MainDeepLinkKey.MOVIE_POSITION + state.moviePosition ) @@ -126,7 +126,7 @@ fun MovieDetailScreen( title = stringResource(id = R.string.watch_first) ) { navController.navigate( - MainNavigationItem.MoviePlay.route + MainDeepLinkKey.MOVIE_INDEX + movieIndex + MainDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl.split( + MainNavigationItem.MoviePlay.route + MainDeepLinkKey.MOVIE_INDEX + movieIdx + MainDeepLinkKey.MOVIE_URL + state.movieDetailInfo.movieUrl.split( "/" ).last() + MainDeepLinkKey.MOVIE_POSITION + 0F ) diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailViewModel.kt b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailViewModel.kt index fdcb220b..26b59b3e 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailViewModel.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/detail/MovieDetailViewModel.kt @@ -19,17 +19,17 @@ class MovieDetailViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container = container(MovieDetailState()) - fun movieHistory(movieIndex: Long) = intent { + fun movieHistory(movieIdx: Long) = intent { viewModelScope.launch { - movieHistoryUseCase(movieIdx = movieIndex).onSuccess { + movieHistoryUseCase(movieIdx = movieIdx).onSuccess { reduce { state.copy(moviePosition = it.historyTime) } } } } - fun movieDetail(movieIndex: Long) = intent { + fun movieDetail(movieIdx: Long) = intent { viewModelScope.launch { - movieDetailUseCase(movieIndex = movieIndex).onSuccess { + movieDetailUseCase(movieIdx = movieIdx).onSuccess { reduce { state.copy(movieDetailInfo = it) } } } diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieContract.kt b/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieContract.kt index ee18ce50..afdebc88 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieContract.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieContract.kt @@ -1,7 +1,7 @@ package com.danbam.tv.ui.movie.movie import androidx.paging.PagingData -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieEntity import kotlinx.coroutines.flow.Flow data class MovieState( diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieScreen.kt b/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieScreen.kt index ceeddc73..66167e3a 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieScreen.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/movie/MovieScreen.kt @@ -138,11 +138,11 @@ fun MovieScreen( ) { items(pager.itemSnapshotList.items) { MovieTvItem( - modifier = Modifier.focusRequester(if (it.idx == state.currentMovieIndex) itemFocusRequester else FocusRequester()), + modifier = Modifier.focusRequester(if (it.movieIdx == state.currentMovieIndex) itemFocusRequester else FocusRequester()), item = it ) { - movieViewModel.saveCurrentIndex(it.idx) - navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.idx) + movieViewModel.saveCurrentIndex(it.movieIdx) + navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.movieIdx) } } } diff --git a/tv/src/main/java/com/danbam/tv/ui/movie/play/MoviePlayViewModel.kt b/tv/src/main/java/com/danbam/tv/ui/movie/play/MoviePlayViewModel.kt index 4856e0af..c37aa048 100644 --- a/tv/src/main/java/com/danbam/tv/ui/movie/play/MoviePlayViewModel.kt +++ b/tv/src/main/java/com/danbam/tv/ui/movie/play/MoviePlayViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.tv.ui.movie.play import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.param.MovieHistoryParam +import com.danbam.domain.param.movie.MovieHistoryParam import com.danbam.domain.usecase.movie.AddMovieHistoryUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch diff --git a/tv/src/main/java/com/danbam/tv/ui/search/SearchContract.kt b/tv/src/main/java/com/danbam/tv/ui/search/SearchContract.kt index e2331f08..4eeeb8ef 100644 --- a/tv/src/main/java/com/danbam/tv/ui/search/SearchContract.kt +++ b/tv/src/main/java/com/danbam/tv/ui/search/SearchContract.kt @@ -1,7 +1,7 @@ package com.danbam.tv.ui.search import androidx.paging.PagingData -import com.danbam.domain.entity.MovieEntity +import com.danbam.domain.entity.movie.MovieEntity import kotlinx.coroutines.flow.Flow data class SearchState( diff --git a/tv/src/main/java/com/danbam/tv/ui/search/SearchScreen.kt b/tv/src/main/java/com/danbam/tv/ui/search/SearchScreen.kt index c642b3c7..c883d6f8 100644 --- a/tv/src/main/java/com/danbam/tv/ui/search/SearchScreen.kt +++ b/tv/src/main/java/com/danbam/tv/ui/search/SearchScreen.kt @@ -162,7 +162,7 @@ fun SearchScreen( else -> { items(moviePager.itemSnapshotList.items) { MovieTvItem(item = it) { - navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.idx) + navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.movieIdx) } } } @@ -170,7 +170,7 @@ fun SearchScreen( } else { items(state.moviePopularList) { MovieTvItem(item = it) { - navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.idx) + navController.navigate(MainNavigationItem.MovieDetail.route + MainDeepLinkKey.MOVIE_INDEX + it.movieIdx) } } } diff --git a/tv/src/main/java/com/danbam/tv/ui/search/SearchViewModel.kt b/tv/src/main/java/com/danbam/tv/ui/search/SearchViewModel.kt index e80fecf9..f07f0a30 100644 --- a/tv/src/main/java/com/danbam/tv/ui/search/SearchViewModel.kt +++ b/tv/src/main/java/com/danbam/tv/ui/search/SearchViewModel.kt @@ -2,7 +2,7 @@ package com.danbam.tv.ui.search import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.danbam.domain.entity.RecentSearchEntity +import com.danbam.domain.entity.search.RecentSearchEntity import com.danbam.domain.usecase.movie.MoviePopularListUseCase import com.danbam.domain.usecase.search.GetRecentSearchUseCase import com.danbam.domain.usecase.search.GetRelatedSearchUseCase diff --git a/tv/src/main/java/com/danbam/tv/ui/setting/SettingContract.kt b/tv/src/main/java/com/danbam/tv/ui/setting/SettingContract.kt index 9ddea05b..f8304c89 100644 --- a/tv/src/main/java/com/danbam/tv/ui/setting/SettingContract.kt +++ b/tv/src/main/java/com/danbam/tv/ui/setting/SettingContract.kt @@ -1,7 +1,7 @@ package com.danbam.tv.ui.setting import com.danbam.design_system.util.Language -import com.danbam.domain.entity.ProfileEntity +import com.danbam.domain.entity.auth.ProfileEntity data class SettingState( val currentLanguage: Language = Language.Korean,