[feat] : #113 data layer 패키지 명 변경

data/build.gradle

@@ -54,6 +54,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation project(path: ':domain')
+    implementation project(path: ':app')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

data/src/main/java/com/myongsik/data/api/HomeFoodApi.kt

@@ -1,9 +1,12 @@
 package com.myongsik.data.api
 
 
-import com.myongsik.myongsikandroid.data.model.food.*
-import com.myongsik.myongsikandroid.data.model.review.RequestReviewData
-import com.myongsik.myongsikandroid.data.model.review.ResponseReviewData
+import com.myongsik.data.model.food.DayFoodResponse
+import com.myongsik.data.model.food.RankRestaurantResponse
+import com.myongsik.data.model.food.ResponseOneRestaurant
+import com.myongsik.data.model.food.WeekFoodResponse
+import com.myongsik.data.model.review.RequestReviewData
+import com.myongsik.data.model.review.ResponseReviewData
 import retrofit2.Response
 import retrofit2.http.*
 

data/src/main/java/com/myongsik/data/api/RestaurantApi.kt

@@ -1,7 +1,7 @@
 package com.myongsik.data.api
 
-import com.myongsik.myongsikandroid.data.model.restaurant.RequestScrap
-import com.myongsik.myongsikandroid.data.model.restaurant.ResponseScrap
+import com.myongsik.data.model.restaurant.RequestScrap
+import com.myongsik.data.model.restaurant.ResponseScrap
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST

data/src/main/java/com/myongsik/data/api/SearchFoodApi.kt

@@ -1,9 +1,8 @@
 package com.myongsik.data.api
 
 
-import com.myongsik.myongsikandroid.data.model.kakao.SearchResponse
+import com.myongsik.data.model.kakao.SearchResponse
 import com.myongsik.myongsikandroid.util.Constant
-import com.myongsik.myongsikandroid.util.Constant.API_KEY
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Response

data/src/main/java/com/myongsik/data/api/UserApi.kt

@@ -1,7 +1,7 @@
 package com.myongsik.data.api
 
-import com.myongsik.myongsikandroid.data.model.user.RequestUserData
-import com.myongsik.myongsikandroid.data.model.user.ResponseUserData
+import com.myongsik.data.model.user.RequestUserData
+import com.myongsik.data.model.user.ResponseUserData
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST

data/src/main/java/com/myongsik/data/datasource/food/FoodDataSource.kt

@@ -1,8 +1,8 @@
 package com.myongsik.data.datasource.food
 
