feat: shelterlist Roomdb에 저장

seunghee17 · seunghee17 · commit 7f8fb6bfa00b · 2024-06-05T15:50:53.000+09:00
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/datasources/ShelterDAO.kt b/app/src/main/java/com/daepiro/numberoneproject/data/datasources/ShelterDAO.kt
@@ -0,0 +1,16 @@
+package com.daepiro.numberoneproject.data.datasources
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.daepiro.numberoneproject.data.model.ShelterEntity
+
+@Dao
+interface ShelterDAO {
+    @Query("SELECT * FROM shelters")
+    suspend fun getAllShelters(): List<ShelterEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveShelters(shelters: List<ShelterEntity>)
+}
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/datasources/ShelterDatabase.kt b/app/src/main/java/com/daepiro/numberoneproject/data/datasources/ShelterDatabase.kt
@@ -0,0 +1,12 @@
+package com.daepiro.numberoneproject.data.datasources
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import com.daepiro.numberoneproject.data.model.ShelterEntity
+
+@Database(entities = [ShelterEntity::class], version = 1)
+abstract class ShelterDatabase: RoomDatabase() {
+    abstract fun shelterDao(): ShelterDAO
+}
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/model/ShelterData.kt b/app/src/main/java/com/daepiro/numberoneproject/data/model/ShelterData.kt
@@ -1,12 +1,14 @@
 package com.daepiro.numberoneproject.data.model
 
-data class ShelterData(
-    val id: Int,
-    val facilityFullName:String,
-    val fullAddress: String,
-    val city: String,
-    val district: String,
-    val dong: String,
-    val shelterType: String
-)
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
+@Entity(tableName = "shelters")
+data class ShelterEntity(
+    val fullAddress: String = "",
+    val city: String = "",
+    val district: String = "",
+    val dong: String="",
+) {
+    @PrimaryKey(autoGenerate = true) var id: Int=0
+}
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/model/ShelterUrlResponse.kt b/app/src/main/java/com/daepiro/numberoneproject/data/model/ShelterUrlResponse.kt
@@ -0,0 +1,5 @@
+package com.daepiro.numberoneproject.data.model
+
+data class ShelterUrlResponse(
+    val link: String =""
+)
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/network/ApiService.kt b/app/src/main/java/com/daepiro/numberoneproject/data/network/ApiService.kt
@@ -30,9 +30,10 @@ import com.daepiro.numberoneproject.data.model.LoginTokenResponse
 import com.daepiro.numberoneproject.data.model.OnlineResponse
 import com.daepiro.numberoneproject.data.model.RegisterFamilyResponse
 import com.daepiro.numberoneproject.data.model.SendSafetyResponse
-import com.daepiro.numberoneproject.data.model.ShelterData
+import com.daepiro.numberoneproject.data.model.ShelterEntity
 import com.daepiro.numberoneproject.data.model.ShelterListResponse
 import com.daepiro.numberoneproject.data.model.ShelterRequestBody
+import com.daepiro.numberoneproject.data.model.ShelterUrlResponse
 import com.daepiro.numberoneproject.data.model.SupportRequest
 import com.daepiro.numberoneproject.data.model.SupportResponse
 import com.daepiro.numberoneproject.data.model.TokenRequestBody
@@ -92,11 +93,17 @@ interface ApiService {
         @Body body: DisasterRequestBody
     ): ApiResult<DisasterResponse>
 
-    //대피소 전체 데이터 가진 링크 가져오기
+    //대피소 전체 데이터 가진 json파일
+    //곧 삭제될 코드
     @GET("/api/admin/address-info")
     suspend fun getShelters(
         @Header("Authorization") token:String
-    ): ApiResult<List<ShelterData>>
+    ): ApiResult<List<ShelterEntity>>
+
+    @GET("/api/shelters/init")
+    suspend fun getShelterFromUrl(
+        @Header("Authorization") token:String
+    ): ApiResult<ShelterUrlResponse>
 
 
     // 후원 목록 최신순 조회
