week7: 서버통신 심화 및 권한 요청, 저장소 활용

app/build.gradle

@@ -2,6 +2,9 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
 Properties properties = new Properties()
@@ -77,4 +80,12 @@ dependencies {
     // Glide 라이브러리 추가
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+
+    // Hilt
+    implementation 'com.google.dagger:hilt-android:2.48'
+    kapt 'com.google.dagger:hilt-compiler:2.48'
+}
+
+kapt {
+    correctErrorTypes = true
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
 
 
     <application
+        android:name=".NowSopt"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -18,18 +19,18 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".signIn.SignInActivity"
+            android:name=".ui.signIn.SignInActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".signUp.SignUpActivity"
+            android:name=".ui.signUp.SignUpActivity"
             android:exported="false"/>
         <activity
-            android:name=".main.MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="false"/>
     </application>
 

app/src/main/java/com/sopt/now/NowSopt.kt

@@ -0,0 +1,21 @@
+package com.sopt.now
+
+import android.app.Application
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class NowSopt : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        appContext = applicationContext
+
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+    }
+
+    companion object {
+        lateinit var appContext: Context
+            private set
+    }
+}

app/src/main/java/com/sopt/now/data/di/NetworkModule.kt

@@ -0,0 +1,77 @@
+package com.sopt.now.data.di
+
+import android.util.Log
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.sopt.now.data.service.AuthService
+import com.sopt.now.data.service.FriendService
+import com.sopt.now.data.service.UserService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.Interceptor
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    private const val CONTENT_TYPE = "application/json"
+    private val json: Json =
+        Json {
+            ignoreUnknownKeys = true
+        }
+
+    private fun getLogOkHttpClient(): Interceptor {
+        val loggingInterceptor =
+            HttpLoggingInterceptor { message ->
+                Log.d("Retrofit2", "CONNECTION INFO -> $message")
+            }
+        loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+        return loggingInterceptor
+    }
+
+    private val okHttpClient =
+        OkHttpClient.Builder()
+            .addInterceptor(getLogOkHttpClient())
+            .build()
+
+    @Singleton
+    @Provides
+    fun provideRetrofit(): Retrofit.Builder {
+        return Retrofit.Builder()
+            .client(okHttpClient)
+            .addConverterFactory(json.asConverterFactory(CONTENT_TYPE.toMediaType()))
+    }
+
+    @Singleton
+    @Provides
+    fun provideAuthService(
+        retrofitBuilder: Retrofit.Builder,
+        @AuthBaseUrl url: String,
+    ): AuthService {
+        return retrofitBuilder.baseUrl(url).build().create(AuthService::class.java)
+    }
+
+    @Singleton
+    @Provides
+    fun provideUserService(
+        retrofitBuilder: Retrofit.Builder,
+        @AuthBaseUrl url: String,
+    ): UserService {
+        return retrofitBuilder.baseUrl(url).build().create(UserService::class.java)
+    }
+
+    @Singleton
+    @Provides
+    fun provideFriendService(
+        retrofitBuilder: Retrofit.Builder,
+        @FriendBaseUrl url: String,
+    ): FriendService {
+        return retrofitBuilder.baseUrl(url).build().create(FriendService::class.java)
+    }
+}

app/src/main/java/com/sopt/now/data/di/UrlModule.kt

@@ -0,0 +1,28 @@
+package com.sopt.now.data.di
+
+import com.sopt.now.BuildConfig
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
+
+@Module
+@InstallIn(SingletonComponent::class)
+object UrlModule {
+    @AuthBaseUrl
+    @Provides
+    fun provideAuthBaseUrl(): String = BuildConfig.AUTH_BASE_URL
+
+    @FriendBaseUrl
+    @Provides
+    fun provideFriendBaseUrl(): String = BuildConfig.FRIEND_BASE_URL
+}
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class AuthBaseUrl
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class FriendBaseUrl

app/src/main/java/com/sopt/now/data/repository/AuthRepository.kt

