feat: merge conflict 해결

Author: DoTheBestMayB

build.gradle

@@ -1,11 +1,9 @@
 buildscript {
     repositories {
         google()
-        mavenCentral()
     }
     dependencies {
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
     }
 }
 
@@ -15,5 +13,7 @@ plugins {
     id 'com.android.library' version '7.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.7.20' apply false
+
+    // Hilt
     id 'com.google.dagger.hilt.android' version '2.44' apply false
 }

data/build.gradle

@@ -51,23 +51,28 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'com.google.android.material:material:1.7.0'
 
-    // network
+    //Hilt
+    implementation 'com.google.dagger:hilt-android:2.44'
+    kapt 'com.google.dagger:hilt-compiler:2.44'
+
+    // Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
+
+    // OkHttp3
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
 
+    // Moshi
+    implementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
+    implementation 'com.squareup.moshi:moshi:1.14.0'
+    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.14.0'
+
     // xml parser
     implementation 'com.tickaroo.tikxml:annotation:0.8.13'
     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'
-
-    // Hilt
-    implementation 'com.google.dagger:hilt-android:2.44'
-    kapt 'com.google.dagger:hilt-compiler:2.44'
 }
 
 kapt {

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

@@ -42,4 +42,10 @@ internal object ApiModule {
     fun provideApisDataService(@Named("ApisData") retrofit: Retrofit): ApisDataService {
         return retrofit.create(ApisDataService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun providePlaceApiService(@Named("Tmap") retrofit: Retrofit): NearPlaceApiService {
+        return retrofit.create(NearPlaceApiService::class.java)
+    }
 }

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

@@ -3,7 +3,7 @@ package com.stop.data.di
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.stop.data.BuildConfig
-import com.stop.data.remote.adapter.route.ResultCallAdapter
+import com.stop.data.remote.ResultCallAdapter
 import com.tickaroo.tikxml.TikXml
 import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory
 import dagger.Module
@@ -35,6 +35,7 @@ internal object NetworkModule {
     private const val FAKE_JSON_URI = "response.json"
 
     @Provides
+    @Singleton
     fun provideOkHttpClient(
         customInterceptor: CustomInterceptor,
         loggingInterceptor: HttpLoggingInterceptor,
@@ -45,10 +46,11 @@ internal object NetworkModule {
             .build()
     }
 
+
     @Provides
     @Singleton
     fun provideMoshi(): Moshi {
-        return Moshi.Builder()
+       return Moshi.Builder()
             .addLast(KotlinJsonAdapterFactory())
             .build()
     }

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

@@ -0,0 +1,21 @@
+package com.stop.data.di
+
+import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSource
+import com.stop.data.remote.source.nearplace.NearPlaceRemoteDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class RemoteDataModule {
+
+    @Binds
+    @Singleton
+    abstract fun provideNearPlaceRemoteData(
+        nearPlaceRemoteDataSourceImpl: NearPlaceRemoteDataSourceImpl
+    ): NearPlaceRemoteDataSource
+
+}

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

@@ -2,6 +2,8 @@ package com.stop.data.di
 
 import com.stop.data.repository.RouteRepositoryImpl
 import com.stop.domain.repository.RouteRepository
+import com.stop.data.repository.NearPlaceRepositoryImpl
+import com.stop.domain.repository.NearPlaceRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -17,4 +19,10 @@ internal interface RepositoryModule {
     fun provideRemoteRepository(
         routeRepositoryImpl: RouteRepositoryImpl
     ): RouteRepository
+
+    @Binds
+    @Singleton
+    abstract fun provideNearPlaceRepository(
+        nearPlaceRepositoryImpl: NearPlaceRepositoryImpl
+    ): NearPlaceRepository
 }

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

@@ -0,0 +1,20 @@
+package com.stop.data.model.nearplace
+
+import com.stop.domain.model.nearplace.Place
+
+data class Place(
+    val name: String,
+    val radius: String,
+    val fullAddressRoad: String,
+    val centerLat: Double,
+    val centerLon: Double
+) {
+
+    fun toUseCaseModel() = Place(
+        name = name,
+        radius = radius,
+        fullAddressRoad = fullAddressRoad,
+        centerLat = centerLat,
+        centerLon = centerLon
+    )
+}

data/src/main/java/com/stop/data/remote/adapter/route/ResultCall.kt renamed to data/src/main/java/com/stop/data/remote/ResultCall.kt

@@ -1,4 +1,4 @@
-package com.stop.data.remote.adapter.route
+package com.stop.data.remote
 
 import okhttp3.Request
 import okio.Timeout
@@ -21,12 +21,25 @@ internal class ResultCall<T : Any>(private val call: Call<T>) : Call<NetworkResu
     override fun enqueue(callback: Callback<NetworkResult<T>>) {
         call.enqueue(object : Callback<T> {
             override fun onResponse(call: Call<T>, response: Response<T>) {
+                if (response.code() == 204) {
+                    callback.onResponse(
+                        this@ResultCall,
+                        Response.success(NetworkResult.Failure(204, "No Content Error"))
+                    )
+                }
+
                 if (response.isSuccessful) {
                     val responseBody = response.body()
                     if (responseBody == null) {
                         callback.onResponse(
                             this@ResultCall,
-                            Response.success(NetworkResult.Unexpected(Throwable(SUCCESS_BUT_BODY_IS_NULL)))
+                            Response.success(
+                                NetworkResult.Unexpected(
+                                    Throwable(
+                                        SUCCESS_BUT_BODY_IS_NULL
+                                    )
+                                )
+                            )
                         )
                         return
                     }

data/src/main/java/com/stop/data/remote/adapter/route/ResultCallAdapter.kt renamed to data/src/main/java/com/stop/data/remote/ResultCallAdapter.kt

@@ -1,4 +1,4 @@
-package com.stop.data.remote.adapter.route
+package com.stop.data.remote
 
 import retrofit2.Call
 import retrofit2.CallAdapter

data/src/main/java/com/stop/data/remote/model/Error.kt

@@ -0,0 +1,11 @@
+package com.stop.data.remote.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class Error(
+    val category: String,
+    val code: String,
+    val id: String,
+    val message: String
+)