[Week4] 4주차 필수 과제

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -7,6 +9,10 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+val properties = Properties().apply {
+    load(project.rootProject.file("local.properties").inputStream())
+}
+
 android {
     namespace = "org.sopt.and"
     compileSdk = 34
@@ -19,6 +25,8 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -39,6 +47,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -72,4 +81,12 @@ dependencies {
     //navigation
     implementation(libs.androidx.compose.navigation)
     implementation(libs.kotlinx.serialization.json)
+
+    // Network
+    implementation(platform(libs.okhttp.bom))
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.logging.interceptor)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.kotlin.serialization.converter)
+    implementation(libs.kotlinx.serialization.json)
 }

app/src/main/AndroidManifest.xml

@@ -2,8 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
-        android:name=".App"
+        android:name=".WavveApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -12,9 +14,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".main.MainActivity"
+            android:name=".feature.main.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.ANDANDROID"
             android:windowSoftInputMode="adjustResize">

app/src/main/java/org/sopt/and/App.kt → app/src/main/java/org/sopt/and/WavveApplication.kt

@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class App : Application()
+class WavveApplication : Application()

app/src/main/java/org/sopt/and/component/HomeContent.kt

@@ -31,7 +31,7 @@ import androidx.compose.ui.unit.sp
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import org.sopt.and.R
-import org.sopt.and.home.model.ContentModel
+import org.sopt.and.feature.home.model.ContentModel
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 import org.sopt.and.ui.theme.White
 

app/src/main/java/org/sopt/and/data/datasource/WavveDataSource.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.dto.request.RequestSignInDto
+import org.sopt.and.data.dto.request.RequestSignUpDto
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseUserHobbyDto
+import org.sopt.and.data.dto.response.ResponseSignInDto
+import org.sopt.and.data.dto.response.ResponseSignUpDto
+
+interface WavveDataSource {
+    suspend fun postSignUp(requestSignUpDto: RequestSignUpDto): BaseResponse<ResponseSignUpDto>
+    suspend fun postSignIn(requestSignInDto: RequestSignInDto): BaseResponse<ResponseSignInDto>
+    suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto>
+}

app/src/main/java/org/sopt/and/data/datasourceimpl/WavveDataSourceImpl.kt

@@ -0,0 +1,25 @@
+package org.sopt.and.data.datasourceimpl
+
+import org.sopt.and.data.datasource.WavveDataSource
+import org.sopt.and.data.dto.request.RequestSignInDto
+import org.sopt.and.data.dto.request.RequestSignUpDto
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseUserHobbyDto
+import org.sopt.and.data.dto.response.ResponseSignInDto
+import org.sopt.and.data.dto.response.ResponseSignUpDto
+import org.sopt.and.data.service.WavveService
+import javax.inject.Inject
+
+class WavveDataSourceImpl @Inject constructor(
+    val wavveService: WavveService
+) : WavveDataSource {
+    override suspend fun postSignUp(requestSignUpDto: RequestSignUpDto): BaseResponse<ResponseSignUpDto> =
+        wavveService.postSignUp(requestSignUpDto)
+
+    override suspend fun postSignIn(requestSignInDto: RequestSignInDto): BaseResponse<ResponseSignInDto> =
+        wavveService.postSignIn(requestSignInDto)
+
+    override suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto> =
+        wavveService.getUserHobby()
+
+}

app/src/main/java/org/sopt/and/data/di/AuthInterceptor.kt

@@ -0,0 +1,27 @@
+package org.sopt.and.data.di
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import org.sopt.and.sharedpreference.User
+import javax.inject.Inject
+
+class AuthInterceptor @Inject constructor(private val user: User) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+
+        val token = user.getUserToken()
+
+        val request = chain.request().newBuilder()
+            .apply {
+                token?.let {
+                    addHeader(TOKEN, token)
+                }
+            }
+            .build()
+
+        return chain.proceed(request)
+    }
+
+    companion object {
+        const val TOKEN: String = "token"
+    }
+}

app/src/main/java/org/sopt/and/data/di/DataSourceModule.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.datasource.WavveDataSource
+import org.sopt.and.data.datasourceimpl.WavveDataSourceImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class DataSourceModule {
+    @Binds
+    @Singleton
+    abstract fun bindsDataSource(myDataSourceImpl: WavveDataSourceImpl): WavveDataSource
+}
+

app/src/main/java/org/sopt/and/data/di/NetworkModule.kt

