Merge remote-tracking branch 'origin/develop' into 52-feature-get-seoul-subway-last-time

# Conflicts:
#	data/src/main/java/com/stop/data/remote/network/WsBusApiService.kt
#	data/src/main/java/com/stop/data/repository/RouteRepositoryImpl.kt
#	domain/src/main/java/com/stop/domain/repository/RouteRepository.kt

Author: DoTheBestMayB

data/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id 'com.google.dagger.hilt.android'
     id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
 Properties properties = new Properties()
@@ -27,6 +27,7 @@ android {
         buildConfigField "String", "T_MAP_APP_KEY", properties['t_map_app_key']
         buildConfigField "String", "SUBWAY_KEY", properties['subway_key']
         buildConfigField "String", "BUS_KEY", properties['bus_key']
+        buildConfigField "String", "SW_OPEN_API_SEOUL_URL", properties['sw_open_api_seoul_url']
     }
 
     buildTypes {
@@ -76,9 +77,9 @@ dependencies {
 
     // Room
     implementation "androidx.room:room-runtime:2.4.3"
+    implementation "androidx.room:room-ktx: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"
 
     //DataStore
     implementation "androidx.datastore:datastore-preferences:1.0.0"

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

@@ -45,7 +45,7 @@ internal object ApiModule {
 
     @Provides
     @Singleton
-    fun providePlaceApiService(@Named("Tmap") retrofit: Retrofit): NearPlaceApiService {
-        return retrofit.create(NearPlaceApiService::class.java)
+    fun provideSwOpenApiSeoulService(@Named("SwOpenApiSeoul") retrofit: Retrofit): SwOpenApiSeoulService {
+        return retrofit.create(SwOpenApiSeoulService::class.java)
     }
 }

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

@@ -25,6 +25,7 @@ internal object NetworkModule {
 
     private const val T_MAP_APP_KEY_NAME = "appKey"
     private const val OPEN_API_SEOUL_KEY_NAME = "KEY"
+    private const val SW_OPEN_API_SEOUL_KEY_NAME = "KEY"
     private const val APIS_KEY_NAME = "ServiceKey"
     private const val WS_KEY_NAME = "ServiceKey"
 
@@ -130,6 +131,21 @@ internal object NetworkModule {
             .build()
     }
 
+    @Provides
+    @Named("SwOpenApiSeoul")
+    fun provideSwOpenApiSeoulRetrofitInstance(
+        okHttpClient: OkHttpClient,
+        moshi: Moshi,
+        resultCallAdapter: ResultCallAdapter.Factory,
+    ): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BuildConfig.SW_OPEN_API_SEOUL_URL)
+            .client(okHttpClient)
+            .addCallAdapterFactory(resultCallAdapter)
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .build()
+    }
+
     class CustomInterceptor : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
             val url = chain.request().url.toUri().toString()
@@ -139,6 +155,10 @@ internal object NetworkModule {
                     OPEN_API_SEOUL_KEY_NAME,
                     BuildConfig.BUS_KEY
                 )
+                url.contains(BuildConfig.SW_OPEN_API_SEOUL_URL) -> Pair(
+                    SW_OPEN_API_SEOUL_KEY_NAME,
+                    BuildConfig.SUBWAY_KEY
+                )
                 url.contains(BuildConfig.T_MAP_URL) -> Pair(
                     T_MAP_APP_KEY_NAME,
                     BuildConfig.T_MAP_APP_KEY

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

@@ -35,8 +35,11 @@ internal class AlarmLocalDataSourceImpl @Inject constructor(
     override suspend fun getAlarm(): Flow<AlarmRepositoryItem?> {
         return context.datastore.data.map { preferences ->
             val jsonString = preferences[ALARM] ?: ""
-            val elements = adapter.fromJson(jsonString)?.toRepositoryModel()
-            elements
+            if (jsonString.isNotBlank()) {
+                adapter.fromJson(jsonString)?.toRepositoryModel()
+            } else {
+                null
+            }
         }
     }
 

data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSourceImpl.kt

@@ -1,6 +1,7 @@
 package com.stop.data.model.nearplace
 
 import com.stop.domain.model.nearplace.Place
+import com.stop.domain.model.nowlocation.NowStationLocationUseCaseItem
 
 data class Place(
     val name: String,
@@ -17,4 +18,10 @@ data class Place(
         centerLat = centerLat,
         centerLon = centerLon
     )
+
+    fun toNowStationLocationUseCaseModel() = NowStationLocationUseCaseItem(
+        name = name,
+        latitude = centerLat.toString(),
+        longitude = centerLon.toString()
+    )
 }

data/src/main/java/com/stop/data/model/nearplace/Place.kt

@@ -0,0 +1,21 @@
+package com.stop.data.model.nowlocation
+
+import com.stop.domain.model.nowlocation.SubwayTrainRealTimePositionUseCaseItem
+
+data class SubwayTrainRealTimePositionRepositoryItem(
+    val subwayId: String,
+    val subwayName: String,
+    val stationId: String,
+    val stationName: String,
+    val trainNumber: String,
+    val trainStatus: String
+) {
+    fun toUseCaseModel() = SubwayTrainRealTimePositionUseCaseItem(
+        subwayId = subwayId,
+        subwayName = subwayName,
+        stationId = stationId,
+        stationName = stationName,
+        trainNumber = trainNumber,
+        trainStatus = trainStatus
+    )
+}

data/src/main/java/com/stop/data/model/nowlocation/SubwayTrainRealTimePositionRepositoryItem.kt

@@ -1,4 +1,4 @@
-package com.stop.data.remote.model.nowlocation
+package com.stop.data.remote.model.nowlocation.bus
 
 import com.squareup.moshi.Json
 

data/src/main/java/com/stop/data/remote/model/nowlocation/BusBody.kt renamed to data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusBody.kt

@@ -1,4 +1,4 @@
-package com.stop.data.remote.model.nowlocation
+package com.stop.data.remote.model.nowlocation.bus
 
 import com.squareup.moshi.Json
 import com.stop.data.model.nowlocation.BusInfoRepositoryItem

data/src/main/java/com/stop/data/remote/model/nowlocation/BusInfo.kt renamed to data/src/main/java/com/stop/data/remote/model/nowlocation/bus/BusInfo.kt

@@ -1,10 +1,10 @@
-package com.stop.data.remote.model.nowlocation
+package com.stop.data.remote.model.nowlocation.bus
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class GetBusNowLocationResponse(
+data class BusNowLocationResponse(
     @Json(name = "msgBody")
     val busBody: BusBody,
 )