Merge pull request #10 from DO-SOPT-ANDROID/appjam-refactor

Appjam refactor

app/build.gradle

@@ -2,6 +2,8 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20'
+    id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 Properties properties = new Properties()
@@ -36,11 +38,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 
@@ -67,4 +69,11 @@ dependencies {
     implementation('com.squareup.okhttp3:okhttp:4.9.1')
     implementation("io.coil-kt:coil:2.0.0-rc03")
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation "com.google.dagger:hilt-android:2.44"
+    kapt "com.google.dagger:hilt-compiler:2.44"
+}
+
+kapt {
+    correctErrorTypes true
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -16,11 +17,11 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.auth.SignUpActivity"
+            android:name=".ui.auth.SignUpActivity"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
         <activity
-            android:name=".presentation.auth.LoginActivity"
+            android:name=".ui.auth.LoginActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>
@@ -30,7 +31,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.home.HomeActivity"
+            android:name=".ui.home.HomeActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="false" />
     </application>

app/src/main/java/org/sopt/dosopttemplate/App.kt

@@ -0,0 +1,13 @@
+package org.sopt.dosopttemplate
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class App : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/datasource/FollowerDataSource.kt

@@ -0,0 +1,12 @@
+package org.sopt.dosopttemplate.data.datasource
+
+import org.sopt.dosopttemplate.data.entity.response.ResponseFollowerDto
+import org.sopt.dosopttemplate.data.entity.service.FollowerService
+import javax.inject.Inject
+
+class FollowerDataSource @Inject constructor(
+    private val followerService: FollowerService
+) {
+    suspend fun follower(): ResponseFollowerDto =
+        followerService.follower()
+}

app/src/main/java/org/sopt/dosopttemplate/data/datasource/LoginDataSource.kt

@@ -0,0 +1,13 @@
+package org.sopt.dosopttemplate.data.datasource
+
+import org.sopt.dosopttemplate.data.entity.request.RequestLoginDto
+import org.sopt.dosopttemplate.data.entity.response.ResponseLoginDto
+import org.sopt.dosopttemplate.data.entity.service.LoginService
+import javax.inject.Inject
+
+class LoginDataSource @Inject constructor(
+    private val loginService: LoginService
+) {
+    suspend fun login(request: RequestLoginDto): ResponseLoginDto =
+        loginService.login(request)
+}

app/src/main/java/org/sopt/dosopttemplate/data/datasource/SignUpDataSource.kt

@@ -0,0 +1,11 @@
+package org.sopt.dosopttemplate.data.datasource
+
+import org.sopt.dosopttemplate.data.entity.request.RequestSignUpDto
+import org.sopt.dosopttemplate.data.entity.service.SignUpService
+import javax.inject.Inject
+
+class SignUpDataSource @Inject constructor(
+    private val signUpService: SignUpService
+) {
+    suspend fun signUp(request: RequestSignUpDto) = signUpService.signUp(request)
+}

app/src/main/java/org/sopt/dosopttemplate/data/entity/LoginState.kt

@@ -0,0 +1,9 @@
+package org.sopt.dosopttemplate.data.entity
+
+import org.sopt.dosopttemplate.data.entity.response.ResponseLoginDto
+
+sealed class LoginState {
+    object Loading : LoginState()
+    data class Success(val data: ResponseLoginDto.UserInfo) : LoginState()
+    object Error : LoginState()
+}

app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestLoginDto.kt → app/src/main/java/org/sopt/dosopttemplate/data/entity/request/RequestLoginDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.request
+package org.sopt.dosopttemplate.data.entity.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestSignUpDto.kt → app/src/main/java/org/sopt/dosopttemplate/data/entity/request/RequestSignUpDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.request
+package org.sopt.dosopttemplate.data.entity.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/response/ResponseFollowerDto.kt → app/src/main/java/org/sopt/dosopttemplate/data/entity/response/ResponseFollowerDto.kt

@@ -1,7 +1,8 @@
-package org.sopt.dosopttemplate.data.model.response
+package org.sopt.dosopttemplate.data.entity.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.sopt.dosopttemplate.domain.model.Follower
 
 @Serializable
 data class ResponseFollowerDto(
@@ -40,5 +41,13 @@ data class ResponseFollowerDto(
         val text: String
     )
 
+    fun toFollower() = data.map { data ->
+        Follower(
+            id = data.id,
+            avatar = data.avatar,
+            email = data.email,
+            firstName = data.firstName
+        )
+    }
 }
 

app/src/main/java/org/sopt/dosopttemplate/data/entity/response/ResponseLoginDto.kt

@@ -0,0 +1,25 @@
+package org.sopt.dosopttemplate.data.entity.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseLoginDto(
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: UserInfo,
+) {
+    @Serializable
+    data class UserInfo(
+        @SerialName("id")
+        val id: Int,
+        @SerialName("username")
+        val username: String,
+        @SerialName("nickname")
+        val nickname: String
+    )
+}
+

app/src/main/java/org/sopt/dosopttemplate/data/model/response/ResponseSignUpDto.kt → app/src/main/java/org/sopt/dosopttemplate/data/entity/response/ResponseSignUpDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.response
+package org.sopt.dosopttemplate.data.entity.response
 
 data class ResponseSignUpDto(
     val success: Unit

app/src/main/java/org/sopt/dosopttemplate/data/entity/service/FollowerService.kt

@@ -0,0 +1,12 @@
+package org.sopt.dosopttemplate.data.entity.service
+
+import org.sopt.dosopttemplate.data.entity.response.ResponseFollowerDto
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface FollowerService {
+    @GET("api/users")
+    suspend fun follower(
+        @Query("page") num: Int = 2
+    ): ResponseFollowerDto
+}

app/src/main/java/org/sopt/dosopttemplate/data/entity/service/LoginService.kt

@@ -0,0 +1,13 @@
+package org.sopt.dosopttemplate.data.entity.service
+
+import org.sopt.dosopttemplate.data.entity.request.RequestLoginDto
+import org.sopt.dosopttemplate.data.entity.response.ResponseLoginDto
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface LoginService {
+    @POST("api/v1/members/sign-in")
+    suspend fun login(
+        @Body request: RequestLoginDto,
+    ): ResponseLoginDto
+}

app/src/main/java/org/sopt/dosopttemplate/data/entity/service/SignUpService.kt

@@ -0,0 +1,12 @@
+package org.sopt.dosopttemplate.data.entity.service
+
+import org.sopt.dosopttemplate.data.entity.request.RequestSignUpDto
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface SignUpService {
+    @POST("api/v1/members")
+    suspend fun signUp(
+        @Body signUpReq: RequestSignUpDto,
+    )
+}

app/src/main/java/org/sopt/dosopttemplate/data/repositoryimpl/FollowerRepositoryImpl.kt

@@ -0,0 +1,16 @@
+package org.sopt.dosopttemplate.data.repositoryimpl
+
+import org.sopt.dosopttemplate.data.datasource.FollowerDataSource
+import org.sopt.dosopttemplate.domain.model.Follower
+import org.sopt.dosopttemplate.domain.repository.FollowerRepository
+import javax.inject.Inject
+
+class FollowerRepositoryImpl @Inject constructor(private val followerDataSource: FollowerDataSource) :
+    FollowerRepository {
+    override suspend fun loadFollowerData(): Result<List<Follower>> =
+        runCatching {
+            followerDataSource.follower().toFollower()
+        }
+}
+
+

app/src/main/java/org/sopt/dosopttemplate/data/repositoryimpl/LoginRepositoryImpl.kt

@@ -0,0 +1,18 @@
+package org.sopt.dosopttemplate.data.repositoryimpl
+
+import org.sopt.dosopttemplate.data.datasource.LoginDataSource
+import org.sopt.dosopttemplate.data.entity.request.RequestLoginDto
+import org.sopt.dosopttemplate.data.entity.response.ResponseLoginDto
+import org.sopt.dosopttemplate.domain.repository.LoginRepository
+import javax.inject.Inject
+
+class LoginRepositoryImpl @Inject constructor(private val loginDataSource: LoginDataSource) :
+    LoginRepository {
+    override suspend fun login(
+        username: String,
+        password: String
+    ): Result<ResponseLoginDto.UserInfo> =
+        runCatching {
+            loginDataSource.login(RequestLoginDto(username, password)).data
+        }
+}

app/src/main/java/org/sopt/dosopttemplate/data/repositoryimpl/SignUpRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.dosopttemplate.data.repositoryimpl
+
+import org.sopt.dosopttemplate.data.datasource.SignUpDataSource
+import org.sopt.dosopttemplate.data.entity.request.RequestSignUpDto
+import org.sopt.dosopttemplate.domain.repository.SignUpRepository
+import javax.inject.Inject
+
+class SignUpRepositoryImpl @Inject constructor(private val signUpDataSource: SignUpDataSource) :
+    SignUpRepository {
+    override suspend fun signUp(id: String, password: String, nickname: String): Result<Unit> =
+        runCatching {
+            signUpDataSource.signUp(RequestSignUpDto(id, password, nickname))
+        }
+}

app/src/main/java/org/sopt/dosopttemplate/data/model/service/ApiFactory.kt → app/src/main/java/org/sopt/dosopttemplate/di/ApiFactory.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.service
+package org.sopt.dosopttemplate.di
 
 import android.util.Log
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
@@ -8,6 +8,9 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.sopt.dosopttemplate.BuildConfig
+import org.sopt.dosopttemplate.data.entity.service.FollowerService
+import org.sopt.dosopttemplate.data.entity.service.LoginService
+import org.sopt.dosopttemplate.data.entity.service.SignUpService
 import retrofit2.Retrofit
 
 object ApiFactory {
@@ -49,6 +52,7 @@ object ReqresApiFactory {
 }
 
 object ServicePool {
-    val authService = ApiFactory.create<AuthService>()
+    val loginService = ApiFactory.create<LoginService>()
+    val signUpService = ApiFactory.create<SignUpService>()
     val followerService = ReqresApiFactory.create<FollowerService>()
 }