feat : conflict 해결

jeeminimini · jeeminimini · commit 4c2bd3a65094 · 2022-11-23T16:41:07.000+09:00
diff --git a/data/build.gradle b/data/build.gradle
@@ -73,6 +73,12 @@ dependencies {
     implementation 'com.tickaroo.tikxml:core:0.8.13'
     implementation 'com.tickaroo.tikxml:retrofit-converter:0.8.13'
     kapt 'com.tickaroo.tikxml:processor:0.8.13'
+
+    // Room
+    implementation "androidx.room:room-runtime:2.4.3"
+    annotationProcessor "androidx.room:room-compiler:2.4.3"
+    kapt "androidx.room:room-compiler:2.4.3"
+    implementation "androidx.room:room-ktx:2.4.3"
 }
 
 kapt {
diff --git a/data/src/main/java/com/stop/data/local/database/dao/AlarmDao.kt b/data/src/main/java/com/stop/data/local/database/dao/AlarmDao.kt
@@ -11,12 +11,12 @@ import kotlinx.coroutines.flow.Flow
 interface AlarmDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAlarm(alarmEntity: AlarmEntity)
+    fun insertAlarm(alarmEntity: AlarmEntity)
 
     @Query("DELETE FROM AlarmEntity")
-    suspend fun deleteAlarm()
+    fun deleteAlarm()
 
     @Query("SELECT * FROM AlarmEntity")
-    suspend fun selectAlarm(): Flow<AlarmEntity>
+    fun selectAlarm(): Flow<AlarmEntity>
 
 }
diff --git a/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSource.kt b/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSource.kt
@@ -5,10 +5,10 @@ import kotlinx.coroutines.flow.Flow
 
 interface AlarmLocalDataSource {
 
-    suspend fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem)
+    fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem)
 
-    suspend fun deleteAlarm()
+    fun deleteAlarm()
 
-    suspend fun selectAlarm(): Flow<AlarmRepositoryItem>
+    fun selectAlarm(): Flow<AlarmRepositoryItem>
 
 }
diff --git a/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSourceImpl.kt b/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSourceImpl.kt
@@ -10,15 +10,15 @@ internal class AlarmLocalDataSourceImpl @Inject constructor(
     private val alarmDao: AlarmDao
 ) : AlarmLocalDataSource {
 
-    override suspend fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem) {
+    override fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem) {
         alarmDao.insertAlarm(alarmRepositoryItem.toEntity())
     }
 