@@ -0,0 +1,25 @@
+package com.sopt.now.data.repository
+
+import com.sopt.now.data.request.RequestSignInDto
+import com.sopt.now.data.request.RequestSignUpDto
+import com.sopt.now.data.response.ResponseSignInDto
+import com.sopt.now.data.response.ResponseSignUpDto
+import com.sopt.now.data.service.AuthService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AuthRepository
+@Inject
+constructor(
+    private val authService: AuthService,
+) {
+    suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto> {
+        return authService.signUp(request)
+    }
+
+    suspend fun signIn(request: RequestSignInDto): Response<ResponseSignInDto> {
+        return authService.signIn(request)
+    }
+}

app/src/main/java/com/sopt/now/data/repository/FriendRepository.kt

@@ -0,0 +1,18 @@
+package com.sopt.now.data.repository
+
+import com.sopt.now.data.response.ResponseFriendsInfoDto
+import com.sopt.now.data.service.FriendService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FriendRepository
+@Inject
+constructor(
+    private val friendService: FriendService,
+) {
+    suspend fun getFriendsInfo(i: Int): Response<ResponseFriendsInfoDto> {
+        return friendService.getFriendsInfo(2)
+    }
+}

app/src/main/java/com/sopt/now/data/repository/UserRepository.kt

@@ -0,0 +1,18 @@
+package com.sopt.now.data.repository
+
+import com.sopt.now.data.response.ResponseUserInfoDto
+import com.sopt.now.data.service.UserService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserRepository
+@Inject
+constructor(
+    private val userService: UserService,
+) {
+    suspend fun getUserInfo(memberId: Int): Response<ResponseUserInfoDto> {
+        return userService.getUserInfo(memberId)
+    }
+}

app/src/main/java/com/sopt/now/signIn/RequestSignInDto.kt → app/src/main/java/com/sopt/now/data/request/RequestSignInDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.signIn
+package com.sopt.now.data.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/signUp/RequestSignUpDto.kt → app/src/main/java/com/sopt/now/data/request/RequestSignUpDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.signUp
+package com.sopt.now.data.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/main/homeFragment/ResponseFriendsInfoDto.kt → app/src/main/java/com/sopt/now/data/response/ResponseFriendsInfoDto.kt

@@ -1,7 +1,7 @@
-package com.sopt.now.main.homeFragment
+package com.sopt.now.data.response
 
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class ResponseFriendsInfoDto(

app/src/main/java/com/sopt/now/signIn/ResponseSignInDto.kt → app/src/main/java/com/sopt/now/data/response/ResponseSignInDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.signIn
+package com.sopt.now.data.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/signUp/ResponseSignUpDto.kt → app/src/main/java/com/sopt/now/data/response/ResponseSignUpDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.signUp
+package com.sopt.now.data.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/main/ResponseUserInfoDto.kt → app/src/main/java/com/sopt/now/data/response/ResponseUserInfoDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.main
+package com.sopt.now.data.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/data/service/AuthService.kt

@@ -0,0 +1,21 @@
+package com.sopt.now.data.service
+
+import com.sopt.now.data.request.RequestSignInDto
+import com.sopt.now.data.request.RequestSignUpDto
+import com.sopt.now.data.response.ResponseSignInDto
+import com.sopt.now.data.response.ResponseSignUpDto
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("member/join")
+    suspend fun signUp(
+        @Body request: RequestSignUpDto,
+    ): Response<ResponseSignUpDto>
+
+    @POST("member/login")
+    suspend fun signIn(
+        @Body request: RequestSignInDto,
+    ): Response<ResponseSignInDto>
+}

app/src/main/java/com/sopt/now/data/service/FriendService.kt

@@ -0,0 +1,13 @@
+package com.sopt.now.data.service
+
+import com.sopt.now.data.response.ResponseFriendsInfoDto
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface FriendService {
+    @GET("/api/users")
+    suspend fun getFriendsInfo(
+        @Query("page") page: Int,
+    ): Response<ResponseFriendsInfoDto>
+}

app/src/main/java/com/sopt/now/data/service/UserService.kt

@@ -0,0 +1,13 @@
+package com.sopt.now.data.service
+
+import com.sopt.now.data.response.ResponseUserInfoDto
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface UserService {
+    @GET("member/info")
+    suspend fun getUserInfo(
+        @Header("memberId") memberId: Int,
+    ): Response<ResponseUserInfoDto>
+}