[BSVR-128/FEAT] 홈, 시야기록 서버 통신 구현

app/src/main/java/com/depromeet/spot/di/DataSourceModule.kt

@@ -1,11 +1,13 @@
 package com.depromeet.spot.di
 
 import com.depromeet.data.datasource.ExampleDataSource
+import com.depromeet.data.datasource.HomeDataSource
 import com.depromeet.data.datasource.SeatReviewDataSource
 import com.depromeet.data.datasource.SignupRemoteDataSource
 import com.depromeet.data.datasource.ViewfinderDataSource
 import com.depromeet.data.datasource.WebSvgDataSource
 import com.depromeet.data.datasource.remote.ExampleDataSourcelmpl
+import com.depromeet.data.datasource.remote.HomeDataSourceImpl
 import com.depromeet.data.datasource.remote.SeatReviewDataSourceImpl
 import com.depromeet.data.datasource.remote.SignupRemoteDataSourceImpl
 import com.depromeet.data.datasource.remote.WebSvgDataSourceImpl
@@ -32,6 +34,12 @@ abstract class DataSourceModule {
         webSvgDataSourceImpl: WebSvgDataSourceImpl,
     ): WebSvgDataSource
 
+    @Binds
+    @Singleton
+    abstract fun bindHomeDataSource(
+        homeDataSourceImpl: HomeDataSourceImpl,
+    ): HomeDataSource
+
     @Binds
     @Singleton
     abstract fun seatReviewDataSource(

app/src/main/java/com/depromeet/spot/di/RepositoryModule.kt

@@ -1,11 +1,13 @@
 package com.depromeet.spot.di
 
 import com.depromeet.data.repository.ExampleRepositoryImpl
+import com.depromeet.data.repository.HomeRepositoryImpl
 import com.depromeet.data.repository.SeatReviewRepositoryImpl
 import com.depromeet.data.repository.SignupRepositoryImpl
 import com.depromeet.data.repository.ViewfinderRepositoryImpl
 import com.depromeet.data.repository.WebSvgRepositoryImpl
 import com.depromeet.domain.repository.ExampleRepository
+import com.depromeet.domain.repository.HomeRepository
 import com.depromeet.domain.repository.SeatReviewRepository
 import com.depromeet.domain.repository.SignupRepository
 import com.depromeet.domain.repository.ViewfinderRepository
@@ -32,6 +34,12 @@ abstract class RepositoryModule {
         webSvgRepositoryImpl: WebSvgRepositoryImpl,
     ): WebSvgRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindHomeRepository(
+        homeRepositoryImpl: HomeRepositoryImpl,
+    ): HomeRepository
+
     @Binds
     @Singleton
     abstract fun seatReviewRepository(

app/src/main/java/com/depromeet/spot/di/ServiceModule.kt

@@ -1,6 +1,7 @@
 package com.depromeet.spot.di
 
 import com.depromeet.data.remote.ExampleService
+import com.depromeet.data.remote.HomeApiService
 import com.depromeet.data.remote.SeatReviewService
 import com.depromeet.data.remote.SignupService
 import com.depromeet.data.remote.ViewfinderService
@@ -31,6 +32,11 @@ object ServiceModule {
     fun provideWebSvgService(@WebSvg retrofit: Retrofit): WebSvgApiService =
         retrofit.create(WebSvgApiService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideHomeService(retrofit: Retrofit): HomeApiService =
+        retrofit.create(HomeApiService::class.java)
+
     @Provides
     @Singleton
     fun provideSeatReviewService(retrofit: Retrofit): SeatReviewService =

data/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -14,6 +16,7 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
+        buildConfigField("String", "S3_URL", getApiKey("s3.base.url"))
     }
 
     buildTypes {
@@ -37,6 +40,10 @@ android {
     }
 }
 
+fun getApiKey(propertyKey: String): String {
+    return gradleLocalProperties(rootDir).getProperty(propertyKey)
+}
+
 dependencies {
     implementation(project(":domain"))
     KotlinDependencies.run {

data/src/main/java/com/depromeet/data/datasource/HomeDataSource.kt

@@ -0,0 +1,47 @@
+package com.depromeet.data.datasource
+
+import com.depromeet.data.model.request.home.RequestMySeatRecordDto
+import com.depromeet.data.model.request.home.RequestProfileEditDto
+import com.depromeet.data.model.response.home.ResponseBaseballTeamDto
+import com.depromeet.data.model.response.home.ResponseDeleteReviewDto
+import com.depromeet.data.model.response.home.ResponseMySeatRecordDto
+import com.depromeet.data.model.response.home.ResponsePresignedUrlDto
+import com.depromeet.data.model.response.home.ResponseProfileDto
+import com.depromeet.data.model.response.home.ResponseProfileEditDto
+import com.depromeet.data.model.response.home.ResponseRecentReviewDto
+import com.depromeet.data.model.response.home.ResponseReviewDateDto
+
+interface HomeDataSource {
+    suspend fun getMySeatRecordData(
+        requestMySeatRecordDto: RequestMySeatRecordDto,
+    ): ResponseMySeatRecordDto
+
+    suspend fun getBaseballTeamData(): List<ResponseBaseballTeamDto>
+
+    suspend fun postProfileImagePresigned(
+        fileExtension: String,
+    ): ResponsePresignedUrlDto
+
+    suspend fun putProfileImage(
+        presignedUrl: String,
+        image: ByteArray,
+    )
+
+    suspend fun putProfileEdit(
+        requestProfileEditDto: RequestProfileEditDto,
+    ): ResponseProfileEditDto
+
+    suspend fun getDuplicateNickname(
+        nickname: String,
+    )
+
+    suspend fun getReviewDate(): ResponseReviewDateDto
+
+    suspend fun getProfile(): ResponseProfileDto
+
+    suspend fun getRecentReview(): ResponseRecentReviewDto
+
+    suspend fun deleteReview(
+        reviewId : Int
+    ): ResponseDeleteReviewDto
+}

data/src/main/java/com/depromeet/data/datasource/remote/HomeDataSourceImpl.kt

@@ -0,0 +1,77 @@
+package com.depromeet.data.datasource.remote
+
+import com.depromeet.data.datasource.HomeDataSource
+import com.depromeet.data.model.request.home.RequestFileExtensionDto
+import com.depromeet.data.model.request.home.RequestMySeatRecordDto
+import com.depromeet.data.model.request.home.RequestProfileEditDto
+import com.depromeet.data.model.response.home.ResponseBaseballTeamDto
+import com.depromeet.data.model.response.home.ResponseDeleteReviewDto
+import com.depromeet.data.model.response.home.ResponseMySeatRecordDto
+import com.depromeet.data.model.response.home.ResponsePresignedUrlDto
+import com.depromeet.data.model.response.home.ResponseProfileDto
+import com.depromeet.data.model.response.home.ResponseProfileEditDto
+import com.depromeet.data.model.response.home.ResponseRecentReviewDto
+import com.depromeet.data.model.response.home.ResponseReviewDateDto
+import com.depromeet.data.remote.HomeApiService
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
+import javax.inject.Inject
+
+class HomeDataSourceImpl @Inject constructor(
+    private val homeApiService: HomeApiService,
+) : HomeDataSource {
+    override suspend fun getMySeatRecordData(requestMySeatRecordDto: RequestMySeatRecordDto): ResponseMySeatRecordDto {
+        return homeApiService.getMySeatRecord(
+            page = requestMySeatRecordDto.page,
+            size = requestMySeatRecordDto.size,
+            year = requestMySeatRecordDto.year,
+            month = requestMySeatRecordDto.month
+        )
+    }
+
+
+    override suspend fun getBaseballTeamData(): List<ResponseBaseballTeamDto> {
+        return homeApiService.getBaseballTeam()
+    }
+
+    override suspend fun postProfileImagePresigned(
+        fileExtension: String,
+    ): ResponsePresignedUrlDto {
+        return homeApiService.postProfileImagePresigned(
+            RequestFileExtensionDto(fileExtension),
+        )
+    }
+
+    override suspend fun putProfileImage(presignedUrl: String, image: ByteArray) {
+        val mediaType = "image/*".toMediaTypeOrNull()
+        return homeApiService.putProfileImage(presignedUrl, image.toRequestBody(mediaType))
+    }
+
+    override suspend fun putProfileEdit(
+        requestProfileEditDto: RequestProfileEditDto,
+    ): ResponseProfileEditDto {
+        return homeApiService.putProfileEdit(requestProfileEditDto)
+    }
+
+    override suspend fun getDuplicateNickname(nickname: String) {
+        return homeApiService.getDuplicateNickname(nickname)
+    }
+
+    override suspend fun getReviewDate(): ResponseReviewDateDto {
+        return homeApiService.getReviewDate()
+    }
+
+    override suspend fun getProfile(): ResponseProfileDto {
+        return homeApiService.getProfileInfo()
+    }
+
+    override suspend fun getRecentReview(): ResponseRecentReviewDto {
+        return homeApiService.getRecentReview()
+    }
+
+    override suspend fun deleteReview(
+        reviewId: Int,
+    ): ResponseDeleteReviewDto {
+        return homeApiService.deleteReview(reviewId)
+    }
+}

data/src/main/java/com/depromeet/data/intercepter/AuthInterceptor.kt

@@ -1,8 +1,8 @@
 package com.depromeet.data.intercepter
 
+import com.depromeet.data.BuildConfig.S3_URL
 import com.depromeet.domain.preference.SharedPreference
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -17,7 +17,10 @@ class AuthInterceptor @Inject constructor(
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
-        if (!shouldRequestAuthenticatedHeaders(originalRequest.url.encodedPath)) {
+        if (!shouldRequestAuthenticatedHeaders(originalRequest.url.encodedPath) || urlIsS3(
+                originalRequest.url.toString()
+            )
+        ) {
             return chain.proceed(originalRequest)
         }
 
@@ -36,13 +39,22 @@ class AuthInterceptor @Inject constructor(
         return response
     }
 
+    private fun urlIsS3(url: String): Boolean {
+        return url.contains(S3_URL)
+    }
+
+
     private fun shouldRequestAuthenticatedHeaders(encodedPath: String) = when (encodedPath) {
-        "/api/v1/members" -> false
+        "/api/v1/members" -> true // TODO : 프로필 수정과 URL이 겹쳐서 수정했습니다.
         "/api/v1/members/{accessToken}" -> false //TODO 추 후 변경 필요
         else -> true
     }
 
-    private fun proceedWithAuthorizationHeader(chain: Interceptor.Chain, request: Request, token: String): Response {
+    private fun proceedWithAuthorizationHeader(
+        chain: Interceptor.Chain,
+        request: Request,
+        token: String,
+    ): Response {
         val newRequest = request.newBuilder()
             .addHeader("Authorization", token)
             .build()

data/src/main/java/com/depromeet/data/mapper/HomeMapper.kt

@@ -0,0 +1,19 @@
+package com.depromeet.data.mapper
+
+import com.depromeet.data.model.response.home.ResponseBaseballTeamDto
+import com.depromeet.data.model.response.home.ResponsePresignedUrlDto
+import com.depromeet.domain.entity.response.home.BaseballTeamResponse
+import com.depromeet.domain.entity.response.home.PresignedUrlResponse
+
+
+/** baseball team **/
+fun ResponseBaseballTeamDto.toBaseballTeamResponse() = BaseballTeamResponse(
+    id = id,
+    name = name,
+    logo = logo
+)
+
+/** PresignedUrl Mapper **/
+fun ResponsePresignedUrlDto.toPresignedUrlResponse() = PresignedUrlResponse(
+    presignedUrl = presignedUrl
+)

data/src/main/java/com/depromeet/data/model/request/home/RequestFileExtensionDto.kt

@@ -0,0 +1,10 @@
+package com.depromeet.data.model.request.home
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestFileExtensionDto(
+    @SerialName("fileExtension")
+    val fileExtension: String,
+)

data/src/main/java/com/depromeet/data/model/request/home/RequestMySeatRecordDto.kt

@@ -0,0 +1,27 @@
+package com.depromeet.data.model.request.home
+
+import com.depromeet.domain.entity.request.home.MySeatRecordRequest
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestMySeatRecordDto(
+    @SerialName("page")
+    val page: Int? = null,
+    @SerialName("size")
+    val size: Int? = null,
+    @SerialName("year")
+    val year: Int? = null,
+    @SerialName("month")
+    val month: Int? = null,
+) {
+    companion object {
+        fun MySeatRecordRequest.toMySeatRecordRequestDto() = RequestMySeatRecordDto(
+            page = page,
+            size = size,
+            year = year,
+            month = month
+        )
+    }
+}
+

data/src/main/java/com/depromeet/data/model/request/home/RequestProfileEditDto.kt

@@ -0,0 +1,23 @@
+package com.depromeet.data.model.request.home
+
+import com.depromeet.domain.entity.request.home.ProfileEditRequest
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestProfileEditDto(
+    @SerialName("profileImage")
+    val profileImage: String? = null,
+    @SerialName("nickname")
+    val nickname: String? = null,
+    @SerialName("teamId")
+    val teamId: Int? = null,
+) {
+    companion object {
+        fun ProfileEditRequest.toProfileEditRequestDto() = RequestProfileEditDto(
+            profileImage = url.ifEmpty { null },
+            nickname = nickname.ifEmpty { null },
+            teamId = teamId.takeIf { it !=0 }
+        )
+    }
+}

data/src/main/java/com/depromeet/data/model/response/home/ResponseBaseballTeamDto.kt

@@ -0,0 +1,14 @@
+package com.depromeet.data.model.response.home
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseBaseballTeamDto(
+    @SerialName("id")
+    val id : Int,
+    @SerialName("name")
+    val name : String,
+    @SerialName("logo")
+    val logo : String
+)

data/src/main/java/com/depromeet/data/model/response/home/ResponseDeleteReviewDto.kt

@@ -0,0 +1,17 @@
+package com.depromeet.data.model.response.home
+
+import com.depromeet.domain.entity.response.home.DeleteReviewResponse
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseDeleteReviewDto(
+    @SerialName("deletedReviewId")
+    val deleteReviewId: Int,
+) {
+    companion object {
+        fun ResponseDeleteReviewDto.toDeleteReviewResponse() = DeleteReviewResponse(
+            reviewId = deleteReviewId
+        )
+    }
+}