메인화면 API 연결 #78

app/src/main/java/com/eighteen/eighteenandroid/common/Constants.kt

@@ -1,3 +1,5 @@
 package com.eighteen.eighteenandroid.common
 
-const val MEDIA_COUNT = 2
+const val MEDIA_COUNT = 2
+const val USER_TYPE_SIGNIN = "user"
+const val USER_TYPE_GUEST = "guest"

app/src/main/java/com/eighteen/eighteenandroid/common/ResourceProvider.kt

@@ -0,0 +1,18 @@
+package com.eighteen.eighteenandroid.common
+
+import android.content.Context
+import androidx.annotation.StringRes
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class ResourceProvider @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    fun getString(@StringRes resId: Int): String {
+        return context.getString(resId)
+    }
+
+    fun getString(@StringRes resId: Int, vararg args: Any): String {
+        return context.getString(resId, *args)
+    }
+}

app/src/main/java/com/eighteen/eighteenandroid/common/enums/Tag.kt

@@ -3,7 +3,7 @@ package com.eighteen.eighteenandroid.common.enums
 enum class Tag(val strValue: String) {
     ALL("전체"),
     BEAUTY("뷰티"),
-    EXERCISE("운동"),
+    SPORT("운동"),
     STUDY("공부"),
     ART("예술"),
     GAME("게임"),

app/src/main/java/com/eighteen/eighteenandroid/data/datasource/remote/response/UserResponse.kt

@@ -1,10 +1,20 @@
 package com.eighteen.eighteenandroid.data.datasource.remote.response
 
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+@JsonClass(generateAdapter = true)
 data class UserResponse(
-    val userImage: String,
-    val userId: String,
-    val name: String,
-    val age: String,
-    val userSchoolName: String,
-    val tag: String
+    val users: List<UserDto>,
+    val totalPage: Int
+)
+
+data class UserDto(
+    val id: Int,
+    val profileImage: String?,
+    val uniqueId: String,
+    val nickName: String,
+    val birthDay: String,
+    val location: String,
+    val schoolName: String,
+    val likeStatus: Boolean
 )

app/src/main/java/com/eighteen/eighteenandroid/data/datasource/remote/service/UserService.kt

@@ -3,6 +3,7 @@ package com.eighteen.eighteenandroid.data.datasource.remote.service
 import com.eighteen.eighteenandroid.data.datasource.remote.request.SignUpRequest
 import com.eighteen.eighteenandroid.data.datasource.remote.response.ApiResult
 import com.eighteen.eighteenandroid.data.datasource.remote.response.ProfileDetailResponse
+import com.eighteen.eighteenandroid.data.datasource.remote.response.UserDto
 import com.eighteen.eighteenandroid.data.datasource.remote.response.UserResponse
 import retrofit2.Response
 import retrofit2.http.Body
@@ -31,6 +32,18 @@ interface UserService {
     @POST("/v1/api/user/sign-in")
     suspend fun postLogin(@Query("phoneNumber") phoneNumber: String): Response<ApiResult<String>>
 
+    @GET("/v1/api/{userType}/find-all/{category}")
+    suspend fun getCategoryUser(@Path("userType") userType: String, @Path("category") category: String, @Query("page") page: Int, @Query("size") size: Int = 10): Response<ApiResult<UserResponse>>
+
+    @POST("/v1/api/user/like")
+    suspend fun postLikeUser(@Query("likedId") likedId: Int): Response<ApiResult<String>>
+
+    @POST("/v1/api/user/like-cancel")
+    suspend fun postLikeCancelUser(@Query("likedId") likedId: Int): Response<ApiResult<String>>
+
+    @GET("/v1/api/teen/{userType}/famous/{category}")
+    suspend fun getPopularUser(@Path("userType") userType: String, @Path("category") category: String): Response<ApiResult<List<UserDto>>>
+
     @DELETE("/v1/api/user/sign-out")
     suspend fun signOut(): Response<ApiResult<String>>
 

app/src/main/java/com/eighteen/eighteenandroid/data/mapper/UserMapper.kt

@@ -1,18 +1,49 @@
 package com.eighteen.eighteenandroid.data.mapper
 
+import com.eighteen.eighteenandroid.data.datasource.remote.response.UserDto
 import com.eighteen.eighteenandroid.data.datasource.remote.response.UserResponse
 import com.eighteen.eighteenandroid.domain.model.User
+import com.eighteen.eighteenandroid.domain.model.UserUseCaseModel
+import java.time.LocalDate
+import java.time.Period
+import java.time.format.DateTimeFormatter
 
 object UserMapper {
-    fun asUserCaseModel(userResponse: UserResponse) =
-        userResponse.run {
-            User(
-                userImage = userImage,
-                userId = userId,
-                userName = name,
-                userAge = age,
-                userSchoolName = userSchoolName,
-                tag = tag
-            )
+    fun UserDto.toUser(): User {
+        fun calculateAge(birthDay: String): Int {
+            // 날짜 포맷터 생성
+            val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+            try {
+                // 문자열을 LocalDate 객체로 변환
+                val birthDate = LocalDate.parse(birthDay, formatter)
+
+                // 현재 날짜 가져오기
+                val currentDate = LocalDate.now()
+
+                // Period를 사용하여 두 날짜 사이의 기간 계산
+                val period = Period.between(birthDate, currentDate)
+
+                // 만 나이 계산
+                return period.years
+            } catch (e: Exception) {
+                throw IllegalArgumentException("올바른 날짜 형식이 아닙니다. 'yyyy-MM-dd' 형식으로 입력해주세요.")
+            }
         }
+
+        return User(
+            userId = id,
+            userImage = profileImage?: "",
+            uniqueId = uniqueId,
+            userName = nickName,
+            userAge = calculateAge(birthDay).toString(),
+            userSchoolName = schoolName,
+            likeStatus = likeStatus
+        )
+    }
+
+    fun UserResponse.toUserUseCaseModel() = UserUseCaseModel(
+        users = users.map { it.toUser() },
+        totalPageCount = totalPage
+    )
 }

app/src/main/java/com/eighteen/eighteenandroid/data/repository/UserRepositoryImpl.kt

@@ -12,6 +12,8 @@ import com.eighteen.eighteenandroid.data.datasource.remote.request.SchoolRequest
 import com.eighteen.eighteenandroid.data.datasource.remote.request.SignUpRequest
 import com.eighteen.eighteenandroid.data.datasource.remote.service.UserService
 import com.eighteen.eighteenandroid.data.mapper.ApiException
+import com.eighteen.eighteenandroid.data.mapper.UserMapper.toUser
+import com.eighteen.eighteenandroid.data.mapper.UserMapper.toUserUseCaseModel
 import com.eighteen.eighteenandroid.data.mapper.mapper
 import com.eighteen.eighteenandroid.domain.model.AuthToken
 import com.eighteen.eighteenandroid.domain.model.Mbti
@@ -23,6 +25,7 @@ import com.eighteen.eighteenandroid.domain.model.School
 import com.eighteen.eighteenandroid.domain.model.SignUpInfo
 import com.eighteen.eighteenandroid.domain.model.SnsLink
 import com.eighteen.eighteenandroid.domain.model.User
+import com.eighteen.eighteenandroid.domain.model.UserUseCaseModel
 import com.eighteen.eighteenandroid.domain.repository.UserRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -32,40 +35,32 @@ class UserRepositoryImpl @Inject constructor(
     private val userService: UserService,
     private val preferenceDatastore: DataStore<Preferences>
 ) : UserRepository {
-    override suspend fun fetchUserData(): Result<List<User>> =
+    override suspend fun getAnotherUser(userType: String, category: String, page: Int): Result<UserUseCaseModel> =
         runCatching {
-//            userService.getUserInfo().mapper {
-//                it.map { userResponse ->
-//                    UserMapper.asUserCaseModel(userResponse)
-//                }
-//            }
-
-            listOf(
-                User(
-                    userImage = "https://image.blip.kr/v1/file/021ec61ff1c9936943383b84236a0e69",
-                    userId = "1",
-                    userName = "김 에스더",
-                    userAge = "16",
-                    userSchoolName = "서울 중학교",
-                    tag = "운동"
-                ),
-                User(
-                    userImage = "https://cdn.newsculture.press/news/photo/202308/529742_657577_5726.jpg",
-                    userId = "2",
-                    userName = "김 에스더",
-                    userAge = "16",
-                    userSchoolName = "부천 중학교",
-                    tag = "스터디"
-                ),
-                User(
-                    userImage = "https://mblogthumb-phinf.pstatic.net/MjAyMTEwMzFfMTY1/MDAxNjM1NjUzMTI2NjI3.xXYQteLLoWLKcR9YnXS0Hk_y-DInauMzF25g7FxlcScg.2Y-neBBMVoP2IhcwzX2Zy2HB2d8EnM_cY76FVLuk_1Yg.JPEG.ssun2415/IMG_4148.jpg?type=w800",
-                    userId = "3",
-                    userName = "김 에스더",
-                    userAge = "16",
-                    userSchoolName = "인천 중학교",
-                    tag = "프로젝트"
-                )
-            )
+            userService.getCategoryUser(userType, category, page).mapper {
+                it.data?.toUserUseCaseModel() ?: UserUseCaseModel(emptyList(), 0)
+            }
+        }
+
+    override suspend fun postLikeUser(likedId: Int): Result<String> =
+        runCatching {
+            userService.postLikeUser(likedId).mapper {
+                it.data ?: throw ApiException.Unknown
+            }
+        }
+
+    override suspend fun postLikeCancelUser(likedId: Int): Result<String> =
+        runCatching {
+            userService.postLikeCancelUser(likedId).mapper {
+                it.data ?: throw ApiException.Unknown
+            }
+        }
+
+    override suspend fun getPopularUser(userType: String, category: String): Result<List<User>> =
+        runCatching {
+            userService.getPopularUser(userType, category).mapper {
+                it.data?.map{ userDto -> userDto.toUser() } ?: throw ApiException.Unknown
+            }
         }
 
     override suspend fun fetchUserDetailInfo(id: String): Result<Profile> = runCatching {

app/src/main/java/com/eighteen/eighteenandroid/domain/di/UserUseCaseModule.kt

@@ -4,12 +4,14 @@ import com.eighteen.eighteenandroid.domain.repository.MyPageRepository
 import com.eighteen.eighteenandroid.domain.repository.UserRepository
 import com.eighteen.eighteenandroid.domain.usecase.CheckIdDuplicationUseCase
 import com.eighteen.eighteenandroid.domain.usecase.DeleteUserUseCase
+import com.eighteen.eighteenandroid.domain.usecase.GetAnotherUserUseCase
 import com.eighteen.eighteenandroid.domain.usecase.GetMyProfileUseCase
+import com.eighteen.eighteenandroid.domain.usecase.GetPopularUserUseCase
 import com.eighteen.eighteenandroid.domain.usecase.GetUserDetailInfoUseCase
 import com.eighteen.eighteenandroid.domain.usecase.LoginUseCase
 import com.eighteen.eighteenandroid.domain.usecase.SignOutUseCase
 import com.eighteen.eighteenandroid.domain.usecase.SignUpUseCase
-import com.eighteen.eighteenandroid.domain.usecase.UserUseCase
+import com.eighteen.eighteenandroid.domain.usecase.UserLikeUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -19,10 +21,6 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object UserUseCaseModule {
-    @Provides
-    @Singleton
-    fun provideUserUseCase(repository: UserRepository): UserUseCase =
-        UserUseCase(repository = repository)
 
     @Provides
     @Singleton
@@ -55,4 +53,16 @@ object UserUseCaseModule {
     @Singleton
     fun provideDeleteUserUseCase(repository: UserRepository) =
         DeleteUserUseCase(repository = repository)
+
+    @Provides
+    @Singleton
+    fun provideGetAnotherUserUseCase(repository: UserRepository) = GetAnotherUserUseCase(repository = repository)
+
+    @Provides
+    @Singleton
+    fun provideGetPopularUserUseCase(repository: UserRepository) = GetPopularUserUseCase(repository = repository)
+
+    @Provides
+    @Singleton
+    fun provideUserLikeUseCase(repository: UserRepository) = UserLikeUseCase(repository = repository)
 }

app/src/main/java/com/eighteen/eighteenandroid/domain/model/MainItem.kt

@@ -33,4 +33,7 @@ sealed class MainItem{
     data class UserView(
         val user: User
     ): MainItem()
+
+    // LoadingView
+    object LoadingView: MainItem()
 }

app/src/main/java/com/eighteen/eighteenandroid/domain/model/User.kt

@@ -1,10 +1,11 @@
 package com.eighteen.eighteenandroid.domain.model
 
 data class User(
+    val userId: Int,
     val userImage: String,
-    val userId: String,
+    val uniqueId: String,
     val userName: String,
     val userAge: String,
     val userSchoolName: String,
-    val tag: String
+    var likeStatus: Boolean
 )

app/src/main/java/com/eighteen/eighteenandroid/domain/model/UserUseCaseModel.kt

@@ -0,0 +1,6 @@
+package com.eighteen.eighteenandroid.domain.model
+
+data class UserUseCaseModel(
+    val users: List<User>,
+    val totalPageCount: Int
+)

app/src/main/java/com/eighteen/eighteenandroid/domain/repository/UserRepository.kt

@@ -4,10 +4,10 @@ import com.eighteen.eighteenandroid.domain.model.AuthToken
 import com.eighteen.eighteenandroid.domain.model.Profile
 import com.eighteen.eighteenandroid.domain.model.SignUpInfo
 import com.eighteen.eighteenandroid.domain.model.User
+import com.eighteen.eighteenandroid.domain.model.UserUseCaseModel
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
-    suspend fun fetchUserData(): Result<List<User>>
     suspend fun fetchUserDetailInfo(id: String): Result<Profile>
     suspend fun postSignUp(signUpInfo: SignUpInfo): Result<AuthToken>
     suspend fun checkIdDuplication(uniqueId: String): Result<Boolean>
@@ -17,4 +17,8 @@ interface UserRepository {
     suspend fun signOut(): Result<String?>
     suspend fun deleteUser(): Result<String?>
     suspend fun deleteAuthToken()
+    suspend fun getAnotherUser(userType: String, category: String, page: Int): Result<UserUseCaseModel>
+    suspend fun getPopularUser(userType: String, category: String): Result<List<User>>
+    suspend fun postLikeUser(likedId: Int): Result<String>
+    suspend fun postLikeCancelUser(likedId: Int): Result<String>
 }

app/src/main/java/com/eighteen/eighteenandroid/domain/usecase/GetAnotherUserUseCase.kt

@@ -0,0 +1,8 @@
+package com.eighteen.eighteenandroid.domain.usecase
+
+import com.eighteen.eighteenandroid.domain.repository.UserRepository
+import javax.inject.Inject
+
+class GetAnotherUserUseCase @Inject constructor(private val repository: UserRepository) {
+    suspend operator fun invoke(category: String, userType: String, page: Int) = repository.getAnotherUser(userType, category, page)
+}

app/src/main/java/com/eighteen/eighteenandroid/domain/usecase/GetPopularUserUseCase.kt

@@ -0,0 +1,8 @@
+package com.eighteen.eighteenandroid.domain.usecase
+
+import com.eighteen.eighteenandroid.domain.repository.UserRepository
+import javax.inject.Inject
+
+class GetPopularUserUseCase @Inject constructor(private val repository: UserRepository) {
+    suspend operator fun invoke(category: String, userType: String) = repository.getPopularUser(userType, category)
+}

app/src/main/java/com/eighteen/eighteenandroid/domain/usecase/UserLikeUseCase.kt

@@ -0,0 +1,13 @@
+package com.eighteen.eighteenandroid.domain.usecase
+
+import com.eighteen.eighteenandroid.domain.repository.UserRepository
+import javax.inject.Inject
+
+class UserLikeUseCase @Inject constructor(private val repository: UserRepository) {
+    suspend operator fun invoke(isLike: Boolean, likedId: Int) =
+        if(isLike) {
+            repository.postLikeUser(likedId)
+        } else {
+            repository.postLikeCancelUser(likedId)
+        }
+}