Merge pull request #66 from boostcampwm-2022/65-feature-sprint4-weekend

[PR] 맵, 장소 검색, 알람 설정, 알람 시작 UI 수정 및 데이터 연결 + 최근 검색 기록 구현

Author: koreatlwls

data/build.gradle

@@ -67,6 +67,7 @@ dependencies {
     // Moshi
     implementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
     implementation 'com.squareup.moshi:moshi:1.14.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.14.0'
     kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.14.0'
 
     // xml parser

data/src/main/java/com/stop/data/di/LocalDataSourceModule.kt renamed to data/src/main/java/com/stop/data/di/AlarmDataSourceModule.kt

@@ -13,7 +13,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object LocalDataSourceModule {
+object AlarmDataSourceModule {
 
     @Provides
     @Singleton

data/src/main/java/com/stop/data/di/DataSourceModule.kt

@@ -1,5 +1,7 @@
 package com.stop.data.di
 
+import com.stop.data.local.source.alarm.RecentPlaceSearchLocalDataSource
+import com.stop.data.local.source.alarm.RecentPlaceSearchLocalDataSourceImpl
 import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSource
 import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSourceImpl
 import com.stop.data.remote.source.nowlocation.NowLocationRemoteDataSource
@@ -34,4 +36,10 @@ internal interface DataSourceModule {
         nowLocationRemoteDataSourceImpl: NowLocationRemoteDataSourceImpl
     ): NowLocationRemoteDataSource
 
+    @Binds
+    @Singleton
+    fun provideRecentPlaceSearchLocalDataSource(
+        recentPlaceSearchLocalDataSourceImpl: RecentPlaceSearchLocalDataSourceImpl
+    ) : RecentPlaceSearchLocalDataSource
+
 }

data/src/main/java/com/stop/data/di/DatabaseModule.kt

@@ -1,14 +1,22 @@
 package com.stop.data.di
 
+import android.content.Context
+import androidx.room.Room
+import com.stop.data.local.database.TroubleShooterApplicationDatabase
+import com.stop.data.local.database.TroubleShooterApplicationDatabase.Companion.DB_NAME
+import com.stop.data.local.database.dao.RecentPlaceSearchDao
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
 @Module
-class DatabaseModule {
+object DatabaseModule {
 
-   /* @Provides
+    @Provides
     @Singleton
     fun provideApplicationDatabase(@ApplicationContext context: Context): TroubleShooterApplicationDatabase {
         return Room.databaseBuilder(
@@ -17,6 +25,14 @@ class DatabaseModule {
             DB_NAME
         ).fallbackToDestructiveMigration()
             .build()
-    }*/
+    }
+
+    @Provides
+    @Singleton
+    fun provideRecentPlaceSearchDao(
+        troubleShooterApplicationDatabase: TroubleShooterApplicationDatabase
+    ): RecentPlaceSearchDao {
+        return troubleShooterApplicationDatabase.getRecentPlaceSearchDao()
+    }
 
 }

data/src/main/java/com/stop/data/di/NetworkModule.kt

@@ -1,9 +1,13 @@
 package com.stop.data.di
 
 import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.stop.data.BuildConfig
 import com.stop.data.remote.ResultCallAdapter
+import com.stop.domain.model.route.tmap.custom.Route
+import com.stop.domain.model.route.tmap.custom.TransportRoute
+import com.stop.domain.model.route.tmap.custom.WalkRoute
 import com.tickaroo.tikxml.TikXml
 import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory
 import dagger.Module
@@ -46,6 +50,11 @@ internal object NetworkModule {
     @Singleton
     fun provideMoshi(): Moshi {
         return Moshi.Builder()
+            .add(PolymorphicJsonAdapterFactory
+                .of(Route::class.java,"Route")
+                .withSubtype(TransportRoute::class.java, "TransportRoute")
+                .withSubtype(WalkRoute::class.java, "WalkRoute")
+            )
             .addLast(KotlinJsonAdapterFactory())
             .build()
     }

data/src/main/java/com/stop/data/di/RepositoryModule.kt

@@ -1,13 +1,7 @@
 package com.stop.data.di
 
-import com.stop.data.repository.AlarmRepositoryImpl
-import com.stop.data.repository.NearPlaceRepositoryImpl
-import com.stop.data.repository.NowLocationRepositoryImpl
-import com.stop.data.repository.RouteRepositoryImpl
-import com.stop.domain.repository.AlarmRepository
-import com.stop.domain.repository.NearPlaceRepository
-import com.stop.domain.repository.NowLocationRepository
-import com.stop.domain.repository.RouteRepository
+import com.stop.data.repository.*
+import com.stop.domain.repository.*
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -33,10 +27,20 @@ internal interface RepositoryModule {
 
     @Binds
     @Singleton
-    fun provideAlarmRepository(alarmRepositoryImpl: AlarmRepositoryImpl): AlarmRepository
+    fun provideAlarmRepository(
+        alarmRepositoryImpl: AlarmRepositoryImpl
+    ): AlarmRepository
 
     @Binds
     @Singleton
-    fun provideNowLocationRepository(nowLocationRepositoryImpl: NowLocationRepositoryImpl): NowLocationRepository
+    fun provideNowLocationRepository(
+        nowLocationRepositoryImpl: NowLocationRepositoryImpl
+    ): NowLocationRepository
+
+    @Binds
+    @Singleton
+    fun provideRecentPlaceSearchRepository(
+        recentPlaceSearchRepositoryImpl: RecentPlaceSearchRepositoryImpl
+    ): RecentPlaceSearchRepository
 
 }

data/src/main/java/com/stop/data/local/database/TroubleShooterApplicationDatabase.kt

@@ -0,0 +1,19 @@
+package com.stop.data.local.database
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.stop.data.local.database.dao.RecentPlaceSearchDao
+import com.stop.data.local.model.RecentPlaceSearchEntity
+
+@Database(
+    entities = [RecentPlaceSearchEntity::class],
+    version = 1
+)
+abstract class TroubleShooterApplicationDatabase : RoomDatabase() {
+
+    abstract fun getRecentPlaceSearchDao(): RecentPlaceSearchDao
+
+    companion object {
+        const val DB_NAME = "TroubleShooter.db"
+    }
+}

data/src/main/java/com/stop/data/local/database/dao/AlarmDao.kt

@@ -0,0 +1,21 @@
+package com.stop.data.local.database.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.stop.data.local.model.RecentPlaceSearchEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface RecentPlaceSearchDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertRecentPlaceSearchEntity(recentPlaceSearchEntity: RecentPlaceSearchEntity)
+
+    @Query("SELECT * FROM RecentPlaceSearchEntity ORDER BY id DESC")
+    fun getAllRecentPlaceSearchEntity(): Flow<List<RecentPlaceSearchEntity>>
+
+    @Query("DELETE FROM RecentPlaceSearchEntity")
+    suspend fun deleteAllRecentPlaceSearchEntity()
+}