-    override suspend fun deleteAlarm() {
+    override fun deleteAlarm() {
         alarmDao.deleteAlarm()
     }
 
-    override suspend fun selectAlarm(): Flow<AlarmRepositoryItem> {
+    override fun selectAlarm(): Flow<AlarmRepositoryItem> {
         return alarmDao.selectAlarm().map { it.toRepositoryModel() }
     }
 
diff --git a/data/src/main/java/com/stop/data/repository/AlarmRepositoryImpl.kt b/data/src/main/java/com/stop/data/repository/AlarmRepositoryImpl.kt
@@ -12,7 +12,7 @@ internal class AlarmRepositoryImpl @Inject constructor(
     private val alarmLocalDataSource: AlarmLocalDataSource
 ) : AlarmRepository {
 
-    override suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
+    override fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         alarmLocalDataSource.insertAlarm(
             AlarmRepositoryItem(
                 alarmUseCaseItem.routeInfo,
@@ -26,11 +26,11 @@ internal class AlarmRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun deleteAlarm() {
+    override fun deleteAlarm() {
         alarmLocalDataSource.deleteAlarm()
     }
 
-    override suspend fun selectAlarm(): Flow<AlarmUseCaseItem> {
+    override fun selectAlarm(): Flow<AlarmUseCaseItem> {
         return alarmLocalDataSource.selectAlarm().map { it.toUseCaseModel() }
     }
 
diff --git a/domain/src/main/java/com/stop/domain/repository/AlarmRepository.kt b/domain/src/main/java/com/stop/domain/repository/AlarmRepository.kt
@@ -5,10 +5,10 @@ import kotlinx.coroutines.flow.Flow
 
 interface AlarmRepository {
 
-    suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)
+    fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)
 
-    suspend fun deleteAlarm()
+    fun deleteAlarm()
 
-    suspend fun selectAlarm(): Flow<AlarmUseCaseItem>
+    fun selectAlarm(): Flow<AlarmUseCaseItem>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/DeleteAlarmUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/DeleteAlarmUseCase.kt
@@ -2,6 +2,6 @@ package com.stop.domain.usecase.alarm
 
 interface DeleteAlarmUseCase {
 
-    suspend fun deleteAlarm()
+    fun deleteAlarm()
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/DeleteAlarmUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/DeleteAlarmUseCaseImpl.kt
@@ -7,7 +7,7 @@ class DeleteAlarmUseCaseImpl @Inject constructor(
     private val alarmRepository: AlarmRepository
 ) : DeleteAlarmUseCase{
 
-    override suspend fun deleteAlarm() {
+    override fun deleteAlarm() {
         alarmRepository.deleteAlarm()
     }
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/GetAlarmUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/GetAlarmUseCase.kt
@@ -5,6 +5,6 @@ import kotlinx.coroutines.flow.Flow
 
 interface GetAlarmUseCase {
 
-    suspend fun getAlarm() : Flow<AlarmUseCaseItem>
+    fun getAlarm() : Flow<AlarmUseCaseItem>
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/GetAlarmUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/GetAlarmUseCaseImpl.kt
@@ -9,7 +9,7 @@ class GetAlarmUseCaseImpl @Inject constructor(
     private val alarmRepository: AlarmRepository
 ) : GetAlarmUseCase{
 
-    override suspend fun getAlarm(): Flow<AlarmUseCaseItem> {
+    override fun getAlarm(): Flow<AlarmUseCaseItem> {
         return alarmRepository.selectAlarm()
     }
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/InsertAlarmUseCase.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/InsertAlarmUseCase.kt
@@ -4,6 +4,6 @@ import com.stop.domain.model.alarm.AlarmUseCaseItem
 
 interface InsertAlarmUseCase {
 
-    suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)
+    fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)
 
 }
diff --git a/domain/src/main/java/com/stop/domain/usecase/alarm/InsertAlarmUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/alarm/InsertAlarmUseCaseImpl.kt
@@ -8,7 +8,7 @@ class InsertAlarmUseCaseImpl @Inject constructor(
     private val alarmRepository: AlarmRepository
 ) : InsertAlarmUseCase{
 
-    override suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
+    override fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         alarmRepository.insertAlarm(alarmUseCaseItem)
     }
 
diff --git a/domain/src/main/java/com/stop/domain/usecase/route/GetRouteUseCaseImpl.kt b/domain/src/main/java/com/stop/domain/usecase/route/GetRouteUseCaseImpl.kt
@@ -158,7 +158,7 @@ internal class GetRouteUseCaseImpl @Inject constructor(
             routeRepository.reverseGeocoding(Coordinate(station.lat, station.lon), AddressType.LOT_ADDRESS)
         val arsId = when (reverseGeocodingResponse.addressInfo.cityDo) {
             GYEONGGI_DO -> {
-                val busStations = routeRepository.getGyeonggiBusStationId(station.stationName).busStations
+                val busStations = routeRepository.getGyeonggiBusStationId(station.stationName).msgBody.busStations
 
                 findClosestGyeonggiBusStation(station, busStations)
             }

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ import kotlinx.coroutines.flow.Flow`
`5`	`5`
`6`	`6`	`interface AlarmLocalDataSource {`
`7`	`7`
`8`		`- suspend fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem)`
	`8`	`+ fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem)`
`9`	`9`
`10`		`- suspend fun deleteAlarm()`
	`10`	`+ fun deleteAlarm()`
`11`	`11`
`12`		`- suspend fun selectAlarm(): Flow<AlarmRepositoryItem>`
	`12`	`+ fun selectAlarm(): Flow<AlarmRepositoryItem>`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,15 @@ internal class AlarmLocalDataSourceImpl @Inject constructor(`
`10`	`10`	`private val alarmDao: AlarmDao`
`11`	`11`	`) : AlarmLocalDataSource {`
`12`	`12`
`13`		`- override suspend fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem) {`
	`13`	`+ override fun insertAlarm(alarmRepositoryItem: AlarmRepositoryItem) {`
`14`	`14`	`alarmDao.insertAlarm(alarmRepositoryItem.toEntity())`
`15`	`15`	`}`
`16`	`16`
`17`		`- override suspend fun deleteAlarm() {`
	`17`	`+ override fun deleteAlarm() {`
`18`	`18`	`alarmDao.deleteAlarm()`
`19`	`19`	`}`
`20`	`20`
`21`		`- override suspend fun selectAlarm(): Flow<AlarmRepositoryItem> {`
	`21`	`+ override fun selectAlarm(): Flow<AlarmRepositoryItem> {`
`22`	`22`	`return alarmDao.selectAlarm().map { it.toRepositoryModel() }`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ internal class AlarmRepositoryImpl @Inject constructor(`
`12`	`12`	`private val alarmLocalDataSource: AlarmLocalDataSource`
`13`	`13`	`) : AlarmRepository {`
`14`	`14`
`15`		`- override suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {`
	`15`	`+ override fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem) {`
`16`	`16`	`alarmLocalDataSource.insertAlarm(`
`17`	`17`	`AlarmRepositoryItem(`
`18`	`18`	`alarmUseCaseItem.routeInfo,`
`@@ -26,11 +26,11 @@ internal class AlarmRepositoryImpl @Inject constructor(`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`
`29`		`- override suspend fun deleteAlarm() {`
	`29`	`+ override fun deleteAlarm() {`
`30`	`30`	`alarmLocalDataSource.deleteAlarm()`
`31`	`31`	`}`
`32`	`32`
`33`		`- override suspend fun selectAlarm(): Flow<AlarmUseCaseItem> {`
	`33`	`+ override fun selectAlarm(): Flow<AlarmUseCaseItem> {`
`34`	`34`	`return alarmLocalDataSource.selectAlarm().map { it.toUseCaseModel() }`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ import kotlinx.coroutines.flow.Flow`
`5`	`5`
`6`	`6`	`interface AlarmRepository {`
`7`	`7`
`8`		`- suspend fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)`
	`8`	`+ fun insertAlarm(alarmUseCaseItem: AlarmUseCaseItem)`
`9`	`9`
`10`		`- suspend fun deleteAlarm()`
	`10`	`+ fun deleteAlarm()`
`11`	`11`
`12`		`- suspend fun selectAlarm(): Flow<AlarmUseCaseItem>`
	`12`	`+ fun selectAlarm(): Flow<AlarmUseCaseItem>`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ package com.stop.domain.usecase.alarm`
`2`	`2`
`3`	`3`	`interface DeleteAlarmUseCase {`
`4`	`4`
`5`		`- suspend fun deleteAlarm()`
	`5`	`+ fun deleteAlarm()`
`6`	`6`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class DeleteAlarmUseCaseImpl @Inject constructor(`
`7`	`7`	`private val alarmRepository: AlarmRepository`
`8`	`8`	`) : DeleteAlarmUseCase{`
`9`	`9`
`10`		`- override suspend fun deleteAlarm() {`
	`10`	`+ override fun deleteAlarm() {`
`11`	`11`	`alarmRepository.deleteAlarm()`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ import kotlinx.coroutines.flow.Flow`
`5`	`5`
`6`	`6`	`interface GetAlarmUseCase {`
`7`	`7`
`8`		`- suspend fun getAlarm() : Flow<AlarmUseCaseItem>`
	`8`	`+ fun getAlarm() : Flow<AlarmUseCaseItem>`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class GetAlarmUseCaseImpl @Inject constructor(`
`9`	`9`	`private val alarmRepository: AlarmRepository`
`10`	`10`	`) : GetAlarmUseCase{`
`11`	`11`
`12`		`- override suspend fun getAlarm(): Flow<AlarmUseCaseItem> {`
	`12`	`+ override fun getAlarm(): Flow<AlarmUseCaseItem> {`
`13`	`13`	`return alarmRepository.selectAlarm()`
`14`	`14`	`}`
`15`	`15`