From 20806cf4e64e90511c9956af2e1667eda722e913 Mon Sep 17 00:00:00 2001 From: MunJangHun <105299421+moondev03@users.noreply.github.com> Date: Tue, 6 Aug 2024 21:42:24 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8A=20=EA=B0=90=EC=A0=95=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=20=ED=8E=98=EC=9D=B4=EC=A7=80=20|=20Response=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/model/emotion/DiaryStatisticsResponseDTO.kt | 3 ++- .../com/nabi/data/repository/EmotionRepositoryImpl.kt | 2 +- .../main/java/com/nabi/data/service/EmotionService.kt | 9 ++------- .../com/nabi/domain/model/emotion/EmotionStatistics.kt | 3 ++- .../views/diary/statistics/DiaryStatisticsFragment.kt | 10 +++++----- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Nabi/data/src/main/java/com/nabi/data/model/emotion/DiaryStatisticsResponseDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/emotion/DiaryStatisticsResponseDTO.kt index 953f642..3cc665b 100644 --- a/Nabi/data/src/main/java/com/nabi/data/model/emotion/DiaryStatisticsResponseDTO.kt +++ b/Nabi/data/src/main/java/com/nabi/data/model/emotion/DiaryStatisticsResponseDTO.kt @@ -6,5 +6,6 @@ data class DiaryStatisticsResponseDTO( @SerializedName("angerCount") val angerCount: Int, @SerializedName("anxietyCount") val anxietyCount: Int, @SerializedName("depressionCount") val depressionCount: Int, - @SerializedName("Happiness") val happiness: Int + @SerializedName("happinessCount") val happinessCount: Int, + @SerializedName("boringCount") val boringCount: Int ) \ No newline at end of file diff --git a/Nabi/data/src/main/java/com/nabi/data/repository/EmotionRepositoryImpl.kt b/Nabi/data/src/main/java/com/nabi/data/repository/EmotionRepositoryImpl.kt index f798ea6..6c684b9 100644 --- a/Nabi/data/src/main/java/com/nabi/data/repository/EmotionRepositoryImpl.kt +++ b/Nabi/data/src/main/java/com/nabi/data/repository/EmotionRepositoryImpl.kt @@ -27,7 +27,7 @@ class EmotionRepositoryImpl @Inject constructor( if(res != null){ val data = res.data if(data != null){ - val signInInfo = data.run { EmotionStatistics(angerCount, anxietyCount, depressionCount, happiness) } + val signInInfo = data.run { EmotionStatistics(angerCount, anxietyCount, depressionCount, happinessCount, boringCount) } Result.success(signInInfo) } else { Result.failure(Exception("Get Emotion Statistics Failed: data is null")) diff --git a/Nabi/data/src/main/java/com/nabi/data/service/EmotionService.kt b/Nabi/data/src/main/java/com/nabi/data/service/EmotionService.kt index ca4bbbe..bd72c4b 100644 --- a/Nabi/data/src/main/java/com/nabi/data/service/EmotionService.kt +++ b/Nabi/data/src/main/java/com/nabi/data/service/EmotionService.kt @@ -1,20 +1,15 @@ package com.nabi.data.service import com.nabi.data.model.BaseResponse -import com.nabi.data.model.auth.NicknameResponseDTO -import com.nabi.data.model.auth.SignInRequestDTO -import com.nabi.data.model.auth.SignInResponseDTO import com.nabi.data.model.emotion.DiaryStatisticsResponseDTO import retrofit2.Response -import retrofit2.http.Body +import retrofit2.http.GET import retrofit2.http.Header -import retrofit2.http.POST import retrofit2.http.Path -import retrofit2.http.Query interface EmotionService { - @POST("/emotion/{startDate}/{endDate}") + @GET("/emotion/{startDate}/{endDate}") suspend fun getDiaryStatistics( @Header("Authorization") accessToken: String, @Path("startDate") startDate: String, diff --git a/Nabi/domain/src/main/java/com/nabi/domain/model/emotion/EmotionStatistics.kt b/Nabi/domain/src/main/java/com/nabi/domain/model/emotion/EmotionStatistics.kt index 5601804..3183b57 100644 --- a/Nabi/domain/src/main/java/com/nabi/domain/model/emotion/EmotionStatistics.kt +++ b/Nabi/domain/src/main/java/com/nabi/domain/model/emotion/EmotionStatistics.kt @@ -4,5 +4,6 @@ data class EmotionStatistics( val angerCount: Int, val anxietyCount: Int, val depressionCount: Int, - val happiness: Int + val happinessCount: Int, + val boringCount: Int ) diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt index 7571336..70af218 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt @@ -1,12 +1,12 @@ package com.nabi.nabi.views.diary.statistics import android.app.DatePickerDialog -import android.widget.TextView import androidx.fragment.app.viewModels import com.nabi.domain.model.emotion.EmotionStatistics import com.nabi.nabi.R import com.nabi.nabi.base.BaseFragment import com.nabi.nabi.databinding.FragmentStatisticsDiaryBinding +import com.nabi.nabi.utils.LoggerUtils import com.nabi.nabi.utils.UiState import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat @@ -110,12 +110,12 @@ class DiaryStatisticsFragment: BaseFragment(R.la private fun setupChart(p: EmotionStatistics) { binding.barChart.setValues( - p.run { intArrayOf(angerCount, happiness, 0, depressionCount, anxietyCount) } + p.run { intArrayOf(angerCount, happinessCount, boringCount, depressionCount, anxietyCount) } ) binding.tvEmotionAngerValue.text = p.angerCount.toString() - binding.tvEmotionHappinessValue.text = p.happiness.toString() - binding.tvEmotionBoredomValue.text = "0" + binding.tvEmotionHappinessValue.text = p.happinessCount.toString() + binding.tvEmotionBoredomValue.text = p.boringCount.toString() binding.tvEmotionSadnessValue.text = p.depressionCount.toString() binding.tvEmotionAnxietyValue.text = p.anxietyCount.toString() } @@ -128,7 +128,7 @@ class DiaryStatisticsFragment: BaseFragment(R.la is UiState.Loading -> {} is UiState.Failure -> { showToast("감정 통계 로드 실패") - setupChart(EmotionStatistics(3, 6, 0, 4)) + setupChart(EmotionStatistics(0, 0, 0, 0, 0)) } is UiState.Success -> { setupChart(it.data)