[chore] : #8 패키지 구조 변경

AND-SOPT-ANDROID · Nov 13, 2024 · dca7009 · dca7009
1 parent ace6aa2
commit dca7009
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 23 deletions.
diff --git a/app/src/main/java/org/sopt/and/data/remote/source/AuthRepositoryImpl.kt b/app/src/main/java/org/sopt/and/data/remote/source/AuthRepositoryImpl.kt
@@ -1,10 +1,10 @@
 package org.sopt.and.data.remote.source
 
 import org.sopt.and.domain.mapper.AuthMapper
-import org.sopt.and.domain.model.user.LoginUserEntity
-import org.sopt.and.domain.model.user.RegisterUserEntity
-import org.sopt.and.domain.model.user.UserIdEntity
-import org.sopt.and.domain.model.user.UserTokenEntity
+import org.sopt.and.domain.model.auth.LoginUserEntity
+import org.sopt.and.domain.model.auth.RegisterUserEntity
+import org.sopt.and.domain.model.auth.UserIdEntity
+import org.sopt.and.domain.model.auth.UserTokenEntity
 import org.sopt.and.domain.repository.AuthRepository
 import org.sopt.and.utils.TokenManager
 import javax.inject.Inject

diff --git a/app/src/main/java/org/sopt/and/domain/mapper/AuthMapper.kt b/app/src/main/java/org/sopt/and/domain/mapper/AuthMapper.kt
@@ -4,10 +4,10 @@ import org.sopt.and.data.model.request.UserLoginRequestDto
 import org.sopt.and.data.model.request.UserRegisterRequestDto
 import org.sopt.and.data.model.response.UserLoginResponse
 import org.sopt.and.data.model.response.UserRegisterResponse
-import org.sopt.and.domain.model.user.LoginUserEntity
-import org.sopt.and.domain.model.user.RegisterUserEntity
-import org.sopt.and.domain.model.user.UserIdEntity
-import org.sopt.and.domain.model.user.UserTokenEntity
+import org.sopt.and.domain.model.auth.LoginUserEntity
+import org.sopt.and.domain.model.auth.RegisterUserEntity
+import org.sopt.and.domain.model.auth.UserIdEntity
+import org.sopt.and.domain.model.auth.UserTokenEntity
 
 object AuthMapper {
     fun mapperToUserRegisterRequestDto(entity: RegisterUserEntity) = UserRegisterRequestDto(

diff --git a/.../and/domain/model/user/LoginUserEntity.kt → .../and/domain/model/auth/LoginUserEntity.kt b/.../and/domain/model/user/LoginUserEntity.kt → .../and/domain/model/auth/LoginUserEntity.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.domain.model.user
+package org.sopt.and.domain.model.auth
 
 data class LoginUserEntity(
     val username: String,

diff --git a/...d/domain/model/user/RegisterUserEntity.kt → ...d/domain/model/auth/RegisterUserEntity.kt b/...d/domain/model/user/RegisterUserEntity.kt → ...d/domain/model/auth/RegisterUserEntity.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.domain.model.user
+package org.sopt.and.domain.model.auth
 
 data class RegisterUserEntity(
     val username: String,

diff --git a/...opt/and/domain/model/user/UserIdEntity.kt → ...opt/and/domain/model/auth/UserIdEntity.kt b/...opt/and/domain/model/user/UserIdEntity.kt → ...opt/and/domain/model/auth/UserIdEntity.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.domain.model.user
+package org.sopt.and.domain.model.auth
 
 data class UserIdEntity (
     val no : Long

diff --git a/.../and/domain/model/user/UserTokenEntity.kt → .../and/domain/model/auth/UserTokenEntity.kt b/.../and/domain/model/user/UserTokenEntity.kt → .../and/domain/model/auth/UserTokenEntity.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.domain.model.user
+package org.sopt.and.domain.model.auth
 
 data class UserTokenEntity(
     val token: String

diff --git a/app/src/main/java/org/sopt/and/domain/repository/AuthRepository.kt b/app/src/main/java/org/sopt/and/domain/repository/AuthRepository.kt
@@ -1,9 +1,9 @@
 package org.sopt.and.domain.repository
 
-import org.sopt.and.domain.model.user.LoginUserEntity
-import org.sopt.and.domain.model.user.RegisterUserEntity
-import org.sopt.and.domain.model.user.UserIdEntity
-import org.sopt.and.domain.model.user.UserTokenEntity
+import org.sopt.and.domain.model.auth.LoginUserEntity
+import org.sopt.and.domain.model.auth.RegisterUserEntity
+import org.sopt.and.domain.model.auth.UserIdEntity
+import org.sopt.and.domain.model.auth.UserTokenEntity
 
 interface AuthRepository {
     suspend fun registerUser(userEntity: RegisterUserEntity): Result<UserIdEntity>

diff --git a/app/src/main/java/org/sopt/and/domain/usecase/LoginUserUseCase.kt b/app/src/main/java/org/sopt/and/domain/usecase/LoginUserUseCase.kt
@@ -1,7 +1,7 @@
 package org.sopt.and.domain.usecase
 
-import org.sopt.and.domain.model.user.LoginUserEntity
-import org.sopt.and.domain.model.user.UserTokenEntity
+import org.sopt.and.domain.model.auth.LoginUserEntity
+import org.sopt.and.domain.model.auth.UserTokenEntity
 import org.sopt.and.domain.repository.AuthRepository
 
 class LoginUserUseCase(

diff --git a/app/src/main/java/org/sopt/and/domain/usecase/RegisterUserUseCase.kt b/app/src/main/java/org/sopt/and/domain/usecase/RegisterUserUseCase.kt
@@ -1,7 +1,7 @@
 package org.sopt.and.domain.usecase
 
-import org.sopt.and.domain.model.user.RegisterUserEntity
-import org.sopt.and.domain.model.user.UserIdEntity
+import org.sopt.and.domain.model.auth.RegisterUserEntity
+import org.sopt.and.domain.model.auth.UserIdEntity
 import org.sopt.and.domain.repository.AuthRepository
 
 class RegisterUserUseCase(

diff --git a/app/src/main/java/org/sopt/and/presentation/viewmodel/SignInViewModel.kt b/app/src/main/java/org/sopt/and/presentation/viewmodel/SignInViewModel.kt
@@ -5,7 +5,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.sopt.and.GlobalApplication
 import org.sopt.and.base.BaseViewModel
-import org.sopt.and.domain.model.user.LoginUserEntity
+import org.sopt.and.domain.model.auth.LoginUserEntity
 import org.sopt.and.domain.usecase.LoginUserUseCase
 import org.sopt.and.presentation.utils.UiEffect
 import org.sopt.and.presentation.utils.UiEvent

diff --git a/app/src/main/java/org/sopt/and/presentation/viewmodel/SignUpViewModel.kt b/app/src/main/java/org/sopt/and/presentation/viewmodel/SignUpViewModel.kt
@@ -3,9 +3,8 @@ package org.sopt.and.presentation.viewmodel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.sopt.and.R
 import org.sopt.and.base.BaseViewModel
-import org.sopt.and.domain.model.user.RegisterUserEntity
+import org.sopt.and.domain.model.auth.RegisterUserEntity
 import org.sopt.and.domain.usecase.RegisterUserUseCase
 import org.sopt.and.presentation.utils.UiEffect
 import org.sopt.and.presentation.utils.UiEvent