Merge pull request #15 from meongmory/feature/clean

[feature/clean] 클린아키텍쳐 구조, 모듈화 구현

app/build.gradle.kts

@@ -2,6 +2,8 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    id("dagger.hilt.android.plugin")
+    id("kotlin-kapt")
 }
 
 android {
@@ -51,6 +53,10 @@ android {
 }
 
 dependencies {
+    implementation(project(":presentation"))
+    implementation(project(":domain"))
+    implementation(project(":data"))
+
     implementation(libs.core.ktx)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.activity.compose)
@@ -66,4 +72,16 @@ dependencies {
     androidTestImplementation(libs.ui.test.junit4)
     debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)
+
+    // Hilt
+    implementation(libs.hilt)
+    kapt(libs.hilt.testing.compiler)
+
+    // Retrofit
+    implementation(libs.retrofit)
+    implementation(libs.okhttp.logging.interceptor)
+
+    // Serialization
+    implementation(libs.serialization)
+    implementation(libs.kotlin.serilization)
 }

app/src/main/AndroidManifest.xml

@@ -3,17 +3,19 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".MeongMoryApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Meongmory"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="com.meongmoryteam.presentation.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Meongmory">

app/src/main/java/com/meongmoryteam/meongmory/MeongMoryApplication.kt

@@ -0,0 +1,9 @@
+package com.meongmoryteam.meongmory
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MeongMoryApplication : Application() {
+
+}

app/src/main/java/com/meongmoryteam/meongmory/di/NetworkModule.kt

@@ -0,0 +1,48 @@
+package com.meongmoryteam.meongmory.di
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.meongmoryteam.data.service.ExampleApi
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    private val contentType = "application/json".toMediaType()
+    private val json = Json { ignoreUnknownKeys = true }
+
+    private const val BASE_URL = "https://www.test.com/"
+
+    @Provides
+    @Singleton
+    fun provideClient(): OkHttpClient {
+        return OkHttpClient.Builder()
+            .connectTimeout(100, TimeUnit.SECONDS)
+            .readTimeout(100, TimeUnit.SECONDS)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(client: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(json.asConverterFactory(contentType))
+            .client(client)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideApi(retrofit: Retrofit): ExampleApi {
+        return retrofit.create(ExampleApi::class.java)
+    }
+}

app/src/main/java/com/meongmoryteam/meongmory/di/RepositoryModule.kt

@@ -0,0 +1,28 @@
+package com.meongmoryteam.meongmory.di
+
+import com.meongmoryteam.data.datasource.FoodDataSource
+import com.meongmoryteam.data.datasource.FoodDataSourceImpl
+import com.meongmoryteam.data.repository.FoodRepositoryImpl
+import com.meongmoryteam.domain.repository.FoodRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+
+    @Singleton
+    @Binds
+    abstract fun bindFoodRepository(
+        foodRepositoryImpl: FoodRepositoryImpl,
+    ) : FoodRepository
+
+    @Singleton
+    @Binds
+    abstract fun bindFoodV2DataSource(
+        foodDataSourceImpl: FoodDataSourceImpl
+    ): FoodDataSource
+}

build.gradle.kts

@@ -9,6 +9,7 @@ buildscript {
     dependencies {
         classpath(libs.kotlin.gradleplugin)
         classpath(libs.agp)
+        classpath(libs.hilt.plugin)
     }
 }
 
@@ -17,6 +18,7 @@ plugins {
     alias(libs.plugins.kotlinAndroid) apply false
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.serilization) apply false
 }
 
 tasks.register("clean", Delete::class) {

data/.gitignore

@@ -0,0 +1 @@
+/build

data/build.gradle.kts

@@ -0,0 +1,53 @@
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.android.library)
+    id("dagger.hilt.android.plugin")
+    id("kotlin-kapt")
+    id("kotlinx-serialization")
+}
+
+android {
+    namespace = "com.meongmoryteam.data"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 28
+        targetSdk = 33
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    implementation(project(":domain"))
+
+    //Retrofit
+    implementation(libs.retrofit)
+    implementation(libs.okhttp.logging.interceptor)
+
+    // Hilt
+    implementation(libs.hilt)
+    kapt(libs.hilt.testing.compiler)
+
+    // Serialization
+    implementation(libs.serialization)
+    implementation(libs.kotlin.serilization)
+}

