-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[#5] 지역코드/시군구코드 로컬 저장 #6
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b7f0410
feat: add AreaCode database (Room)
ksw4015 e9815d3
test: add AreaCodeDaoTest
ksw4015 6c68cba
Merge branch 'feature/3' into feature/workmanager
ksw4015 98dea22
feat: add AreaCodeWorker with hilt worker
ksw4015 3232784
Merge branch 'feature/room-5' into feature/5
ksw4015 74bec00
Merge branch 'feature/workmanager-7' into feature/5
ksw4015 9c6cae1
refactor: AreaCodeWorker & SplashActivity refactoring
ksw4015 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
app/src/androidTest/java/kr/ksw/visitkorea/HiltTestRunner.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package kr.ksw.visitkorea | ||
|
||
import android.app.Application | ||
import android.content.Context | ||
import androidx.test.runner.AndroidJUnitRunner | ||
import dagger.hilt.android.testing.HiltTestApplication | ||
|
||
class HiltTestRunner: AndroidJUnitRunner() { | ||
override fun newApplication( | ||
cl: ClassLoader?, | ||
className: String?, | ||
context: Context? | ||
): Application { | ||
return super.newApplication(cl, HiltTestApplication::class.java.name, context) | ||
} | ||
} |
83 changes: 83 additions & 0 deletions
83
app/src/androidTest/java/kr/ksw/visitkorea/data/local/dao/AreaCodeDaoTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
package kr.ksw.visitkorea.data.local.dao | ||
|
||
import androidx.test.filters.SmallTest | ||
import dagger.hilt.android.testing.HiltAndroidRule | ||
import dagger.hilt.android.testing.HiltAndroidTest | ||
import kotlinx.coroutines.test.runTest | ||
import kr.ksw.visitkorea.data.local.databases.AreaCodeDatabase | ||
import kr.ksw.visitkorea.data.local.entity.AreaCodeEntity | ||
import kr.ksw.visitkorea.data.local.entity.SigunguCodeEntity | ||
import org.junit.After | ||
import org.junit.Before | ||
import org.junit.Rule | ||
import org.junit.Test | ||
import javax.inject.Inject | ||
|
||
@HiltAndroidTest | ||
@SmallTest | ||
class AreaCodeDaoTest { | ||
|
||
@get:Rule | ||
val hiltRule = HiltAndroidRule(this) | ||
|
||
@Inject | ||
lateinit var areaCodeDatabase: AreaCodeDatabase | ||
|
||
private lateinit var dao: AreaCodeDao | ||
|
||
@Before | ||
fun setUp() { | ||
hiltRule.inject() | ||
dao = areaCodeDatabase.areaCodeDao | ||
} | ||
|
||
@After | ||
fun tearDown() { | ||
areaCodeDatabase.close() | ||
} | ||
|
||
@Test | ||
fun getAllAreaCodeEntities_areaCodeListIsEmpty() = runTest { | ||
assert(dao.getAllAreaCodeEntities().isEmpty()) | ||
} | ||
|
||
@Test | ||
fun upsertAreaCodeEntity_areaCodeIsUpserted() = runTest { | ||
val areaCodeEntity = AreaCodeEntity( | ||
code = "1", name = "서울" | ||
) | ||
dao.upsertAreaCodeEntity(areaCodeEntity) | ||
assert(dao.getAllAreaCodeEntities().isNotEmpty()) | ||
} | ||
|
||
@Test | ||
fun upsertSigunguCodeEntity_sigunguCodeIsUpserted() = runTest { | ||
val sigunguCodeEntity = SigunguCodeEntity( | ||
areaCode = "1", code = "1", name = "강남구" | ||
) | ||
dao.upsertSigunguCodeEntity(sigunguCodeEntity) | ||
assert(dao.getSigunguCodeByAreaCode("1").isNotEmpty()) | ||
} | ||
|
||
@Test | ||
fun `getSigunguCodeByAreaCode_sigunguCodeListByAreaCode1`() = runTest { | ||
for(i in 1..4) { | ||
dao.upsertSigunguCodeEntity(SigunguCodeEntity( | ||
id = i, | ||
areaCode = "1", | ||
code = "$i", | ||
name = "시군구 $i" | ||
)) | ||
} | ||
dao.upsertSigunguCodeEntity(SigunguCodeEntity( | ||
id = 5, | ||
areaCode = "2", | ||
code = "1", | ||
name = "가평군" | ||
)) | ||
|
||
val sigunguCodeEntities = dao.getSigunguCodeByAreaCode("1") | ||
assert(sigunguCodeEntities.isNotEmpty()) | ||
assert(sigunguCodeEntities.size == 4) | ||
} | ||
} |
82 changes: 82 additions & 0 deletions
82
app/src/androidTest/java/kr/ksw/visitkorea/data/repository/FakeAndroidAreaCodeRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
package kr.ksw.visitkorea.data.repository | ||
|
||
import kr.ksw.visitkorea.data.mapper.toItems | ||
import kr.ksw.visitkorea.data.remote.dto.AreaCodeDTO | ||
import kr.ksw.visitkorea.data.remote.model.ApiResponse | ||
import kr.ksw.visitkorea.data.remote.model.CommonBody | ||
import kr.ksw.visitkorea.data.remote.model.CommonHeader | ||
import kr.ksw.visitkorea.data.remote.model.CommonItem | ||
import kr.ksw.visitkorea.data.remote.model.CommonResponse | ||
|
||
class FakeAndroidAreaCodeRepository : AreaCodeRepository { | ||
private var areaCodeResponse = ApiResponse( | ||
CommonResponse( | ||
CommonHeader("0000", "OK"), | ||
CommonBody( | ||
10, | ||
1, | ||
17, | ||
CommonItem(listOf( | ||
AreaCodeDTO("1","서울"), | ||
AreaCodeDTO("2","인천"), | ||
AreaCodeDTO("3","대전"), | ||
AreaCodeDTO("4","대구"), | ||
AreaCodeDTO("5","광주"), | ||
AreaCodeDTO("6","부산"), | ||
AreaCodeDTO("7","울산"), | ||
AreaCodeDTO("8","세종특별자치시"), | ||
AreaCodeDTO("31","경기도"), | ||
AreaCodeDTO("32","강원특별자치도") | ||
)) | ||
) | ||
) | ||
) | ||
|
||
private var sigunguCodeResponse1 = ApiResponse( | ||
CommonResponse( | ||
CommonHeader("0000", "OK"), | ||
CommonBody( | ||
5, | ||
1, | ||
25, | ||
CommonItem(listOf( | ||
AreaCodeDTO("1","강남구"), | ||
AreaCodeDTO("2","강동구"), | ||
AreaCodeDTO("3","강북구"), | ||
AreaCodeDTO("4","강서구"), | ||
AreaCodeDTO("5","관악구") | ||
)) | ||
) | ||
) | ||
) | ||
private var sigunguCodeResponse2 = ApiResponse( | ||
CommonResponse( | ||
CommonHeader("0000", "OK"), | ||
CommonBody( | ||
5, | ||
1, | ||
31, | ||
CommonItem(listOf( | ||
AreaCodeDTO("1","가평군"), | ||
AreaCodeDTO("2","고양시"), | ||
AreaCodeDTO("3","과천시"), | ||
AreaCodeDTO("4","광명시"), | ||
AreaCodeDTO("5","광주시") | ||
)) | ||
) | ||
) | ||
) | ||
|
||
private var sigunguRequest = mapOf( | ||
"1" to sigunguCodeResponse1, | ||
"31" to sigunguCodeResponse2 | ||
) | ||
|
||
override suspend fun getAreaCode(): Result<List<AreaCodeDTO>> = runCatching { | ||
areaCodeResponse.toItems() | ||
} | ||
|
||
override suspend fun getSigunguCode(areaCode: String): Result<List<AreaCodeDTO>> = runCatching { | ||
sigunguRequest[areaCode]!!.toItems() | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
app/src/androidTest/java/kr/ksw/visitkorea/di/TestAppModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package kr.ksw.visitkorea.di | ||
|
||
import android.app.Application | ||
import androidx.room.Room | ||
import dagger.Module | ||
import dagger.Provides | ||
import dagger.hilt.InstallIn | ||
import dagger.hilt.components.SingletonComponent | ||
import dagger.hilt.testing.TestInstallIn | ||
import kr.ksw.visitkorea.data.di.DataModule | ||
import kr.ksw.visitkorea.data.local.databases.AreaCodeDatabase | ||
import kr.ksw.visitkorea.data.repository.AreaCodeRepository | ||
import kr.ksw.visitkorea.data.repository.FakeAndroidAreaCodeRepository | ||
import javax.inject.Singleton | ||
|
||
@Module | ||
@TestInstallIn( | ||
components = [SingletonComponent::class], | ||
replaces = [DataModule::class] | ||
) | ||
object TestAppModule { | ||
|
||
@Provides | ||
@Singleton | ||
fun provideAreaCodeDatabase(application: Application): AreaCodeDatabase { | ||
return Room.inMemoryDatabaseBuilder( | ||
application, | ||
AreaCodeDatabase::class.java | ||
).build() | ||
} | ||
|
||
@Provides | ||
@Singleton | ||
fun provideAreaCodeRepository(): AreaCodeRepository { | ||
return FakeAndroidAreaCodeRepository() | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,18 @@ | ||
package kr.ksw.visitkorea.app | ||
|
||
import android.app.Application | ||
import androidx.hilt.work.HiltWorkerFactory | ||
import androidx.work.Configuration | ||
import dagger.hilt.android.HiltAndroidApp | ||
import javax.inject.Inject | ||
|
||
@HiltAndroidApp | ||
class VisitKoreaApp : Application() | ||
class VisitKoreaApp : Application(), Configuration.Provider { | ||
@Inject | ||
lateinit var hiltWorkerFactory: HiltWorkerFactory | ||
|
||
override val workManagerConfiguration: Configuration | ||
get() = Configuration.Builder() | ||
.setWorkerFactory(hiltWorkerFactory) | ||
.build() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
app/src/main/java/kr/ksw/visitkorea/data/local/dao/AreaCodeDao.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package kr.ksw.visitkorea.data.local.dao | ||
|
||
import androidx.room.Dao | ||
import androidx.room.Query | ||
import androidx.room.Upsert | ||
import kr.ksw.visitkorea.data.local.entity.AreaCodeEntity | ||
import kr.ksw.visitkorea.data.local.entity.SigunguCodeEntity | ||
|
||
@Dao | ||
interface AreaCodeDao { | ||
@Upsert | ||
suspend fun upsertAreaCodeEntity(areaCodeEntity: AreaCodeEntity) | ||
|
||
@Upsert | ||
suspend fun upsertSigunguCodeEntity(sigunguCodeEntity: SigunguCodeEntity) | ||
|
||
@Query("SELECT * FROM area_code") | ||
suspend fun getAllAreaCodeEntities(): List<AreaCodeEntity> | ||
|
||
@Query("SELECT * FROM sigungu_code WHERE areaCode = :areaCode") | ||
suspend fun getSigunguCodeByAreaCode(areaCode: String): List<SigunguCodeEntity> | ||
} |
15 changes: 15 additions & 0 deletions
15
app/src/main/java/kr/ksw/visitkorea/data/local/databases/AreaCodeDatabase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package kr.ksw.visitkorea.data.local.databases | ||
|
||
import androidx.room.Database | ||
import androidx.room.RoomDatabase | ||
import kr.ksw.visitkorea.data.local.dao.AreaCodeDao | ||
import kr.ksw.visitkorea.data.local.entity.AreaCodeEntity | ||
import kr.ksw.visitkorea.data.local.entity.SigunguCodeEntity | ||
|
||
@Database( | ||
entities = [AreaCodeEntity::class, SigunguCodeEntity::class], | ||
version = 1 | ||
) | ||
abstract class AreaCodeDatabase: RoomDatabase() { | ||
abstract val areaCodeDao: AreaCodeDao | ||
} |
12 changes: 12 additions & 0 deletions
12
app/src/main/java/kr/ksw/visitkorea/data/local/entity/AreaCodeEntity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package kr.ksw.visitkorea.data.local.entity | ||
|
||
import androidx.room.Entity | ||
import androidx.room.PrimaryKey | ||
|
||
@Entity("area_code") | ||
data class AreaCodeEntity( | ||
@PrimaryKey(autoGenerate = true) | ||
val id: Int? = null, | ||
val code: String, | ||
val name: String, | ||
) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
로 해도 좋을 것 같아요. predefined binding 에 대한 qualifier 입니다.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ApplicationContext
의 경우 생성자 주입으로 context를 제공하는 것이 아니라서 그런지 추가하면 Missing Binds 에러가 발생하네요