-import com.myongsik.myongsikandroid.domain.model.food.RequestReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseWeekFoodEntity
+import com.myongsik.domain.model.food.RequestReviewDataEntity
+import com.myongsik.domain.model.food.ResponseReviewDataEntity
+import com.myongsik.domain.model.food.ResponseWeekFoodEntity
 
 interface FoodDataSource {
 

data/src/main/java/com/myongsik/data/datasource/food/FoodDataSourceImpl.kt

@@ -1,13 +1,11 @@
 package com.myongsik.data.datasource.food
 
-import android.util.Log
-import com.myongsik.data.api.HomeFoodApi
-import com.myongsik.myongsikandroid.data.model.food.toWeekFoodEntity
-import com.myongsik.myongsikandroid.data.model.review.toRequestReviewData
-import com.myongsik.myongsikandroid.data.model.review.toResponseReviewEntity
-import com.myongsik.myongsikandroid.domain.model.food.RequestReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseWeekFoodEntity
+import com.myongsik.data.model.food.toWeekFoodEntity
+import com.myongsik.data.model.review.toRequestReviewData
+import com.myongsik.data.model.review.toResponseReviewEntity
+import com.myongsik.domain.model.food.RequestReviewDataEntity
+import com.myongsik.domain.model.food.ResponseReviewDataEntity
+import com.myongsik.domain.model.food.ResponseWeekFoodEntity
 import javax.inject.Inject
 
 class FoodDataSourceImpl @Inject constructor(
@@ -26,10 +24,8 @@ class FoodDataSourceImpl @Inject constructor(
     override suspend fun postReview(requestReviewDataEntity: RequestReviewDataEntity): ResponseReviewDataEntity? {
         val response = homeFoodApi.postReview(requestReviewDataEntity.toRequestReviewData())
         return if(response.isSuccessful) {
-            Log.d("gg1234", response.body().toString())
             response.body()?.toResponseReviewEntity()
         } else {
-            Log.d("gg1234", "Error")
             null
         }
     }

data/src/main/java/com/myongsik/data/datasource/restaurant/RestaurantDataSource.kt

@@ -1,9 +1,9 @@
 package com.myongsik.data.datasource.restaurant
 
 import androidx.paging.PagingData
-import com.myongsik.myongsikandroid.domain.model.restaurant.RequestScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.ResponseScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.RestaurantEntity
+import com.myongsik.domain.model.restaurant.RequestScrapEntity
+import com.myongsik.domain.model.restaurant.ResponseScrapEntity
+import com.myongsik.domain.model.restaurant.RestaurantEntity
 import kotlinx.coroutines.flow.Flow
 
 interface RestaurantDataSource {

data/src/main/java/com/myongsik/data/datasource/restaurant/RestaurantDataSourceImpl.kt

@@ -4,15 +4,14 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.map
-import com.myongsik.data.api.RestaurantApi
-import com.myongsik.myongsikandroid.data.db.RestaurantDatabase
-import com.myongsik.myongsikandroid.data.model.kakao.toRestaurantData
-import com.myongsik.myongsikandroid.data.model.kakao.toRestaurantEntity
-import com.myongsik.myongsikandroid.data.model.restaurant.toRequestScrapData
-import com.myongsik.myongsikandroid.data.model.restaurant.toResponseScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.RequestScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.ResponseScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.RestaurantEntity
+import com.myongsik.data.db.RestaurantDatabase
+import com.myongsik.data.model.kakao.toRestaurantData
+import com.myongsik.data.model.kakao.toRestaurantEntity
+import com.myongsik.data.model.restaurant.toRequestScrapData
+import com.myongsik.data.model.restaurant.toResponseScrapEntity
+import com.myongsik.domain.model.restaurant.RequestScrapEntity
+import com.myongsik.domain.model.restaurant.ResponseScrapEntity
+import com.myongsik.domain.model.restaurant.RestaurantEntity
 import com.myongsik.myongsikandroid.util.Constant
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -46,8 +45,7 @@ class RestaurantDataSourceImpl @Inject constructor(
                 maxSize = Constant.PAGING_SIZE * 3
             ),
             pagingSourceFactory = pagingSourceFactory
-        ).flow
-            .map { pagingData -> pagingData.map { it.toRestaurantEntity() } }
+        ).flow.map { pagingData -> pagingData.map { it.toRestaurantEntity() } }
     }
 
     override suspend fun getLoveListRestaurant(): Flow<List<RestaurantEntity>> {

data/src/main/java/com/myongsik/data/datasource/user/UserDataSource.kt

@@ -1,7 +1,8 @@
 package com.myongsik.data.datasource.user
 
-import com.myongsik.myongsikandroid.domain.model.user.RequestUserEntity
-import com.myongsik.myongsikandroid.domain.model.user.ResponseUserEntity
+import com.myongsik.domain.model.user.RequestUserEntity
+import com.myongsik.domain.model.user.ResponseUserEntity
+
 
 interface UserDataSource {
 

data/src/main/java/com/myongsik/data/datasource/user/UserDataSourceImpl.kt

@@ -1,10 +1,10 @@
 package com.myongsik.data.datasource.user
 
-import com.myongsik.myongsikandroid.data.api.UserApi
-import com.myongsik.myongsikandroid.data.model.user.toRequestUserData
-import com.myongsik.myongsikandroid.data.model.user.toResponseUserEntity
-import com.myongsik.myongsikandroid.domain.model.user.RequestUserEntity
-import com.myongsik.myongsikandroid.domain.model.user.ResponseUserEntity
+import com.myongsik.data.api.UserApi
+import com.myongsik.data.model.user.toRequestUserData
+import com.myongsik.data.model.user.toResponseUserEntity
+import com.myongsik.domain.model.user.RequestUserEntity
+import com.myongsik.domain.model.user.ResponseUserEntity
 import javax.inject.Inject
 
 class UserDataSourceImpl  @Inject constructor(

data/src/main/java/com/myongsik/data/db/RestaurantDao.kt

@@ -2,7 +2,7 @@ package com.myongsik.data.db
 
 import androidx.paging.PagingSource
 import androidx.room.*
-import com.myongsik.myongsikandroid.data.model.kakao.Restaurant
+import com.myongsik.data.model.kakao.Restaurant
 import kotlinx.coroutines.flow.Flow
 
 /*

data/src/main/java/com/myongsik/data/db/RestaurantDatabase.kt

@@ -2,7 +2,7 @@ package com.myongsik.data.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.myongsik.myongsikandroid.data.model.kakao.Restaurant
+import com.myongsik.data.model.kakao.Restaurant
 
 @Database(
     entities = [Restaurant::class],

data/src/main/java/com/myongsik/data/model/food/WeekFoodResponse.kt

@@ -1,6 +1,7 @@
 package com.myongsik.data.model.food
 
-import com.myongsik.myongsikandroid.domain.model.food.ResponseWeekFoodEntity
+import com.myongsik.domain.model.food.ResponseWeekFoodEntity
+
 
 data class WeekFoodResponse(
     val success : Boolean,

data/src/main/java/com/myongsik/data/model/kakao/Restaurant.kt

@@ -4,7 +4,7 @@ package com.myongsik.data.model.kakao
 import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.myongsik.myongsikandroid.domain.model.restaurant.RestaurantEntity
+import com.myongsik.domain.model.restaurant.RestaurantEntity
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize

data/src/main/java/com/myongsik/data/model/kakao/SearchResponse.kt

@@ -1,7 +1,7 @@
 package com.myongsik.data.model.kakao
 
 
-import com.myongsik.myongsikandroid.data.model.food.GetRankRestaurant
+import com.myongsik.data.model.food.GetRankRestaurant
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)

data/src/main/java/com/myongsik/data/model/restaurant/RequestScrap.kt

@@ -1,6 +1,6 @@
 package com.myongsik.data.model.restaurant
 
-import com.myongsik.myongsikandroid.domain.model.restaurant.RequestScrapEntity
+import com.myongsik.domain.model.restaurant.RequestScrapEntity
 
 data class RequestScrap(
     val address : String,

data/src/main/java/com/myongsik/data/model/restaurant/ResponseScrap.kt

@@ -1,6 +1,6 @@
 package com.myongsik.data.model.restaurant
 
-import com.myongsik.myongsikandroid.domain.model.restaurant.ResponseScrapEntity
+import com.myongsik.domain.model.restaurant.ResponseScrapEntity
 
 data class ResponseScrap(
     val httpCode : Int,

data/src/main/java/com/myongsik/data/model/review/RequestReviewData.kt

@@ -1,6 +1,6 @@
 package com.myongsik.data.model.review
 
-import com.myongsik.myongsikandroid.domain.model.food.RequestReviewDataEntity
+import com.myongsik.domain.model.food.RequestReviewDataEntity
 
 
 data class RequestReviewData(

data/src/main/java/com/myongsik/data/model/review/ResponseReviewData.kt

@@ -1,6 +1,6 @@
 package com.myongsik.data.model.review
 
-import com.myongsik.myongsikandroid.domain.model.food.ResponseReviewDataEntity
+import com.myongsik.domain.model.food.ResponseReviewDataEntity
 
 data class ResponseReviewData(
     val httpCode: Int,

data/src/main/java/com/myongsik/data/model/user/RequestUserData.kt

@@ -1,6 +1,6 @@
 package com.myongsik.data.model.user
 
-import com.myongsik.myongsikandroid.domain.model.user.RequestUserEntity
+import com.myongsik.domain.model.user.RequestUserEntity
 
 
 data class RequestUserData(

data/src/main/java/com/myongsik/data/repository/food/FoodRepository.kt

@@ -1,13 +1,9 @@
 package com.myongsik.data.repository.food
 
 import androidx.datastore.preferences.core.Preferences
-import com.myongsik.myongsikandroid.base.ApiResponse
-import com.myongsik.myongsikandroid.data.model.food.DayFoodResponse
-import com.myongsik.myongsikandroid.data.model.food.RankRestaurantResponse
-import com.myongsik.myongsikandroid.data.model.food.ResponseOneRestaurant
-import com.myongsik.myongsikandroid.data.model.food.WeekFoodResponse
-import com.myongsik.myongsikandroid.data.model.review.RequestReviewData
-import com.myongsik.myongsikandroid.data.model.review.ResponseReviewData
+import com.myongsik.data.model.food.DayFoodResponse
+import com.myongsik.data.model.food.RankRestaurantResponse
+import com.myongsik.data.model.food.ResponseOneRestaurant
 import kotlinx.coroutines.flow.Flow
 import retrofit2.Response
 

data/src/main/java/com/myongsik/data/repository/food/FoodRepositoryImpl.kt

@@ -5,15 +5,9 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.emptyPreferences
-import com.myongsik.myongsikandroid.base.ApiResponse
-import com.myongsik.myongsikandroid.base.safeApiCall
-import com.myongsik.data.api.HomeFoodApi
-import com.myongsik.myongsikandroid.data.model.food.DayFoodResponse
-import com.myongsik.myongsikandroid.data.model.food.RankRestaurantResponse
-import com.myongsik.myongsikandroid.data.model.food.ResponseOneRestaurant
-import com.myongsik.myongsikandroid.data.model.food.WeekFoodResponse
-import com.myongsik.myongsikandroid.data.model.review.RequestReviewData
-import com.myongsik.myongsikandroid.data.model.review.ResponseReviewData
+import com.myongsik.data.model.food.DayFoodResponse
+import com.myongsik.data.model.food.RankRestaurantResponse
+import com.myongsik.data.model.food.ResponseOneRestaurant
 import com.myongsik.myongsikandroid.util.DataStoreKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch

data/src/main/java/com/myongsik/data/repository/food/FoodV2RepositoryImpl.kt

@@ -1,11 +1,10 @@
 package com.myongsik.data.repository.food
 
-import android.util.Log
-import com.myongsik.myongsikandroid.data.datasource.food.FoodDataSource
-import com.myongsik.myongsikandroid.domain.model.food.RequestReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseReviewDataEntity
-import com.myongsik.myongsikandroid.domain.model.food.ResponseWeekFoodEntity
-import com.myongsik.myongsikandroid.domain.repository.food.FoodV2Repository
+import com.myongsik.data.datasource.food.FoodDataSource
+import com.myongsik.domain.model.food.RequestReviewDataEntity
+import com.myongsik.domain.model.food.ResponseReviewDataEntity
+import com.myongsik.domain.model.food.ResponseWeekFoodEntity
+import com.myongsik.domain.repository.food.FoodV2Repository
 import javax.inject.Inject
 
 class FoodV2RepositoryImpl @Inject constructor(

data/src/main/java/com/myongsik/data/repository/food/SearchFoodPagingSource.kt

@@ -2,8 +2,7 @@ package com.myongsik.data.repository.food
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.myongsik.data.api.SearchFoodApi
-import com.myongsik.myongsikandroid.data.model.kakao.Restaurant
+import com.myongsik.data.model.kakao.Restaurant
 import com.myongsik.myongsikandroid.util.Constant
 import com.myongsik.myongsikandroid.util.Constant.PAGING_SIZE
 import com.myongsik.myongsikandroid.util.MyongsikApplication

data/src/main/java/com/myongsik/data/repository/restaurant/RestaurantRepositoryImpl.kt

@@ -1,11 +1,11 @@
 package com.myongsik.data.repository.restaurant
 
 import androidx.paging.PagingData
-import com.myongsik.myongsikandroid.data.datasource.restaurant.RestaurantDataSource
-import com.myongsik.myongsikandroid.domain.model.restaurant.RequestScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.ResponseScrapEntity
-import com.myongsik.myongsikandroid.domain.model.restaurant.RestaurantEntity
-import com.myongsik.myongsikandroid.domain.repository.restaurant.RestaurantRepository
+import com.myongsik.data.datasource.restaurant.RestaurantDataSource
+import com.myongsik.domain.model.restaurant.RequestScrapEntity
+import com.myongsik.domain.model.restaurant.ResponseScrapEntity
+import com.myongsik.domain.model.restaurant.RestaurantEntity
+import com.myongsik.domain.repository.restaurant.RestaurantRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 

data/src/main/java/com/myongsik/data/repository/search/SearchFoodRepository.kt

@@ -1,8 +1,8 @@
 package com.myongsik.data.repository.search
 
 import androidx.paging.PagingData
-import com.myongsik.myongsikandroid.data.model.kakao.Restaurant
-import com.myongsik.myongsikandroid.data.model.kakao.SearchResponse
+import com.myongsik.data.model.kakao.Restaurant
+import com.myongsik.data.model.kakao.SearchResponse
 import kotlinx.coroutines.flow.Flow
 import retrofit2.Response
 

data/src/main/java/com/myongsik/data/repository/search/SearchFoodRepositoryImpl.kt

@@ -4,10 +4,9 @@ package com.myongsik.data.repository.search
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.myongsik.data.api.SearchFoodApi
-import com.myongsik.myongsikandroid.data.model.kakao.Restaurant
-import com.myongsik.myongsikandroid.data.model.kakao.SearchResponse
-import com.myongsik.myongsikandroid.data.repository.food.SearchFoodPagingSource
+import com.myongsik.data.model.kakao.Restaurant
+import com.myongsik.data.model.kakao.SearchResponse
+import com.myongsik.data.repository.food.SearchFoodPagingSource
 import com.myongsik.myongsikandroid.util.Constant.PAGING_SIZE
 import kotlinx.coroutines.flow.Flow
 import retrofit2.Response

data/src/main/java/com/myongsik/data/repository/user/UserRepositoryImpl.kt

@@ -1,9 +1,9 @@
 package com.myongsik.data.repository.user
 
-import com.myongsik.myongsikandroid.data.datasource.user.UserDataSource
-import com.myongsik.myongsikandroid.domain.model.user.RequestUserEntity
-import com.myongsik.myongsikandroid.domain.model.user.ResponseUserEntity
-import com.myongsik.myongsikandroid.domain.repository.user.UserRepository
+import com.myongsik.data.datasource.user.UserDataSource
+import com.myongsik.domain.model.user.RequestUserEntity
+import com.myongsik.domain.model.user.ResponseUserEntity
+import com.myongsik.domain.repository.user.UserRepository
 import javax.inject.Inject
 
 class UserRepositoryImpl @Inject constructor(