From f5ac2bf7b616449d1438ce72bc12c85c9ca15d67 Mon Sep 17 00:00:00 2001 From: Hyesung82 Date: Sat, 16 Mar 2024 21:16:08 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/{ => local}/source/AuthLocalDataSource.kt | 2 +- .../data/{ => remote}/source/AuthRemoteDataSource.kt | 2 +- .../data/{ => remote}/source/GroupRemoteDataSource.kt | 2 +- .../data/{ => remote}/source/LoginRemoteDataSource.kt | 2 +- .../{ => remote}/source/MyGroupsRemoteDataSource.kt | 2 +- .../data/{ => remote}/source/WriteRemoteDataSource.kt | 2 +- .../cheocharm/data/repository/AuthRepositoryImpl.kt | 4 ++-- .../cheocharm/data/repository/GroupRepositoryImpl.kt | 2 +- .../cheocharm/data/repository/LoginRepositoryImpl.kt | 2 +- .../data/repository/MyGroupsRepositoryImpl.kt | 2 +- .../cheocharm/data/repository/WriteRepositoryImpl.kt | 2 +- .../java/com/cheocharm/local/di/DataSourceModule.kt | 2 +- .../cheocharm/local/source/AuthLocalDataSourceImpl.kt | 2 +- .../java/com/cheocharm/remote/di/DataSourceModule.kt | 10 +++++----- .../remote/source/AuthRemoteDataSourceImpl.kt | 3 +-- .../remote/source/GroupRemoteDataSourceImpl.kt | 2 +- .../remote/source/LoginRemoteDataSourceImpl.kt | 2 +- .../remote/source/MyGroupsRemoteDataSourceImpl.kt | 2 +- .../remote/source/WriteRemoteDataSourceImpl.kt | 2 +- 19 files changed, 24 insertions(+), 25 deletions(-) rename data/src/main/java/com/cheocharm/data/{ => local}/source/AuthLocalDataSource.kt (91%) rename data/src/main/java/com/cheocharm/data/{ => remote}/source/AuthRemoteDataSource.kt (78%) rename data/src/main/java/com/cheocharm/data/{ => remote}/source/GroupRemoteDataSource.kt (87%) rename data/src/main/java/com/cheocharm/data/{ => remote}/source/LoginRemoteDataSource.kt (94%) rename data/src/main/java/com/cheocharm/data/{ => remote}/source/MyGroupsRemoteDataSource.kt (77%) rename data/src/main/java/com/cheocharm/data/{ => remote}/source/WriteRemoteDataSource.kt (89%) diff --git a/data/src/main/java/com/cheocharm/data/source/AuthLocalDataSource.kt b/data/src/main/java/com/cheocharm/data/local/source/AuthLocalDataSource.kt similarity index 91% rename from data/src/main/java/com/cheocharm/data/source/AuthLocalDataSource.kt rename to data/src/main/java/com/cheocharm/data/local/source/AuthLocalDataSource.kt index 77646c4a..3c2822e3 100644 --- a/data/src/main/java/com/cheocharm/data/source/AuthLocalDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/local/source/AuthLocalDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.local.source interface AuthLocalDataSource { diff --git a/data/src/main/java/com/cheocharm/data/source/AuthRemoteDataSource.kt b/data/src/main/java/com/cheocharm/data/remote/source/AuthRemoteDataSource.kt similarity index 78% rename from data/src/main/java/com/cheocharm/data/source/AuthRemoteDataSource.kt rename to data/src/main/java/com/cheocharm/data/remote/source/AuthRemoteDataSource.kt index bac94920..383b12d0 100644 --- a/data/src/main/java/com/cheocharm/data/source/AuthRemoteDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/remote/source/AuthRemoteDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.remote.source import com.cheocharm.domain.model.Token diff --git a/data/src/main/java/com/cheocharm/data/source/GroupRemoteDataSource.kt b/data/src/main/java/com/cheocharm/data/remote/source/GroupRemoteDataSource.kt similarity index 87% rename from data/src/main/java/com/cheocharm/data/source/GroupRemoteDataSource.kt rename to data/src/main/java/com/cheocharm/data/remote/source/GroupRemoteDataSource.kt index 61718f52..d709ed14 100644 --- a/data/src/main/java/com/cheocharm/data/source/GroupRemoteDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/remote/source/GroupRemoteDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.remote.source import androidx.paging.PagingData import com.cheocharm.domain.model.Group diff --git a/data/src/main/java/com/cheocharm/data/source/LoginRemoteDataSource.kt b/data/src/main/java/com/cheocharm/data/remote/source/LoginRemoteDataSource.kt similarity index 94% rename from data/src/main/java/com/cheocharm/data/source/LoginRemoteDataSource.kt rename to data/src/main/java/com/cheocharm/data/remote/source/LoginRemoteDataSource.kt index 1fa7744d..464c8ce6 100644 --- a/data/src/main/java/com/cheocharm/data/source/LoginRemoteDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/remote/source/LoginRemoteDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.remote.source import com.cheocharm.domain.model.GoogleSignUpRequest import com.cheocharm.domain.model.Token diff --git a/data/src/main/java/com/cheocharm/data/source/MyGroupsRemoteDataSource.kt b/data/src/main/java/com/cheocharm/data/remote/source/MyGroupsRemoteDataSource.kt similarity index 77% rename from data/src/main/java/com/cheocharm/data/source/MyGroupsRemoteDataSource.kt rename to data/src/main/java/com/cheocharm/data/remote/source/MyGroupsRemoteDataSource.kt index 006465c6..148dbafd 100644 --- a/data/src/main/java/com/cheocharm/data/source/MyGroupsRemoteDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/remote/source/MyGroupsRemoteDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.remote.source import com.cheocharm.data.model.GroupData diff --git a/data/src/main/java/com/cheocharm/data/source/WriteRemoteDataSource.kt b/data/src/main/java/com/cheocharm/data/remote/source/WriteRemoteDataSource.kt similarity index 89% rename from data/src/main/java/com/cheocharm/data/source/WriteRemoteDataSource.kt rename to data/src/main/java/com/cheocharm/data/remote/source/WriteRemoteDataSource.kt index 65d6b589..5068beba 100644 --- a/data/src/main/java/com/cheocharm/data/source/WriteRemoteDataSource.kt +++ b/data/src/main/java/com/cheocharm/data/remote/source/WriteRemoteDataSource.kt @@ -1,4 +1,4 @@ -package com.cheocharm.data.source +package com.cheocharm.data.remote.source import com.cheocharm.domain.model.TempDiary import com.cheocharm.domain.model.WriteDiaryRequest diff --git a/data/src/main/java/com/cheocharm/data/repository/AuthRepositoryImpl.kt b/data/src/main/java/com/cheocharm/data/repository/AuthRepositoryImpl.kt index c59c20f4..2a1fcdb6 100644 --- a/data/src/main/java/com/cheocharm/data/repository/AuthRepositoryImpl.kt +++ b/data/src/main/java/com/cheocharm/data/repository/AuthRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.cheocharm.data.repository import com.cheocharm.data.error.ErrorData import com.cheocharm.data.error.toDomain -import com.cheocharm.data.source.AuthLocalDataSource -import com.cheocharm.data.source.AuthRemoteDataSource +import com.cheocharm.data.local.source.AuthLocalDataSource +import com.cheocharm.data.remote.source.AuthRemoteDataSource import com.cheocharm.domain.model.Token import com.cheocharm.domain.repository.AuthRepository import javax.inject.Inject diff --git a/data/src/main/java/com/cheocharm/data/repository/GroupRepositoryImpl.kt b/data/src/main/java/com/cheocharm/data/repository/GroupRepositoryImpl.kt index 4cfac9eb..bc0fb313 100644 --- a/data/src/main/java/com/cheocharm/data/repository/GroupRepositoryImpl.kt +++ b/data/src/main/java/com/cheocharm/data/repository/GroupRepositoryImpl.kt @@ -3,7 +3,7 @@ package com.cheocharm.data.repository import androidx.paging.PagingData import com.cheocharm.data.error.ErrorData import com.cheocharm.data.error.toDomain -import com.cheocharm.data.source.GroupRemoteDataSource +import com.cheocharm.data.remote.source.GroupRemoteDataSource import com.cheocharm.domain.model.Group import com.cheocharm.domain.repository.GroupRepository import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/com/cheocharm/data/repository/LoginRepositoryImpl.kt b/data/src/main/java/com/cheocharm/data/repository/LoginRepositoryImpl.kt index 3fdfb7d2..3c834368 100644 --- a/data/src/main/java/com/cheocharm/data/repository/LoginRepositoryImpl.kt +++ b/data/src/main/java/com/cheocharm/data/repository/LoginRepositoryImpl.kt @@ -2,7 +2,7 @@ package com.cheocharm.data.repository import com.cheocharm.data.error.ErrorData import com.cheocharm.data.error.toDomain -import com.cheocharm.data.source.LoginRemoteDataSource +import com.cheocharm.data.remote.source.LoginRemoteDataSource import com.cheocharm.domain.model.GoogleSignUpRequest import com.cheocharm.domain.model.Token import com.cheocharm.domain.model.MapZSignInRequest diff --git a/data/src/main/java/com/cheocharm/data/repository/MyGroupsRepositoryImpl.kt b/data/src/main/java/com/cheocharm/data/repository/MyGroupsRepositoryImpl.kt index e313205b..b9b4545e 100644 --- a/data/src/main/java/com/cheocharm/data/repository/MyGroupsRepositoryImpl.kt +++ b/data/src/main/java/com/cheocharm/data/repository/MyGroupsRepositoryImpl.kt @@ -3,7 +3,7 @@ package com.cheocharm.data.repository import com.cheocharm.data.error.ErrorData import com.cheocharm.data.error.toDomain import com.cheocharm.data.mapper.toDomain -import com.cheocharm.data.source.MyGroupsRemoteDataSource +import com.cheocharm.data.remote.source.MyGroupsRemoteDataSource import com.cheocharm.domain.model.Group import com.cheocharm.domain.repository.MyGroupsRepository import javax.inject.Inject diff --git a/data/src/main/java/com/cheocharm/data/repository/WriteRepositoryImpl.kt b/data/src/main/java/com/cheocharm/data/repository/WriteRepositoryImpl.kt index 73bc58e9..2ee45e87 100644 --- a/data/src/main/java/com/cheocharm/data/repository/WriteRepositoryImpl.kt +++ b/data/src/main/java/com/cheocharm/data/repository/WriteRepositoryImpl.kt @@ -2,7 +2,7 @@ package com.cheocharm.data.repository import com.cheocharm.data.error.ErrorData import com.cheocharm.data.error.toDomain -import com.cheocharm.data.source.WriteRemoteDataSource +import com.cheocharm.data.remote.source.WriteRemoteDataSource import com.cheocharm.domain.model.TempDiary import com.cheocharm.domain.model.WriteDiaryRequest import com.cheocharm.domain.model.WriteImageRequest diff --git a/local/src/main/java/com/cheocharm/local/di/DataSourceModule.kt b/local/src/main/java/com/cheocharm/local/di/DataSourceModule.kt index f015137c..efecdea3 100644 --- a/local/src/main/java/com/cheocharm/local/di/DataSourceModule.kt +++ b/local/src/main/java/com/cheocharm/local/di/DataSourceModule.kt @@ -1,6 +1,6 @@ package com.cheocharm.local.di -import com.cheocharm.data.source.AuthLocalDataSource +import com.cheocharm.data.local.source.AuthLocalDataSource import com.cheocharm.local.source.AuthLocalDataSourceImpl import dagger.Binds import dagger.Module diff --git a/local/src/main/java/com/cheocharm/local/source/AuthLocalDataSourceImpl.kt b/local/src/main/java/com/cheocharm/local/source/AuthLocalDataSourceImpl.kt index eeda72b0..34588aca 100644 --- a/local/src/main/java/com/cheocharm/local/source/AuthLocalDataSourceImpl.kt +++ b/local/src/main/java/com/cheocharm/local/source/AuthLocalDataSourceImpl.kt @@ -1,6 +1,6 @@ package com.cheocharm.local.source -import com.cheocharm.data.source.AuthLocalDataSource +import com.cheocharm.data.local.source.AuthLocalDataSource import com.cheocharm.local.SharedPrefManager import javax.inject.Inject diff --git a/remote/src/main/java/com/cheocharm/remote/di/DataSourceModule.kt b/remote/src/main/java/com/cheocharm/remote/di/DataSourceModule.kt index 9067511b..fe8423ef 100644 --- a/remote/src/main/java/com/cheocharm/remote/di/DataSourceModule.kt +++ b/remote/src/main/java/com/cheocharm/remote/di/DataSourceModule.kt @@ -1,11 +1,11 @@ package com.cheocharm.remote.di -import com.cheocharm.data.source.GroupRemoteDataSource +import com.cheocharm.data.remote.source.GroupRemoteDataSource import com.cheocharm.remote.source.GroupRemoteDataSourceImpl -import com.cheocharm.data.source.AuthRemoteDataSource -import com.cheocharm.data.source.LoginRemoteDataSource -import com.cheocharm.data.source.MyGroupsRemoteDataSource -import com.cheocharm.data.source.WriteRemoteDataSource +import com.cheocharm.data.remote.source.AuthRemoteDataSource +import com.cheocharm.data.remote.source.LoginRemoteDataSource +import com.cheocharm.data.remote.source.MyGroupsRemoteDataSource +import com.cheocharm.data.remote.source.WriteRemoteDataSource import com.cheocharm.remote.source.AuthRemoteDataSourceImpl import com.cheocharm.remote.source.LoginRemoteDataSourceImpl import com.cheocharm.remote.source.MyGroupsRemoteDataSourceImpl diff --git a/remote/src/main/java/com/cheocharm/remote/source/AuthRemoteDataSourceImpl.kt b/remote/src/main/java/com/cheocharm/remote/source/AuthRemoteDataSourceImpl.kt index 8cf926bd..0192e8ca 100644 --- a/remote/src/main/java/com/cheocharm/remote/source/AuthRemoteDataSourceImpl.kt +++ b/remote/src/main/java/com/cheocharm/remote/source/AuthRemoteDataSourceImpl.kt @@ -1,11 +1,10 @@ package com.cheocharm.remote.source import com.cheocharm.data.error.ErrorData -import com.cheocharm.data.source.AuthRemoteDataSource +import com.cheocharm.data.remote.source.AuthRemoteDataSource import com.cheocharm.domain.model.Token import com.cheocharm.remote.api.TokenApi import com.cheocharm.remote.mapper.toDomain -import com.cheocharm.remote.model.TokenResponse import java.net.UnknownHostException import javax.inject.Inject diff --git a/remote/src/main/java/com/cheocharm/remote/source/GroupRemoteDataSourceImpl.kt b/remote/src/main/java/com/cheocharm/remote/source/GroupRemoteDataSourceImpl.kt index d1acb7ba..e5dbbedb 100644 --- a/remote/src/main/java/com/cheocharm/remote/source/GroupRemoteDataSourceImpl.kt +++ b/remote/src/main/java/com/cheocharm/remote/source/GroupRemoteDataSourceImpl.kt @@ -4,7 +4,7 @@ import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData import com.cheocharm.data.error.ErrorData -import com.cheocharm.data.source.GroupRemoteDataSource +import com.cheocharm.data.remote.source.GroupRemoteDataSource import com.cheocharm.domain.model.Group import com.cheocharm.remote.api.GroupApi import kotlinx.coroutines.flow.Flow diff --git a/remote/src/main/java/com/cheocharm/remote/source/LoginRemoteDataSourceImpl.kt b/remote/src/main/java/com/cheocharm/remote/source/LoginRemoteDataSourceImpl.kt index 5ddb5324..59671687 100644 --- a/remote/src/main/java/com/cheocharm/remote/source/LoginRemoteDataSourceImpl.kt +++ b/remote/src/main/java/com/cheocharm/remote/source/LoginRemoteDataSourceImpl.kt @@ -1,7 +1,7 @@ package com.cheocharm.remote.source import com.cheocharm.data.error.ErrorData -import com.cheocharm.data.source.LoginRemoteDataSource +import com.cheocharm.data.remote.source.LoginRemoteDataSource import com.cheocharm.domain.model.GoogleSignUpRequest import com.cheocharm.domain.model.Token import com.cheocharm.domain.model.MapZSignInRequest diff --git a/remote/src/main/java/com/cheocharm/remote/source/MyGroupsRemoteDataSourceImpl.kt b/remote/src/main/java/com/cheocharm/remote/source/MyGroupsRemoteDataSourceImpl.kt index 8251d82a..ebb8f04f 100644 --- a/remote/src/main/java/com/cheocharm/remote/source/MyGroupsRemoteDataSourceImpl.kt +++ b/remote/src/main/java/com/cheocharm/remote/source/MyGroupsRemoteDataSourceImpl.kt @@ -2,7 +2,7 @@ package com.cheocharm.remote.source import com.cheocharm.data.error.ErrorData import com.cheocharm.data.model.GroupData -import com.cheocharm.data.source.MyGroupsRemoteDataSource +import com.cheocharm.data.remote.source.MyGroupsRemoteDataSource import com.cheocharm.remote.api.DiaryApi import com.cheocharm.remote.mapper.toData import java.net.UnknownHostException diff --git a/remote/src/main/java/com/cheocharm/remote/source/WriteRemoteDataSourceImpl.kt b/remote/src/main/java/com/cheocharm/remote/source/WriteRemoteDataSourceImpl.kt index fa0dd4c1..4d97d81d 100644 --- a/remote/src/main/java/com/cheocharm/remote/source/WriteRemoteDataSourceImpl.kt +++ b/remote/src/main/java/com/cheocharm/remote/source/WriteRemoteDataSourceImpl.kt @@ -1,7 +1,7 @@ package com.cheocharm.remote.source import com.cheocharm.data.error.ErrorData -import com.cheocharm.data.source.WriteRemoteDataSource +import com.cheocharm.data.remote.source.WriteRemoteDataSource import com.cheocharm.domain.model.TempDiary import com.cheocharm.domain.model.WriteDiaryRequest import com.cheocharm.domain.model.WriteImageRequest