diff --git a/app/src/main/java/com/daepiro/numberoneproject/data/repositoryimpl/GetShelterRepositoryImpl.kt b/app/src/main/java/com/daepiro/numberoneproject/data/repositoryimpl/GetShelterRepositoryImpl.kt
@@ -1,6 +1,5 @@
 package com.daepiro.numberoneproject.data.repositoryimpl
-
-import com.daepiro.numberoneproject.data.model.ShelterData
+import com.daepiro.numberoneproject.data.model.ShelterUrlResponse
 import com.daepiro.numberoneproject.data.network.ApiResult
 import com.daepiro.numberoneproject.data.network.ApiService
 import com.daepiro.numberoneproject.domain.repository.GetShelterRepository
@@ -9,8 +8,8 @@ import javax.inject.Inject
 class GetShelterRepositoryImpl @Inject constructor(
     private val service: ApiService,
 ): GetShelterRepository {
-    override suspend fun getShelterDaraLocal(token: String): ApiResult<List<ShelterData>>{
-        return service.getShelters(token)
+    override suspend fun getShelterUrl(token: String): ApiResult<ShelterUrlResponse> {
+        return service.getShelterFromUrl(token)
     }
 
 }
diff --git a/app/src/main/java/com/daepiro/numberoneproject/domain/repository/GetShelterRepository.kt b/app/src/main/java/com/daepiro/numberoneproject/domain/repository/GetShelterRepository.kt
@@ -1,8 +1,8 @@
 package com.daepiro.numberoneproject.domain.repository
 
-import com.daepiro.numberoneproject.data.model.ShelterData
+import com.daepiro.numberoneproject.data.model.ShelterUrlResponse
 import com.daepiro.numberoneproject.data.network.ApiResult
 
 interface GetShelterRepository {
-    suspend fun getShelterDaraLocal(token: String) : ApiResult<List<ShelterData>>
+    suspend fun getShelterUrl(token: String): ApiResult<ShelterUrlResponse>
 }
diff --git a/app/src/main/java/com/daepiro/numberoneproject/domain/usecase/GetShelterUseCase.kt b/app/src/main/java/com/daepiro/numberoneproject/domain/usecase/GetShelterUseCase.kt
@@ -1,40 +1,14 @@
 package com.daepiro.numberoneproject.domain.usecase
-
-import android.util.Log
-import com.daepiro.numberoneproject.data.model.ShelterData
+import com.daepiro.numberoneproject.data.model.ShelterUrlResponse
 import com.daepiro.numberoneproject.data.network.ApiResult
-import com.daepiro.numberoneproject.data.network.onSuccess
 import com.daepiro.numberoneproject.domain.repository.GetShelterRepository
-import com.google.gson.Gson
-import com.google.gson.JsonSyntaxException
-import java.io.File
-import java.io.IOException
 import javax.inject.Inject
 
 class GetShelterUseCase @Inject constructor(
-    private val getShelterRepository: GetShelterRepository
+    private val getShelterRepository: GetShelterRepository,
+
 ) {
-    suspend operator fun invoke(token:String, file: File): ApiResult<List<ShelterData>>{
-        return try{
-            val response = getShelterRepository.getShelterDaraLocal(token)
-            response.onSuccess { data->
-                try{
-                    val json = Gson().toJson(data)
-                    file.writeText(json)
-                    Log.d("GetShelterUseCase", "저장성공")
-                }catch (ioException : IOException){
-                    Log.e("GetShelterUseCase", "파일쓰기 실패 $ioException")
-                    ApiResult.Failure.NetworkError(ioException)
-                }
-                catch (jsonSyntaxException: JsonSyntaxException){
-                    Log.e("GetShelterUseCase", "json 파싱 실패 $jsonSyntaxException")
-                    ApiResult.Failure.UnknownApiError(jsonSyntaxException)
-                }
-            }
-            response
-        }catch (e:Exception){
-            Log.e("GetShelterUseCase", "예외발생 $e")
-            ApiResult.Failure.UnknownApiError(e)
-        }
+    suspend operator fun invoke(token:String): ApiResult<ShelterUrlResponse> {
+        return getShelterRepository.getShelterUrl(token)
     }
 }
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/di/AppModule.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/di/AppModule.kt
@@ -1,7 +1,9 @@
 package com.daepiro.numberoneproject.presentation.di
 
 import android.content.Context
+import androidx.room.Room
 import com.daepiro.numberoneproject.BuildConfig
+import com.daepiro.numberoneproject.data.datasources.ShelterDatabase
 import com.daepiro.numberoneproject.data.network.ApiResultCallAdapterFactory
 import com.daepiro.numberoneproject.data.network.ApiService
 import com.daepiro.numberoneproject.data.repositoryimpl.AlarmRepositoryImpl
@@ -131,5 +133,22 @@ object AppModule {
     fun provideFilesDir(@ApplicationContext context: Context): File {
         return context.filesDir
     }
+}
+
+@InstallIn(SingletonComponent::class)
+@Module
+object DBModule {
+    @Singleton
+    @Provides
+    fun provideAppDatabase(@ApplicationContext context: Context) =
+        Room.databaseBuilder(
+            context,
+            ShelterDatabase::class.java,
+            "shelter.db"
+        ).fallbackToDestructiveMigration()
+            .build()
+
+    @Provides
+    fun provideShelterDao(appDatabase: ShelterDatabase) = appDatabase.shelterDao()
+}
 
-}
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/view/home/HomeFragment.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/view/home/HomeFragment.kt
@@ -101,7 +101,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
 
     override fun setupInit() {
         //로컬에 대피소 저장하기 위해 호출
-        shelterVM.getSheltersetLocal()
+        //shelterVM.getSheltersetLocal()
 
         requestPermission()
         setSheltersViewPager()
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/view/login/SplashActivity.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/view/login/SplashActivity.kt
@@ -9,22 +9,27 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import com.daepiro.numberoneproject.R
 import com.daepiro.numberoneproject.databinding.ActivitySplashBinding
 import com.daepiro.numberoneproject.presentation.base.BaseActivity
 import com.daepiro.numberoneproject.presentation.util.Extensions.repeatOnStarted
 import com.daepiro.numberoneproject.presentation.util.TokenManager
 import com.daepiro.numberoneproject.presentation.view.MainActivity
 import com.daepiro.numberoneproject.presentation.view.networkerror.NetworkDialogFragment
+import com.daepiro.numberoneproject.presentation.viewmodel.SplashViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 
 @AndroidEntryPoint
 class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_splash) {
-    private val DURATION_TIME = 1500L    // 스플래시 화면 지연시간
+    private val DURATION_TIME = 6000L    // 스플래시 화면 지연시간
     private lateinit var cm : ConnectivityManager
+    val splashVM by viewModels<SplashViewModel>()
     @Inject lateinit var tokenManager: TokenManager
     private var isNetworkAvailable = false
 
@@ -51,6 +56,9 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
             binding.ltSplash.cancelAnimation()
             checkAutoLogin()
         }, DURATION_TIME)
