From 733ff3dafa85ba044d71d926545cc86faf999cdf Mon Sep 17 00:00:00 2001 From: agvber Date: Mon, 26 May 2025 11:26:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20authentication=20module=20package?= =?UTF-8?q?=20directory=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/authentication/build.gradle.kts | 2 +- core/authentication/src/main/AndroidManifest.xml | 2 +- .../com/agvber/core/authentication/SocialLoginService.kt | 8 -------- .../teampatch/core/authentication/SocialLoginService.kt | 8 ++++++++ .../core/authentication/kakao/KakaoAuthentication.kt | 4 ++-- .../core/authentication/kakao/KakaoLoginHelperActivity.kt | 4 ++-- .../core/authentication/kakao/KakaoLoginService.kt | 6 +++--- .../core/authentication/model/Token.kt | 2 +- .../core/data/repository/AuthenticationRepositoryImpl.kt | 2 +- .../repository/local/LocalAuthenticationRepositoryImpl.kt | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 core/authentication/src/main/java/com/agvber/core/authentication/SocialLoginService.kt create mode 100644 core/authentication/src/main/java/com/teampatch/core/authentication/SocialLoginService.kt rename core/authentication/src/main/java/com/{agvber => teampatch}/core/authentication/kakao/KakaoAuthentication.kt (95%) rename core/authentication/src/main/java/com/{agvber => teampatch}/core/authentication/kakao/KakaoLoginHelperActivity.kt (98%) rename core/authentication/src/main/java/com/{agvber => teampatch}/core/authentication/kakao/KakaoLoginService.kt (87%) rename core/authentication/src/main/java/com/{agvber => teampatch}/core/authentication/model/Token.kt (88%) diff --git a/core/authentication/build.gradle.kts b/core/authentication/build.gradle.kts index 842c4667..0b63f5e8 100644 --- a/core/authentication/build.gradle.kts +++ b/core/authentication/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.agvber.core.authentication" + namespace = "com.teampatch.core.authentication" buildTypes { release { diff --git a/core/authentication/src/main/AndroidManifest.xml b/core/authentication/src/main/AndroidManifest.xml index 34cba178..db00d0ee 100644 --- a/core/authentication/src/main/AndroidManifest.xml +++ b/core/authentication/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ diff --git a/core/authentication/src/main/java/com/agvber/core/authentication/SocialLoginService.kt b/core/authentication/src/main/java/com/agvber/core/authentication/SocialLoginService.kt deleted file mode 100644 index 1667ea95..00000000 --- a/core/authentication/src/main/java/com/agvber/core/authentication/SocialLoginService.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.agvber.core.authentication - -import com.agvber.core.authentication.model.Token - -abstract class SocialLoginService { - - abstract suspend fun login(): Token -} \ No newline at end of file diff --git a/core/authentication/src/main/java/com/teampatch/core/authentication/SocialLoginService.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/SocialLoginService.kt new file mode 100644 index 00000000..45017622 --- /dev/null +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/SocialLoginService.kt @@ -0,0 +1,8 @@ +package com.teampatch.core.authentication + +import com.teampatch.core.authentication.model.Token + +abstract class SocialLoginService { + + abstract suspend fun login(): Token +} \ No newline at end of file diff --git a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoAuthentication.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoAuthentication.kt similarity index 95% rename from core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoAuthentication.kt rename to core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoAuthentication.kt index a34659de..c60d52c3 100644 --- a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoAuthentication.kt +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoAuthentication.kt @@ -1,4 +1,4 @@ -package com.agvber.core.authentication.kakao +package com.teampatch.core.authentication.kakao import android.content.Context import android.content.Intent @@ -7,7 +7,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.ActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.Composable -import com.agvber.core.authentication.model.Token +import com.teampatch.core.authentication.model.Token import com.teampatch.core.common.getCustomParcelableExtra /** diff --git a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginHelperActivity.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt similarity index 98% rename from core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginHelperActivity.kt rename to core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt index 37ed64f7..8b6b4aab 100644 --- a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginHelperActivity.kt +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt @@ -1,11 +1,11 @@ -package com.agvber.core.authentication.kakao +package com.teampatch.core.authentication.kakao import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle import android.util.Log -import com.agvber.core.authentication.model.Token +import com.teampatch.core.authentication.model.Token import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.user.UserApiClient import com.kakao.sdk.user.model.User diff --git a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginService.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginService.kt similarity index 87% rename from core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginService.kt rename to core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginService.kt index 37905763..851bdd5f 100644 --- a/core/authentication/src/main/java/com/agvber/core/authentication/kakao/KakaoLoginService.kt +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginService.kt @@ -1,9 +1,9 @@ -package com.agvber.core.authentication.kakao +package com.teampatch.core.authentication.kakao import android.content.Context import android.content.Intent -import com.agvber.core.authentication.SocialLoginService -import com.agvber.core.authentication.model.Token +import com.teampatch.core.authentication.SocialLoginService +import com.teampatch.core.authentication.model.Token import com.teampatch.core.common.getCustomParcelableExtra import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject diff --git a/core/authentication/src/main/java/com/agvber/core/authentication/model/Token.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/model/Token.kt similarity index 88% rename from core/authentication/src/main/java/com/agvber/core/authentication/model/Token.kt rename to core/authentication/src/main/java/com/teampatch/core/authentication/model/Token.kt index 87113919..7eb3607f 100644 --- a/core/authentication/src/main/java/com/agvber/core/authentication/model/Token.kt +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/model/Token.kt @@ -1,4 +1,4 @@ -package com.agvber.core.authentication.model +package com.teampatch.core.authentication.model import android.os.Parcelable import java.util.Date diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/AuthenticationRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/AuthenticationRepositoryImpl.kt index 3bfce0ee..f176b3ff 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/AuthenticationRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/AuthenticationRepositoryImpl.kt @@ -1,6 +1,6 @@ package com.teampatch.core.data.repository -import com.agvber.core.authentication.kakao.KakaoLoginService +import com.teampatch.core.authentication.kakao.KakaoLoginService import com.teampatch.core.data.utils.toServerDateFormat import com.teampatch.core.domain.entity.TokenManager import com.teampatch.core.domain.model.LoginResult diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt index 266a62c1..8ae6ceda 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt @@ -1,6 +1,6 @@ package com.teampatch.core.data.repository.local -import com.agvber.core.authentication.kakao.KakaoLoginService +import com.teampatch.core.authentication.kakao.KakaoLoginService import com.harmony.core.database.dao.UserDao import com.teampatch.core.domain.entity.SocialLoginHelper import com.teampatch.core.domain.entity.TokenManager From dcc25e9738f4a69f922ef15c4614d3e6b73b1395 Mon Sep 17 00:00:00 2001 From: agvber Date: Mon, 26 May 2025 11:36:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20database=20module=20package=20dire?= =?UTF-8?q?ctory=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/data/mapper/MemoryCardMapper.kt | 4 +-- .../teampatch/core/data/mapper/TodoMapper.kt | 4 +-- .../teampatch/core/data/mapper/UserMapper.kt | 2 +- .../repository/TodoOfflineRepositoryImpl.kt | 2 +- .../LocalAuthenticationRepositoryImpl.kt | 2 +- .../LocalGroupManagementRepositoryImpl.kt | 6 ++--- .../local/LocalMemoryCardRepositoryImpl.kt | 4 +-- .../local/LocalQuestionRepositoryImpl.kt | 10 +++---- .../local/LocalUserRepositoryImpl.kt | 4 +-- core/database/build.gradle.kts | 2 +- .../model/multimap/QuestionCommentWithUser.kt | 10 ------- .../core/database/HarmonyDatabase.kt | 26 +++++++++---------- .../core/database/Utils.kt | 2 +- .../database/converters/RoomTypeConverter.kt | 2 +- .../converters/SetStringTypeTypeConverter.kt | 2 +- .../core/database/dao/GroupDao.kt | 4 +-- .../core/database/dao/MemoryCardDao.kt | 4 +-- .../core/database/dao/QuestionDao.kt | 8 +++--- .../core/database/dao/TodoDao.kt | 4 +-- .../core/database/dao/UserDao.kt | 4 +-- .../core/database/di/DatabaseModule.kt | 22 ++++++++-------- .../core/database/model/GroupEntity.kt | 2 +- .../core/database/model/MemoryCardEntity.kt | 2 +- .../database/model/QuestionCommentEntity.kt | 2 +- .../core/database/model/QuestionEntity.kt | 2 +- .../core/database/model/TodoEntity.kt | 2 +- .../core/database/model/UserEntity.kt | 2 +- .../model/multimap/QuestionCommentWithUser.kt | 10 +++++++ .../model/preload/DataPreloadHelper.kt | 2 +- .../model/preload/MemoryCardPreloadData.kt | 2 +- .../model/preload/QuestionPreloadData.kt | 2 +- .../database/model/preload/TodoPreloadData.kt | 2 +- .../database/model/preload/UserPreloadData.kt | 2 +- 33 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 core/database/src/main/java/com/harmony/core/database/model/multimap/QuestionCommentWithUser.kt rename core/database/src/main/java/com/{harmony => teampatch}/core/database/HarmonyDatabase.kt (52%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/Utils.kt (88%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/converters/RoomTypeConverter.kt (76%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/converters/SetStringTypeTypeConverter.kt (92%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/dao/GroupDao.kt (90%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/dao/MemoryCardDao.kt (87%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/dao/QuestionDao.kt (84%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/dao/TodoDao.kt (88%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/dao/UserDao.kt (90%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/di/DatabaseModule.kt (76%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/GroupEntity.kt (91%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/MemoryCardEntity.kt (96%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/QuestionCommentEntity.kt (95%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/QuestionEntity.kt (90%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/TodoEntity.kt (91%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/UserEntity.kt (93%) create mode 100644 core/database/src/main/java/com/teampatch/core/database/model/multimap/QuestionCommentWithUser.kt rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/preload/DataPreloadHelper.kt (90%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/preload/MemoryCardPreloadData.kt (99%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/preload/QuestionPreloadData.kt (99%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/preload/TodoPreloadData.kt (98%) rename core/database/src/main/java/com/{harmony => teampatch}/core/database/model/preload/UserPreloadData.kt (91%) diff --git a/core/data/src/main/java/com/teampatch/core/data/mapper/MemoryCardMapper.kt b/core/data/src/main/java/com/teampatch/core/data/mapper/MemoryCardMapper.kt index 21492800..b9bfffee 100644 --- a/core/data/src/main/java/com/teampatch/core/data/mapper/MemoryCardMapper.kt +++ b/core/data/src/main/java/com/teampatch/core/data/mapper/MemoryCardMapper.kt @@ -1,7 +1,7 @@ package com.teampatch.core.data.mapper -import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER -import com.harmony.core.database.model.MemoryCardEntity +import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER +import com.teampatch.core.database.model.MemoryCardEntity import com.teampatch.core.domain.model.MemoryCard import java.time.LocalDateTime diff --git a/core/data/src/main/java/com/teampatch/core/data/mapper/TodoMapper.kt b/core/data/src/main/java/com/teampatch/core/data/mapper/TodoMapper.kt index 154099ed..cfdf1894 100644 --- a/core/data/src/main/java/com/teampatch/core/data/mapper/TodoMapper.kt +++ b/core/data/src/main/java/com/teampatch/core/data/mapper/TodoMapper.kt @@ -1,7 +1,7 @@ package com.teampatch.core.data.mapper -import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER -import com.harmony.core.database.model.TodoEntity +import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER +import com.teampatch.core.database.model.TodoEntity import com.teampatch.core.domain.model.Todo import java.time.LocalDateTime diff --git a/core/data/src/main/java/com/teampatch/core/data/mapper/UserMapper.kt b/core/data/src/main/java/com/teampatch/core/data/mapper/UserMapper.kt index c36ee660..2153a660 100644 --- a/core/data/src/main/java/com/teampatch/core/data/mapper/UserMapper.kt +++ b/core/data/src/main/java/com/teampatch/core/data/mapper/UserMapper.kt @@ -1,6 +1,6 @@ package com.teampatch.core.data.mapper -import com.harmony.core.database.model.UserEntity +import com.teampatch.core.database.model.UserEntity import com.teampatch.core.domain.model.User import com.teampatch.core.network.model.user.ProfileResponse diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt index 7e3498ac..24469ead 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt @@ -2,7 +2,7 @@ package com.teampatch.core.data.repository import androidx.paging.PagingData import androidx.paging.map -import com.harmony.core.database.dao.TodoDao +import com.teampatch.core.database.dao.TodoDao import com.teampatch.core.data.mapper.toDomain import com.teampatch.core.domain.model.Todo import com.teampatch.core.domain.repository.TodoRepository diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt index 8ae6ceda..1b42869a 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt @@ -1,7 +1,7 @@ package com.teampatch.core.data.repository.local import com.teampatch.core.authentication.kakao.KakaoLoginService -import com.harmony.core.database.dao.UserDao +import com.teampatch.core.database.dao.UserDao import com.teampatch.core.domain.entity.SocialLoginHelper import com.teampatch.core.domain.entity.TokenManager import com.teampatch.core.domain.model.LoginResult diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt index 578d3694..edc349c7 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt @@ -1,8 +1,8 @@ package com.teampatch.core.data.repository.local -import com.harmony.core.database.dao.GroupDao -import com.harmony.core.database.dao.UserDao -import com.harmony.core.database.model.GroupEntity +import com.teampatch.core.database.dao.GroupDao +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.model.GroupEntity import com.teampatch.core.data.mapper.roleStringMapper import com.teampatch.core.domain.model.FamilyInfo import com.teampatch.core.domain.model.InvitedGroup diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt index 639f513a..88446a76 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.teampatch.core.data.repository.local import android.util.Log import androidx.paging.PagingData -import com.harmony.core.database.dao.MemoryCardDao -import com.harmony.core.database.dao.UserDao +import com.teampatch.core.database.dao.MemoryCardDao +import com.teampatch.core.database.dao.UserDao import com.teampatch.core.data.mapper.toDomain import com.teampatch.core.domain.fake.FakeMemoryCardQuestion import com.teampatch.core.domain.model.MemoryCard diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalQuestionRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalQuestionRepositoryImpl.kt index 5471aabc..9154b603 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalQuestionRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalQuestionRepositoryImpl.kt @@ -1,11 +1,11 @@ package com.teampatch.core.data.repository.local import androidx.paging.PagingData -import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER -import com.harmony.core.database.dao.QuestionDao -import com.harmony.core.database.dao.UserDao -import com.harmony.core.database.getCurrentTimeLocalDBFormat -import com.harmony.core.database.model.QuestionCommentEntity +import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER +import com.teampatch.core.database.dao.QuestionDao +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.getCurrentTimeLocalDBFormat +import com.teampatch.core.database.model.QuestionCommentEntity import com.teampatch.core.domain.model.Question import com.teampatch.core.domain.model.QuestionComment import com.teampatch.core.domain.model.QuestionDetail diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt index acc9839a..21939de4 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt @@ -4,8 +4,8 @@ import android.content.Context import android.net.Uri import android.webkit.MimeTypeMap import androidx.core.net.toUri -import com.harmony.core.database.dao.UserDao -import com.harmony.core.database.model.UserEntity +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.model.UserEntity import com.teampatch.core.data.di.annotation.DispatchersContext import com.teampatch.core.data.di.annotation.HarmonyDispatcher import com.teampatch.core.data.mapper.MEMBER diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 8ebc6928..29cb1454 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "com.harmony.core.database" + namespace = "com.teampatch.core.database" } dependencies { diff --git a/core/database/src/main/java/com/harmony/core/database/model/multimap/QuestionCommentWithUser.kt b/core/database/src/main/java/com/harmony/core/database/model/multimap/QuestionCommentWithUser.kt deleted file mode 100644 index dc3c5ddd..00000000 --- a/core/database/src/main/java/com/harmony/core/database/model/multimap/QuestionCommentWithUser.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.harmony.core.database.model.multimap - -import androidx.room.Embedded -import com.harmony.core.database.model.QuestionCommentEntity -import com.harmony.core.database.model.UserEntity - -data class QuestionCommentWithUser( - @Embedded val comment: QuestionCommentEntity, - @Embedded val user: UserEntity, -) \ No newline at end of file diff --git a/core/database/src/main/java/com/harmony/core/database/HarmonyDatabase.kt b/core/database/src/main/java/com/teampatch/core/database/HarmonyDatabase.kt similarity index 52% rename from core/database/src/main/java/com/harmony/core/database/HarmonyDatabase.kt rename to core/database/src/main/java/com/teampatch/core/database/HarmonyDatabase.kt index bc8294ca..afca031f 100644 --- a/core/database/src/main/java/com/harmony/core/database/HarmonyDatabase.kt +++ b/core/database/src/main/java/com/teampatch/core/database/HarmonyDatabase.kt @@ -1,20 +1,20 @@ -package com.harmony.core.database +package com.teampatch.core.database import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.harmony.core.database.converters.SetStringTypeTypeConverter -import com.harmony.core.database.dao.GroupDao -import com.harmony.core.database.dao.MemoryCardDao -import com.harmony.core.database.dao.QuestionDao -import com.harmony.core.database.dao.TodoDao -import com.harmony.core.database.dao.UserDao -import com.harmony.core.database.model.GroupEntity -import com.harmony.core.database.model.MemoryCardEntity -import com.harmony.core.database.model.QuestionCommentEntity -import com.harmony.core.database.model.QuestionEntity -import com.harmony.core.database.model.TodoEntity -import com.harmony.core.database.model.UserEntity +import com.teampatch.core.database.converters.SetStringTypeTypeConverter +import com.teampatch.core.database.dao.GroupDao +import com.teampatch.core.database.dao.MemoryCardDao +import com.teampatch.core.database.dao.QuestionDao +import com.teampatch.core.database.dao.TodoDao +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.model.GroupEntity +import com.teampatch.core.database.model.MemoryCardEntity +import com.teampatch.core.database.model.QuestionCommentEntity +import com.teampatch.core.database.model.QuestionEntity +import com.teampatch.core.database.model.TodoEntity +import com.teampatch.core.database.model.UserEntity @Database( entities = [ diff --git a/core/database/src/main/java/com/harmony/core/database/Utils.kt b/core/database/src/main/java/com/teampatch/core/database/Utils.kt similarity index 88% rename from core/database/src/main/java/com/harmony/core/database/Utils.kt rename to core/database/src/main/java/com/teampatch/core/database/Utils.kt index d6f314e6..8bf16155 100644 --- a/core/database/src/main/java/com/harmony/core/database/Utils.kt +++ b/core/database/src/main/java/com/teampatch/core/database/Utils.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database +package com.teampatch.core.database import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/core/database/src/main/java/com/harmony/core/database/converters/RoomTypeConverter.kt b/core/database/src/main/java/com/teampatch/core/database/converters/RoomTypeConverter.kt similarity index 76% rename from core/database/src/main/java/com/harmony/core/database/converters/RoomTypeConverter.kt rename to core/database/src/main/java/com/teampatch/core/database/converters/RoomTypeConverter.kt index f74fa342..c6952f3d 100644 --- a/core/database/src/main/java/com/harmony/core/database/converters/RoomTypeConverter.kt +++ b/core/database/src/main/java/com/teampatch/core/database/converters/RoomTypeConverter.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.converters +package com.teampatch.core.database.converters internal abstract class RoomTypeConverter { abstract fun fromObjectToJson(value: T): String diff --git a/core/database/src/main/java/com/harmony/core/database/converters/SetStringTypeTypeConverter.kt b/core/database/src/main/java/com/teampatch/core/database/converters/SetStringTypeTypeConverter.kt similarity index 92% rename from core/database/src/main/java/com/harmony/core/database/converters/SetStringTypeTypeConverter.kt rename to core/database/src/main/java/com/teampatch/core/database/converters/SetStringTypeTypeConverter.kt index 936d08a5..6c71f07a 100644 --- a/core/database/src/main/java/com/harmony/core/database/converters/SetStringTypeTypeConverter.kt +++ b/core/database/src/main/java/com/teampatch/core/database/converters/SetStringTypeTypeConverter.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.converters +package com.teampatch.core.database.converters import androidx.room.TypeConverter import com.squareup.moshi.JsonAdapter diff --git a/core/database/src/main/java/com/harmony/core/database/dao/GroupDao.kt b/core/database/src/main/java/com/teampatch/core/database/dao/GroupDao.kt similarity index 90% rename from core/database/src/main/java/com/harmony/core/database/dao/GroupDao.kt rename to core/database/src/main/java/com/teampatch/core/database/dao/GroupDao.kt index bd4bfa86..2a37f74d 100644 --- a/core/database/src/main/java/com/harmony/core/database/dao/GroupDao.kt +++ b/core/database/src/main/java/com/teampatch/core/database/dao/GroupDao.kt @@ -1,10 +1,10 @@ -package com.harmony.core.database.dao +package com.teampatch.core.database.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query -import com.harmony.core.database.model.GroupEntity +import com.teampatch.core.database.model.GroupEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/core/database/src/main/java/com/harmony/core/database/dao/MemoryCardDao.kt b/core/database/src/main/java/com/teampatch/core/database/dao/MemoryCardDao.kt similarity index 87% rename from core/database/src/main/java/com/harmony/core/database/dao/MemoryCardDao.kt rename to core/database/src/main/java/com/teampatch/core/database/dao/MemoryCardDao.kt index 2a33fb81..bdb92051 100644 --- a/core/database/src/main/java/com/harmony/core/database/dao/MemoryCardDao.kt +++ b/core/database/src/main/java/com/teampatch/core/database/dao/MemoryCardDao.kt @@ -1,10 +1,10 @@ -package com.harmony.core.database.dao +package com.teampatch.core.database.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.Query import androidx.room.Update -import com.harmony.core.database.model.MemoryCardEntity +import com.teampatch.core.database.model.MemoryCardEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/core/database/src/main/java/com/harmony/core/database/dao/QuestionDao.kt b/core/database/src/main/java/com/teampatch/core/database/dao/QuestionDao.kt similarity index 84% rename from core/database/src/main/java/com/harmony/core/database/dao/QuestionDao.kt rename to core/database/src/main/java/com/teampatch/core/database/dao/QuestionDao.kt index ace28b32..e6d32eed 100644 --- a/core/database/src/main/java/com/harmony/core/database/dao/QuestionDao.kt +++ b/core/database/src/main/java/com/teampatch/core/database/dao/QuestionDao.kt @@ -1,12 +1,12 @@ -package com.harmony.core.database.dao +package com.teampatch.core.database.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.Query import androidx.room.Update -import com.harmony.core.database.model.QuestionCommentEntity -import com.harmony.core.database.model.QuestionEntity -import com.harmony.core.database.model.multimap.QuestionCommentWithUser +import com.teampatch.core.database.model.QuestionCommentEntity +import com.teampatch.core.database.model.QuestionEntity +import com.teampatch.core.database.model.multimap.QuestionCommentWithUser import kotlinx.coroutines.flow.Flow @Dao diff --git a/core/database/src/main/java/com/harmony/core/database/dao/TodoDao.kt b/core/database/src/main/java/com/teampatch/core/database/dao/TodoDao.kt similarity index 88% rename from core/database/src/main/java/com/harmony/core/database/dao/TodoDao.kt rename to core/database/src/main/java/com/teampatch/core/database/dao/TodoDao.kt index 2876ab45..b9011604 100644 --- a/core/database/src/main/java/com/harmony/core/database/dao/TodoDao.kt +++ b/core/database/src/main/java/com/teampatch/core/database/dao/TodoDao.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.dao +package com.teampatch.core.database.dao import androidx.room.Dao import androidx.room.Delete @@ -6,7 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import com.harmony.core.database.model.TodoEntity +import com.teampatch.core.database.model.TodoEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/core/database/src/main/java/com/harmony/core/database/dao/UserDao.kt b/core/database/src/main/java/com/teampatch/core/database/dao/UserDao.kt similarity index 90% rename from core/database/src/main/java/com/harmony/core/database/dao/UserDao.kt rename to core/database/src/main/java/com/teampatch/core/database/dao/UserDao.kt index 6f109070..d5a3b36d 100644 --- a/core/database/src/main/java/com/harmony/core/database/dao/UserDao.kt +++ b/core/database/src/main/java/com/teampatch/core/database/dao/UserDao.kt @@ -1,10 +1,10 @@ -package com.harmony.core.database.dao +package com.teampatch.core.database.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.Query import androidx.room.Update -import com.harmony.core.database.model.UserEntity +import com.teampatch.core.database.model.UserEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/core/database/src/main/java/com/harmony/core/database/di/DatabaseModule.kt b/core/database/src/main/java/com/teampatch/core/database/di/DatabaseModule.kt similarity index 76% rename from core/database/src/main/java/com/harmony/core/database/di/DatabaseModule.kt rename to core/database/src/main/java/com/teampatch/core/database/di/DatabaseModule.kt index 1069a14e..2ddfd89b 100644 --- a/core/database/src/main/java/com/harmony/core/database/di/DatabaseModule.kt +++ b/core/database/src/main/java/com/teampatch/core/database/di/DatabaseModule.kt @@ -1,19 +1,19 @@ -package com.harmony.core.database.di +package com.teampatch.core.database.di import android.content.Context import androidx.room.Room import androidx.room.RoomDatabase.Callback import androidx.sqlite.db.SupportSQLiteDatabase -import com.harmony.core.database.HarmonyDatabase -import com.harmony.core.database.dao.GroupDao -import com.harmony.core.database.dao.MemoryCardDao -import com.harmony.core.database.dao.QuestionDao -import com.harmony.core.database.dao.TodoDao -import com.harmony.core.database.dao.UserDao -import com.harmony.core.database.model.preload.MemoryCardPreloadData -import com.harmony.core.database.model.preload.QuestionPreloadData -import com.harmony.core.database.model.preload.TodoPreloadData -import com.harmony.core.database.model.preload.UserPreloadData +import com.teampatch.core.database.HarmonyDatabase +import com.teampatch.core.database.dao.GroupDao +import com.teampatch.core.database.dao.MemoryCardDao +import com.teampatch.core.database.dao.QuestionDao +import com.teampatch.core.database.dao.TodoDao +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.model.preload.MemoryCardPreloadData +import com.teampatch.core.database.model.preload.QuestionPreloadData +import com.teampatch.core.database.model.preload.TodoPreloadData +import com.teampatch.core.database.model.preload.UserPreloadData import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/database/src/main/java/com/harmony/core/database/model/GroupEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/GroupEntity.kt similarity index 91% rename from core/database/src/main/java/com/harmony/core/database/model/GroupEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/GroupEntity.kt index 8cd81d7e..47a39c94 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/GroupEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/GroupEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/harmony/core/database/model/MemoryCardEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/MemoryCardEntity.kt similarity index 96% rename from core/database/src/main/java/com/harmony/core/database/model/MemoryCardEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/MemoryCardEntity.kt index 0628d5ec..8a21dcd4 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/MemoryCardEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/MemoryCardEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/harmony/core/database/model/QuestionCommentEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/QuestionCommentEntity.kt similarity index 95% rename from core/database/src/main/java/com/harmony/core/database/model/QuestionCommentEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/QuestionCommentEntity.kt index d71970cc..69ff9ff8 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/QuestionCommentEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/QuestionCommentEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/harmony/core/database/model/QuestionEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/QuestionEntity.kt similarity index 90% rename from core/database/src/main/java/com/harmony/core/database/model/QuestionEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/QuestionEntity.kt index 4f6cc9ba..52c593b6 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/QuestionEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/QuestionEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/harmony/core/database/model/TodoEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/TodoEntity.kt similarity index 91% rename from core/database/src/main/java/com/harmony/core/database/model/TodoEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/TodoEntity.kt index 1b92887b..0a8f0a09 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/TodoEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/TodoEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/harmony/core/database/model/UserEntity.kt b/core/database/src/main/java/com/teampatch/core/database/model/UserEntity.kt similarity index 93% rename from core/database/src/main/java/com/harmony/core/database/model/UserEntity.kt rename to core/database/src/main/java/com/teampatch/core/database/model/UserEntity.kt index 48145c6f..da1b823c 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/UserEntity.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/UserEntity.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model +package com.teampatch.core.database.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/database/src/main/java/com/teampatch/core/database/model/multimap/QuestionCommentWithUser.kt b/core/database/src/main/java/com/teampatch/core/database/model/multimap/QuestionCommentWithUser.kt new file mode 100644 index 00000000..c1b24c50 --- /dev/null +++ b/core/database/src/main/java/com/teampatch/core/database/model/multimap/QuestionCommentWithUser.kt @@ -0,0 +1,10 @@ +package com.teampatch.core.database.model.multimap + +import androidx.room.Embedded +import com.teampatch.core.database.model.QuestionCommentEntity +import com.teampatch.core.database.model.UserEntity + +data class QuestionCommentWithUser( + @Embedded val comment: QuestionCommentEntity, + @Embedded val user: UserEntity, +) \ No newline at end of file diff --git a/core/database/src/main/java/com/harmony/core/database/model/preload/DataPreloadHelper.kt b/core/database/src/main/java/com/teampatch/core/database/model/preload/DataPreloadHelper.kt similarity index 90% rename from core/database/src/main/java/com/harmony/core/database/model/preload/DataPreloadHelper.kt rename to core/database/src/main/java/com/teampatch/core/database/model/preload/DataPreloadHelper.kt index 0775d94d..40e0418a 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/preload/DataPreloadHelper.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/preload/DataPreloadHelper.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model.preload +package com.teampatch.core.database.model.preload import android.content.ContentValues import androidx.room.OnConflictStrategy diff --git a/core/database/src/main/java/com/harmony/core/database/model/preload/MemoryCardPreloadData.kt b/core/database/src/main/java/com/teampatch/core/database/model/preload/MemoryCardPreloadData.kt similarity index 99% rename from core/database/src/main/java/com/harmony/core/database/model/preload/MemoryCardPreloadData.kt rename to core/database/src/main/java/com/teampatch/core/database/model/preload/MemoryCardPreloadData.kt index f57f5c4e..ca1b7445 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/preload/MemoryCardPreloadData.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/preload/MemoryCardPreloadData.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model.preload +package com.teampatch.core.database.model.preload import android.content.ContentValues diff --git a/core/database/src/main/java/com/harmony/core/database/model/preload/QuestionPreloadData.kt b/core/database/src/main/java/com/teampatch/core/database/model/preload/QuestionPreloadData.kt similarity index 99% rename from core/database/src/main/java/com/harmony/core/database/model/preload/QuestionPreloadData.kt rename to core/database/src/main/java/com/teampatch/core/database/model/preload/QuestionPreloadData.kt index ec3c0860..1652ef2c 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/preload/QuestionPreloadData.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/preload/QuestionPreloadData.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model.preload +package com.teampatch.core.database.model.preload import android.content.ContentValues diff --git a/core/database/src/main/java/com/harmony/core/database/model/preload/TodoPreloadData.kt b/core/database/src/main/java/com/teampatch/core/database/model/preload/TodoPreloadData.kt similarity index 98% rename from core/database/src/main/java/com/harmony/core/database/model/preload/TodoPreloadData.kt rename to core/database/src/main/java/com/teampatch/core/database/model/preload/TodoPreloadData.kt index 49485bb6..c6453dda 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/preload/TodoPreloadData.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/preload/TodoPreloadData.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model.preload +package com.teampatch.core.database.model.preload import android.content.ContentValues diff --git a/core/database/src/main/java/com/harmony/core/database/model/preload/UserPreloadData.kt b/core/database/src/main/java/com/teampatch/core/database/model/preload/UserPreloadData.kt similarity index 91% rename from core/database/src/main/java/com/harmony/core/database/model/preload/UserPreloadData.kt rename to core/database/src/main/java/com/teampatch/core/database/model/preload/UserPreloadData.kt index 16b30d42..cbef6caf 100644 --- a/core/database/src/main/java/com/harmony/core/database/model/preload/UserPreloadData.kt +++ b/core/database/src/main/java/com/teampatch/core/database/model/preload/UserPreloadData.kt @@ -1,4 +1,4 @@ -package com.harmony.core.database.model.preload +package com.teampatch.core.database.model.preload import android.content.ContentValues From a3cd967bb7471eaeb01184ca46f0a4db660abbd4 Mon Sep 17 00:00:00 2001 From: agvber Date: Mon, 26 May 2025 11:46:15 +0900 Subject: [PATCH 3/3] chore: ktlinter code cleanup --- .../core/authentication/kakao/KakaoLoginHelperActivity.kt | 2 +- .../core/data/repository/TodoOfflineRepositoryImpl.kt | 2 +- .../repository/local/LocalGroupManagementRepositoryImpl.kt | 2 +- .../data/repository/local/LocalMemoryCardRepositoryImpl.kt | 2 +- .../core/data/repository/local/LocalUserRepositoryImpl.kt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt index 8b6b4aab..a618501c 100644 --- a/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt +++ b/core/authentication/src/main/java/com/teampatch/core/authentication/kakao/KakaoLoginHelperActivity.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.util.Log -import com.teampatch.core.authentication.model.Token import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.user.UserApiClient import com.kakao.sdk.user.model.User +import com.teampatch.core.authentication.model.Token internal class KakaoLoginHelperActivity : Activity() { diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt index 24469ead..6b3eba4b 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.teampatch.core.data.repository import androidx.paging.PagingData import androidx.paging.map -import com.teampatch.core.database.dao.TodoDao import com.teampatch.core.data.mapper.toDomain +import com.teampatch.core.database.dao.TodoDao import com.teampatch.core.domain.model.Todo import com.teampatch.core.domain.repository.TodoRepository import javax.inject.Inject diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt index edc349c7..8f671b44 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt @@ -1,9 +1,9 @@ package com.teampatch.core.data.repository.local +import com.teampatch.core.data.mapper.roleStringMapper import com.teampatch.core.database.dao.GroupDao import com.teampatch.core.database.dao.UserDao import com.teampatch.core.database.model.GroupEntity -import com.teampatch.core.data.mapper.roleStringMapper import com.teampatch.core.domain.model.FamilyInfo import com.teampatch.core.domain.model.InvitedGroup import com.teampatch.core.domain.model.UserGroup diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt index 88446a76..051e555b 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt @@ -2,9 +2,9 @@ package com.teampatch.core.data.repository.local import android.util.Log import androidx.paging.PagingData +import com.teampatch.core.data.mapper.toDomain import com.teampatch.core.database.dao.MemoryCardDao import com.teampatch.core.database.dao.UserDao -import com.teampatch.core.data.mapper.toDomain import com.teampatch.core.domain.fake.FakeMemoryCardQuestion import com.teampatch.core.domain.model.MemoryCard import com.teampatch.core.domain.model.MemoryCardQuestion diff --git a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt index 21939de4..4053dab5 100644 --- a/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt +++ b/core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt @@ -4,14 +4,14 @@ import android.content.Context import android.net.Uri import android.webkit.MimeTypeMap import androidx.core.net.toUri -import com.teampatch.core.database.dao.UserDao -import com.teampatch.core.database.model.UserEntity import com.teampatch.core.data.di.annotation.DispatchersContext import com.teampatch.core.data.di.annotation.HarmonyDispatcher import com.teampatch.core.data.mapper.MEMBER import com.teampatch.core.data.mapper.VIP import com.teampatch.core.data.mapper.toDomain import com.teampatch.core.data.utils.getMediaStoreInfo +import com.teampatch.core.database.dao.UserDao +import com.teampatch.core.database.model.UserEntity import com.teampatch.core.domain.entity.SocialLoginHelper import com.teampatch.core.domain.model.Role import com.teampatch.core.domain.model.User