Merge pull request #21 from YAPP-Github/feature/NDGL-88/impl-home-api

[NDGL-88] 홈 화면 API 연결

Author: jihee-dev

core/ui/src/main/res/values/strings.xml

@@ -20,6 +20,7 @@
 
     <!-- Place Type -->
     <string name="place_type_accommodation">숙소</string>
+    <string name="place_type_airport">공항</string>
     <string name="place_type_restaurant">음식점</string>
     <string name="place_type_attraction">관광명소</string>
     <string name="place_type_cafe">카페</string>

data/core/src/main/java/com/yapp/ndgl/data/core/di/NetworkModule.kt

@@ -1,21 +1,29 @@
 package com.yapp.ndgl.data.core.di
 
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.yapp.ndgl.data.core.BuildConfig
+import com.yapp.ndgl.data.core.adapter.NDGLCallAdapterFactory
 import com.yapp.ndgl.data.core.authenticator.NDGLAuthenticator
 import com.yapp.ndgl.data.core.interceptor.NDGLInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import timber.log.Timber
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object NetworkModule {
+    private val prettyJson = Json { prettyPrint = true }
+
     @Singleton
     @Provides
     fun provideJson(): Json = Json {
@@ -26,37 +34,67 @@ object NetworkModule {
     @Provides
     fun provideBaseUrl(): String = BuildConfig.NDGL_BASE_URL
 
+    @Singleton
+    @Provides
+    fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor =
+        HttpLoggingInterceptor { message ->
+            if (message.startsWith("{").not() && message.startsWith("[").not()) {
+                Timber.tag("OkHttp").d(message)
+                return@HttpLoggingInterceptor
+            }
+
+            try {
+                val element = prettyJson.decodeFromString<JsonElement>(message)
+                Timber.tag("OkHttp").d(prettyJson.encodeToString(JsonElement.serializer(), element))
+            } catch (_: Exception) {
+                Timber.tag("OkHttp").d(message)
+            }
+        }.apply {
+            level = if (BuildConfig.DEBUG) {
+                HttpLoggingInterceptor.Level.BODY
+            } else {
+                HttpLoggingInterceptor.Level.NONE
+            }
+        }
+
     @Singleton
     @Provides
     fun provideDefaultOkHttpClient(
         interceptor: NDGLInterceptor,
         authenticator: NDGLAuthenticator,
+        httpLoggingInterceptor: HttpLoggingInterceptor,
     ): OkHttpClient {
         val builder = OkHttpClient.Builder()
             .addInterceptor(interceptor)
             .authenticator(authenticator)
-
-        if (BuildConfig.DEBUG) {
-            val loggingInterceptor = HttpLoggingInterceptor()
-            loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
-            builder.addInterceptor(loggingInterceptor)
-        }
-
+            .addInterceptor(httpLoggingInterceptor)
         return builder.build()
     }
 
+    @Singleton
+    @Provides
+    fun provideRetrofit(
+        json: Json,
+        baseUrl: String,
+        okHttpClient: OkHttpClient,
+        callAdapterFactory: NDGLCallAdapterFactory,
+    ): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .client(okHttpClient)
+            .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+            .addCallAdapterFactory(callAdapterFactory)
+            .build()
+    }
+
     @AuthClient
     @Singleton
     @Provides
-    fun provideAuthOkHttpClient(): OkHttpClient {
+    fun provideAuthOkHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
+    ): OkHttpClient {
         val builder = OkHttpClient.Builder()
-
-        if (BuildConfig.DEBUG) {
-            val loggingInterceptor = HttpLoggingInterceptor()
-            loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
-            builder.addInterceptor(loggingInterceptor)
-        }
-
+            .addInterceptor(httpLoggingInterceptor)
         return builder.build()
     }
 }

data/core/src/main/java/com/yapp/ndgl/data/core/serializer/LocalDateSerializer.kt

@@ -0,0 +1,25 @@
+package com.yapp.ndgl.data.core.serializer
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+object LocalDateSerializer : KSerializer<LocalDate> {
+    private val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+    override val descriptor: SerialDescriptor =
+        PrimitiveSerialDescriptor(LocalDate::class.java.name, PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: LocalDate) {
+        encoder.encodeString(value.format(formatter))
+    }
+
+    override fun deserialize(decoder: Decoder): LocalDate {
+        return LocalDate.parse(decoder.decodeString(), formatter)
+    }
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/api/TravelProgramApi.kt

@@ -0,0 +1,10 @@
+package com.yapp.ndgl.data.travel.api
+
+import com.yapp.ndgl.data.core.model.BaseResponse
+import com.yapp.ndgl.data.travel.model.TravelProgram
+import retrofit2.http.GET
+
+interface TravelProgramApi {
+    @GET("/api/v1/travel-programs")
+    suspend fun getAllPrograms(): BaseResponse<List<TravelProgram>>
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/api/TravelTemplateApi.kt

@@ -0,0 +1,19 @@
+package com.yapp.ndgl.data.travel.api
+
+import com.yapp.ndgl.data.core.model.BaseResponse
+import com.yapp.ndgl.data.travel.model.PopularTravelTemplates
+import com.yapp.ndgl.data.travel.model.RecommendTravelTemplates
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface TravelTemplateApi {
+    @GET("/api/v1/travel-templates/popular")
+    suspend fun getPopularTravelTemplates(
+        @Query("travelProgramId") travelProgramId: Long? = null,
+        @Query("page") page: Int? = null,
+        @Query("size") size: Int? = null,
+    ): BaseResponse<PopularTravelTemplates>
+
+    @GET("/api/v1/travel-templates/recommend")
+    suspend fun getRecommendTravelTemplates(): BaseResponse<RecommendTravelTemplates>
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/api/UserTravelApi.kt

@@ -0,0 +1,10 @@
+package com.yapp.ndgl.data.travel.api
+
+import com.yapp.ndgl.data.core.model.BaseResponse
+import com.yapp.ndgl.data.travel.model.UpcomingTravelResponse
+import retrofit2.http.GET
+
+interface UserTravelApi {
+    @GET("/api/v1/travels/upcoming")
+    suspend fun getUpcomingTravel(): BaseResponse<UpcomingTravelResponse>
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/di/TravelNetworkModule.kt

@@ -0,0 +1,33 @@
+package com.yapp.ndgl.data.travel.di
+
+import com.yapp.ndgl.data.travel.api.TravelProgramApi
+import com.yapp.ndgl.data.travel.api.TravelTemplateApi
+import com.yapp.ndgl.data.travel.api.UserTravelApi
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object TravelNetworkModule {
+    @Provides
+    @Singleton
+    fun provideTravelProgramApi(
+        retrofit: Retrofit,
+    ): TravelProgramApi = retrofit.create(TravelProgramApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideTravelTemplateApi(
+        retrofit: Retrofit,
+    ): TravelTemplateApi = retrofit.create(TravelTemplateApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideUserTravelApi(
+        retrofit: Retrofit,
+    ): UserTravelApi = retrofit.create(UserTravelApi::class.java)
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/InProgressTravel.kt

@@ -0,0 +1,25 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class PlaceCategory {
+    @SerialName("AIRPORT")
+    AIRPORT,
+
+    @SerialName("TRANSPORT")
+    TRANSPORT,
+
+    @SerialName("ATTRACTION")
+    ATTRACTION,
+
+    @SerialName("RESTAURANT")
+    RESTAURANT,
+
+    @SerialName("CAFE")
+    CAFE,
+
+    @SerialName("ACCOMMODATION")
+    ACCOMMODATION,
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/PlaceCategory.kt

@@ -0,0 +1,9 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PopularTravelTemplates(
+    val content: List<TravelTemplateSummary>,
+    val hasNext: Boolean,
+)