data/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

data/src/androidTest/java/com/meongmoryteam/data/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.meongmoryteam.data
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.meongmoryteam.data", appContext.packageName)
+    }
+}

data/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+</manifest>

data/src/main/java/com/meongmoryteam/data/datasource/FoodDataSource.kt

@@ -0,0 +1,8 @@
+package com.meongmoryteam.data.datasource
+
+import com.meongmoryteam.data.model.WeekFoodResponse
+
+interface FoodDataSource {
+
+    suspend fun weekGetFoodArea(s: String): Result<WeekFoodResponse>
+}

data/src/main/java/com/meongmoryteam/data/datasource/FoodDataSourceImpl.kt

@@ -0,0 +1,13 @@
+package com.meongmoryteam.data.datasource
+
+import com.meongmoryteam.data.model.WeekFoodResponse
+import com.meongmoryteam.data.service.ExampleApi
+import javax.inject.Inject
+
+class FoodDataSourceImpl @Inject constructor(
+    private val exampleApi: ExampleApi
+) : FoodDataSource {
+    override suspend fun weekGetFoodArea(s: String): Result<WeekFoodResponse> {
+        return runCatching { exampleApi.weekGetFoodArea(s) }
+    }
+}

data/src/main/java/com/meongmoryteam/data/model/GetWeekFood.kt

@@ -0,0 +1,44 @@
+package com.meongmoryteam.data.model
+
+import com.meongmoryteam.domain.model.ResponseWeekFoodEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WeekFoodResponse(
+    val success : Boolean,
+    val message : String,
+    val localDateTime : String,
+    val httpStatus : String,
+    val httpCode : Int,
+    val data : List<WeekFoodResult>,
+) {
+    @Serializable
+    data class WeekFoodResult(
+        val mealId: Int,
+        val toDay: String,
+        val mealType : String,
+        val statusType : String,
+        val meals : List<String>
+    )
+}
+
+fun WeekFoodResponse.toWeekFoodEntity(): ResponseWeekFoodEntity {
+    val weekFoodResultEntityList = this.data.map { result ->
+        ResponseWeekFoodEntity.WeekFoodResultEntity(
+            mealId = result.mealId,
+            toDay = result.toDay,
+            mealType = result.mealType,
+            statusType = result.statusType,
+            meals = result.meals
+        )
+    }
+
+    return ResponseWeekFoodEntity(
+        success = this.success,
+        message = this.message,
+        localDateTime = this.localDateTime,
+        httpStatus = this.httpStatus,
+        httpCode = this.httpCode,
+        data = weekFoodResultEntityList
+    )
+}

data/src/main/java/com/meongmoryteam/data/repository/FoodRepositoryImpl.kt

@@ -0,0 +1,16 @@
+package com.meongmoryteam.data.repository
+
+import com.meongmoryteam.data.datasource.FoodDataSource
+import com.meongmoryteam.data.model.toWeekFoodEntity
+import com.meongmoryteam.domain.model.ResponseWeekFoodEntity
+import com.meongmoryteam.domain.repository.FoodRepository
+import javax.inject.Inject
+
+class FoodRepositoryImpl @Inject constructor(
+    private val foodDataSource: FoodDataSource
+) : FoodRepository {
+
+    override suspend fun weekFood(area: String): Result<ResponseWeekFoodEntity> {
+        return foodDataSource.weekGetFoodArea(area).map { it.toWeekFoodEntity() }
+    }
+}

data/src/main/java/com/meongmoryteam/data/service/ExampleApi.kt

@@ -0,0 +1,13 @@
+package com.meongmoryteam.data.service
+
+import com.meongmoryteam.data.model.WeekFoodResponse
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface ExampleApi {
+
+    @GET("/api/v2/meals/week/{area}")
+    suspend fun weekGetFoodArea(
+        @Path("area") area: String
+    ): WeekFoodResponse
+}