+        lifecycleScope.launch {
+            splashVM.getSheltersetLocal()
+        }
     }
 
 
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/CommunityViewModel.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/CommunityViewModel.kt
@@ -7,19 +7,15 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
 import com.daepiro.numberoneproject.data.model.ArticleLikeResponse
 import com.daepiro.numberoneproject.data.model.CommentLikedResponseModel
 import com.daepiro.numberoneproject.data.model.CommentWritingResponse
 import com.daepiro.numberoneproject.data.model.CommunityDisasterDetailResponse
 import com.daepiro.numberoneproject.data.model.CommunityHomeDisasterResponse
 import com.daepiro.numberoneproject.data.model.CommunityRereplyRequestBody
 import com.daepiro.numberoneproject.data.model.CommunityTownDetailData
-import com.daepiro.numberoneproject.data.model.CommunityTownListModel
 import com.daepiro.numberoneproject.data.model.CommunityTownReplyRequestBody
 import com.daepiro.numberoneproject.data.model.CommunityTownReplyResponse
-import com.daepiro.numberoneproject.data.model.Content
 import com.daepiro.numberoneproject.data.model.ConversationRequestBody
 import com.daepiro.numberoneproject.data.model.GetRegionResponse
 import com.daepiro.numberoneproject.data.network.onFailure
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/ShelterViewModel.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/ShelterViewModel.kt
@@ -1,40 +1,35 @@
 package com.daepiro.numberoneproject.presentation.viewmodel
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.daepiro.numberoneproject.data.datasources.ShelterDatabase
 import com.daepiro.numberoneproject.data.model.ShelterListResponse
 import com.daepiro.numberoneproject.data.model.ShelterRequestBody
 import com.daepiro.numberoneproject.data.network.ApiResult
 import com.daepiro.numberoneproject.data.network.onFailure
 import com.daepiro.numberoneproject.data.network.onSuccess
 import com.daepiro.numberoneproject.domain.usecase.AroundShelterUseCase