@@ -0,0 +1,73 @@
+package org.sopt.and.data.di
+
+import android.util.Log
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+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 okhttp3.logging.HttpLoggingInterceptor
+import org.sopt.and.BuildConfig
+import org.sopt.and.sharedpreference.User
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    private const val CONTENT_TYPE = "application/json"
+    private const val BASE_URL = BuildConfig.BASE_URL
+
+    @Singleton
+    @Provides
+    fun provideJson(): Json {
+        return Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+            encodeDefaults = true
+        }
+    }
+
+    @Singleton
+    @Provides
+    fun provideLoggingInterceptor(): HttpLoggingInterceptor {
+        return HttpLoggingInterceptor { message ->
+            Log.d("Retrofit2", "CONNECTION INFO -> $message")
+        }.apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        }
+    }
+
+
+    @Singleton
+    @Provides
+    fun provideAuthInterceptor(user: User): AuthInterceptor {
+        return AuthInterceptor(user)
+    }
+
+    @Singleton
+    @Provides
+    fun provideOkHttpClient(
+        loggingInterceptor: HttpLoggingInterceptor,
+        authInterceptor: AuthInterceptor
+    ): OkHttpClient {
+        return OkHttpClient.Builder()
+            .addInterceptor(loggingInterceptor)
+            .addInterceptor(authInterceptor)
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideRetrofit(okHttpClient: OkHttpClient, json: Json): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(okHttpClient)
+            .addConverterFactory(json.asConverterFactory(CONTENT_TYPE.toMediaType()))
+            .build()
+    }
+}

app/src/main/java/org/sopt/and/data/di/RepositoryModule.kt

@@ -0,0 +1,19 @@
+package org.sopt.and.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.repositoryimpl.WavveRepositoryImpl
+import org.sopt.and.domain.repository.WavveRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindsRepository(
+        myRepositoryImpl: WavveRepositoryImpl
+    ): WavveRepository
+}

app/src/main/java/org/sopt/and/data/di/ServiceModule.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.data.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.service.WavveService
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+    @Provides
+    @Singleton
+    fun providerService(retrofit: Retrofit): WavveService =
+        retrofit.create(WavveService::class.java)
+}

app/src/main/java/org/sopt/and/data/dto/request/RequestSignInDto.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.domain.entity.request.RequestSignInEntity
+
+@Serializable
+data class RequestSignInDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String,
+)
+
+fun RequestSignInEntity.toDto() = RequestSignInDto(
+    username = username,
+    password = password
+)

app/src/main/java/org/sopt/and/data/dto/request/RequestSignUpDto.kt

@@ -0,0 +1,22 @@
+package org.sopt.and.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.domain.entity.request.RequestSignUpEntity
+
+@Serializable
+data class RequestSignUpDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("hobby")
+    val hobby: String,
+)
+
+fun RequestSignUpEntity.toDto() = RequestSignUpDto(
+    username = username,
+    password = password,
+    hobby = hobby
+)
+

app/src/main/java/org/sopt/and/data/dto/response/BaseResponse.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class BaseResponse<T>(
+    @SerialName("result")
+    val result: T
+)

app/src/main/java/org/sopt/and/data/dto/response/ResponseSignInDto.kt

@@ -0,0 +1,15 @@
+package org.sopt.and.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.domain.entity.response.ResponseSignInEntity
+
+@Serializable
+data class ResponseSignInDto(
+    @SerialName("token")
+    val token: String
+){
+    fun toEntity() = ResponseSignInEntity(
+        token = token
+    )
+}

app/src/main/java/org/sopt/and/data/dto/response/ResponseSignUpDto.kt

@@ -0,0 +1,15 @@
+package org.sopt.and.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.domain.entity.response.ResponseSignUpEntity
+
+@Serializable
+data class ResponseSignUpDto(
+    @SerialName("no")
+    val no: Int
+) {
+    fun toEntity() = ResponseSignUpEntity(
+        id = no
+    )
+}

app/src/main/java/org/sopt/and/data/dto/response/ResponseUserHobbyDto.kt

@@ -0,0 +1,15 @@
+package org.sopt.and.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.domain.entity.response.ResponseHobbyEntity
+
+@Serializable
+data class ResponseUserHobbyDto(
+    @SerialName("hobby")
+    val hobby: String
+){
+    fun toEntity() = ResponseHobbyEntity(
+        hobby = hobby
+    )
+}