-import com.daepiro.numberoneproject.domain.usecase.GetShelterUseCase
 import com.daepiro.numberoneproject.presentation.util.TokenManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import java.io.File
 import javax.inject.Inject
 
 @HiltViewModel
 class ShelterViewModel @Inject constructor(
     private val tokenManager: TokenManager,
     private val aroundShelterUseCase: AroundShelterUseCase,
-    private val getShelterUseCase: GetShelterUseCase,
-    private val filesDir: File,
 ): ViewModel() {
     private val _sheltersList = MutableStateFlow(ShelterListResponse())
     val sheltersList = _sheltersList.asStateFlow()
 
     val shelterLoadingState = MutableStateFlow(true)
-    
-    private val _url = MutableStateFlow<ApiResult.Failure?>(null)
-    val url = _url.asStateFlow()
+
+    private lateinit var db: ShelterDatabase
 
     private val _shelterDataState = MutableLiveData<ApiResult<Unit>>()
     val shelterDataState: LiveData<ApiResult<Unit>> = _shelterDataState
@@ -54,21 +49,5 @@ class ShelterViewModel @Inject constructor(
         }
     }
 
-    fun getSheltersetLocal(){
-        viewModelScope.launch {
-            val token = "Bearer ${tokenManager.accessToken.first()}"
-            val fileName = "shelter_data.json"
-            val file = File(filesDir, fileName)
-            getShelterUseCase(token,file)
-                .onSuccess {
-                    Log.d("ShelterViewModel", "성공")
-                }
-                .onFailure {
-                    _url.value = it
-                    Log.e("ShelterViewModel", "$it")
-                }
-        }
-    }
-
 
 }
diff --git a/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/SplashViewModel.kt b/app/src/main/java/com/daepiro/numberoneproject/presentation/viewmodel/SplashViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.daepiro.numberoneproject.domain.repository`
`2`	`2`
`3`		`-import com.daepiro.numberoneproject.data.model.ShelterData`
	`3`	`+import com.daepiro.numberoneproject.data.model.ShelterUrlResponse`
`4`	`4`	`import com.daepiro.numberoneproject.data.network.ApiResult`
`5`	`5`
`6`	`6`	`interface GetShelterRepository {`
`7`		`- suspend fun getShelterDaraLocal(token: String) : ApiResult<List<ShelterData>>`
	`7`	`+ suspend fun getShelterUrl(token: String): ApiResult<ShelterUrlResponse>`
`8`	`8`	`}`