[Feat] 선호 운동 개발

app/src/main/java/com/project200/undabang/main/MainActivity.kt

@@ -138,6 +138,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationController {
                 com.project200.undabang.feature.profile.R.id.urlFormFragment,
                 com.project200.undabang.feature.profile.R.id.notificationFragment,
                 com.project200.undabang.feature.profile.R.id.blockMembersFragment,
+                com.project200.undabang.feature.profile.R.id.preferredExerciseFragment,
                 com.project200.undabang.feature.matching.R.id.matchingProfileFragment,
                 com.project200.undabang.feature.matching.R.id.exercisePlaceFragment,
                 com.project200.undabang.feature.matching.R.id.exercisePlaceSearchFragment,

common/src/main/java/com/project200/common/constants/DayOfWeek.kt

@@ -0,0 +1,22 @@
+package com.project200.common.constants
+
+import androidx.annotation.StringRes
+import com.project200.undabang.common.R
+
+enum class DayOfWeek(
+    val index: Int,
+    @StringRes val resId: Int,
+) {
+    MON(0, R.string.day_mon),
+    TUE(1, R.string.day_tue),
+    WED(2, R.string.day_wed),
+    THU(3, R.string.day_thu),
+    FRI(4, R.string.day_fri),
+    SAT(5, R.string.day_sat),
+    SUN(6, R.string.day_sun),
+    ;
+
+    companion object {
+        fun getByIndex(index: Int): DayOfWeek? = entries.find { it.index == index }
+    }
+}

common/src/main/java/com/project200/common/utils/PreferredExerciseDayFormatter.kt

@@ -0,0 +1,65 @@
+package com.project200.common.utils
+
+import android.content.Context
+import com.project200.common.constants.DayOfWeek
+import com.project200.undabang.common.R
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class PreferredExerciseDayFormatter
+    @Inject
+    constructor(
+        @ApplicationContext private val context: Context,
+    ) {
+        /**
+         * 월요일부터 일요일까지의 선택 여부를 담은 Boolean 리스트를
+         * 지정된 규칙에 따라 문자열로 포맷합니다.
+         * @param days 크기가 7인 Boolean 리스트 [월, 화, 수, 목, 금, 토, 일] 순서
+         * @return 포맷팅된 요일 문자열
+         */
+        fun formatDaysOfWeek(days: List<Boolean>): String {
+            if (days.size != 7) return ""
+
+            // 모든 요일이 포함될 경우 "매일"로 표기
+            if (days.all { it }) return context.getString(R.string.day_everyday)
+
+            val resultParts = mutableListOf<String>()
+            val weekdays = days.subList(0, 5) // 월요일부터 금요일까지
+            val weekend = days.subList(5, 7) // 토요일, 일요일
+
+            // 평일이 모두 포함될 경우 "평일"로 표기
+            if (weekdays.all { it }) {
+                resultParts.add(context.getString(R.string.day_weekdays))
+            } else {
+                // 각각 해당하는 평일 날짜를 추가
+                weekdays.forEachIndexed { index, isSelected ->
+                    if (isSelected) {
+                        addDayName(index, resultParts)
+                    }
+                }
+            }
+
+            // 주말이 모두 포함될 경우 "주말"로 표기
+            if (weekend.all { it }) {
+                resultParts.add(context.getString(R.string.day_weekend))
+            } else {
+                // 각각 해당하는 주말 날짜를 추가
+                weekend.forEachIndexed { index, isSelected ->
+                    if (isSelected) {
+                        addDayName(index + 5, resultParts)
+                    }
+                }
+            }
+
+            return resultParts.joinToString(", ")
+        }
+
+        private fun addDayName(
+            index: Int,
+            resultList: MutableList<String>,
+        ) {
+            DayOfWeek.getByIndex(index)?.let { day ->
+                resultList.add(context.getString(day.resId))
+            }
+        }
+    }

common/src/main/res/values/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 요일 -->
+    <string name="day_mon">월</string>
+    <string name="day_tue">화</string>
+    <string name="day_wed">수</string>
+    <string name="day_thu">목</string>
+    <string name="day_fri">금</string>
+    <string name="day_sat">토</string>
+    <string name="day_sun">일</string>
+
+    <!-- 그룹 표기 -->
+    <string name="day_everyday">매일</string>
+    <string name="day_weekdays">평일</string>
+    <string name="day_weekend">주말</string>
+</resources>

data/src/main/java/com/project200/data/api/ApiService.kt

@@ -2,6 +2,7 @@ package com.project200.data.api
 
 import com.project200.data.dto.BaseResponse
 import com.project200.data.dto.CustomTimerIdDTO
+import com.project200.data.dto.DeletePreferredExerciseDTO
 import com.project200.data.dto.EditExercisePlaceDTO
 import com.project200.data.dto.ExerciseIdDto
 import com.project200.data.dto.ExpectedScoreInfoDTO
@@ -20,6 +21,8 @@ import com.project200.data.dto.GetMatchingMembersDto
 import com.project200.data.dto.GetMatchingProfileDTO
 import com.project200.data.dto.GetNewChattingMessagesDTO
 import com.project200.data.dto.GetOpenChatUrlDTO
+import com.project200.data.dto.GetPreferredExerciseDTO
+import com.project200.data.dto.GetPreferredExerciseTypeDTO
 import com.project200.data.dto.GetProfileDTO
 import com.project200.data.dto.GetProfileImageResponseDto
 import com.project200.data.dto.GetScoreDTO
@@ -37,6 +40,7 @@ import com.project200.data.dto.PostExerciseRequestDto
 import com.project200.data.dto.PostExerciseResponseDTO
 import com.project200.data.dto.PostLoginRequest
 import com.project200.data.dto.PostMessageResponse
+import com.project200.data.dto.PostPreferredExerciseDTO
 import com.project200.data.dto.PostSignUpData
 import com.project200.data.dto.PostSignUpRequest
 import com.project200.data.dto.PutProfileRequest
@@ -49,6 +53,7 @@ import okhttp3.MultipartBody
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.HTTP
 import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.PATCH
@@ -170,6 +175,38 @@ interface ApiService {
     @AccessTokenApi
     suspend fun getBlockedMembers(): BaseResponse<List<GetBlockedMemberDTO>>
 
+    /** 선호 운동 */
+    // 선호 운동 조회
+    @GET("api/v1/preferred-exercises")
+    @AccessTokenApi
+    suspend fun getPreferredExercises(): BaseResponse<List<GetPreferredExerciseDTO>>
+
+    // 선호 운동 종류 조회
+    @GET("api/v1/exercise-types")
+    @AccessTokenApi
+    suspend fun getPreferredExerciseTypes(): BaseResponse<List<GetPreferredExerciseTypeDTO>>
+
+    // 선호 운동 생성
+    @POST("api/v1/preferred-exercises")
+    @AccessTokenApi
+    suspend fun postPreferredExercises(
+        @Body preferredExercises: List<PostPreferredExerciseDTO>,
+    ): BaseResponse<Unit?>
+
+    // 선호 운동 삭제
+    @HTTP(method = "DELETE", path = "api/v1/preferred-exercises", hasBody = true)
+    @AccessTokenApi
+    suspend fun deletePreferredExercises(
+        @Body preferredExerciseIds: DeletePreferredExerciseDTO,
+    ): BaseResponse<Unit?>
+
+    // 선호 운동 수정
+    @PATCH("api/v1/preferred-exercises")
+    @AccessTokenApi
+    suspend fun patchPreferredExercises(
+        @Body preferredExercises: List<PostPreferredExerciseDTO>,
+    ): BaseResponse<Unit?>
+
     /** 운동 기록 */
     // 구간별 운동 기록 횟수 조회
     @GET("api/v1/exercises/count")

data/src/main/java/com/project200/data/dto/MatchingDTO.kt

@@ -31,7 +31,7 @@ data class GetMatchingProfileDTO(
     val yearlyExerciseDays: Int,
     val exerciseCountInLast30Days: Int,
     val exerciseScore: Int,
-    val preferredExercises: List<PreferredExerciseDTO>,
+    val preferredExercises: List<GetProfilePreferredExerciseDTO>,
 )
 
 @JsonClass(generateAdapter = true)

data/src/main/java/com/project200/data/dto/MemberDTO.kt

@@ -21,16 +21,45 @@ data class GetProfileDTO(
     val yearlyExerciseDays: Int,
     val exerciseCountInLast30Days: Int,
     val exerciseScore: Int,
-    val preferredExercises: List<PreferredExerciseDTO>,
+    val preferredExercises: List<GetProfilePreferredExerciseDTO>,
 )
 
 @JsonClass(generateAdapter = true)
-data class PreferredExerciseDTO(
-    val preferredExerciseId: Int,
+data class GetProfilePreferredExerciseDTO(
+    val preferredExerciseId: Long,
     val name: String,
     val skillLevel: String,
     val daysOfWeek: List<Boolean>,
-    val imageUrl: String,
+    val imageUrl: String?,
+)
+
+@JsonClass(generateAdapter = true)
+data class GetPreferredExerciseDTO(
+    val preferredExerciseId: Long,
+    val exerciseTypeId: Long,
+    val exerciseName: String,
+    val skillLevel: String,
+    val daysOfWeek: List<Boolean>,
+    val imageUrl: String?,
+)
+
+@JsonClass(generateAdapter = true)
+data class GetPreferredExerciseTypeDTO(
+    val exerciseId: Long,
+    val exerciseName: String,
+    val imageUrl: String?,
+)
+
+@JsonClass(generateAdapter = true)
+data class PostPreferredExerciseDTO(
+    val exerciseTypeId: Long,
+    val skillLevel: String,
+    val daysOfWeek: List<Boolean>,
+)
+
+@JsonClass(generateAdapter = true)
+data class DeletePreferredExerciseDTO(
+    val preferredExerciseIds: List<Long>,
 )
 
 @JsonClass(generateAdapter = true)

data/src/main/java/com/project200/data/impl/MemberRepositoryImpl.kt

@@ -4,18 +4,24 @@ import android.content.Context
 import androidx.core.net.toUri
 import com.project200.common.di.IoDispatcher
 import com.project200.data.api.ApiService
+import com.project200.data.dto.DeletePreferredExerciseDTO
 import com.project200.data.dto.GetBlockedMemberDTO
 import com.project200.data.dto.GetOpenChatUrlDTO
+import com.project200.data.dto.GetPreferredExerciseDTO
+import com.project200.data.dto.GetPreferredExerciseTypeDTO
 import com.project200.data.dto.GetProfileDTO
 import com.project200.data.dto.GetProfileImageResponseDto
 import com.project200.data.dto.GetScoreDTO
 import com.project200.data.dto.PutProfileRequest
 import com.project200.data.mapper.toModel
 import com.project200.data.mapper.toMultipartBodyPart
+import com.project200.data.mapper.toPostDto
 import com.project200.data.utils.apiCallBuilder
 import com.project200.domain.model.BaseResult
 import com.project200.domain.model.BlockedMember
+import com.project200.domain.model.ExerciseType
 import com.project200.domain.model.OpenUrl
+import com.project200.domain.model.PreferredExercise
 import com.project200.domain.model.ProfileImageList
 import com.project200.domain.model.Score
 import com.project200.domain.model.UserProfile
@@ -158,6 +164,50 @@ class MemberRepositoryImpl
             )
         }
 
+        override suspend fun getPreferredExercises(): BaseResult<List<PreferredExercise>> {
+            return apiCallBuilder(
+                ioDispatcher = ioDispatcher,
+                apiCall = { apiService.getPreferredExercises() },
+                mapper = { dtoList: List<GetPreferredExerciseDTO>? ->
+                    dtoList?.map { it.toModel() } ?: throw NoSuchElementException()
+                },
+            )
+        }
+
+        override suspend fun getPreferredExerciseTypes(): BaseResult<List<ExerciseType>> {
+            return apiCallBuilder(
+                ioDispatcher = ioDispatcher,
+                apiCall = { apiService.getPreferredExerciseTypes() },
+                mapper = { dtoList: List<GetPreferredExerciseTypeDTO>? ->
+                    dtoList?.map { it.toModel() } ?: throw NoSuchElementException()
+                },
+            )
+        }
+
+        override suspend fun createPreferredExercise(preferredExercises: List<PreferredExercise>): BaseResult<Unit> {
+            return apiCallBuilder(
+                ioDispatcher = ioDispatcher,
+                apiCall = { apiService.postPreferredExercises(preferredExercises.map { it.toPostDto() }) },
+                mapper = { Unit },
+            )
+        }
+
+        override suspend fun editPreferredExercise(preferredExercises: List<PreferredExercise>): BaseResult<Unit> {
+            return apiCallBuilder(
+                ioDispatcher = ioDispatcher,
+                apiCall = { apiService.patchPreferredExercises(preferredExercises.map { it.toPostDto() }) },
+                mapper = { Unit },
+            )
+        }
+
+        override suspend fun deletePreferredExercise(preferredExerciseIds: List<Long>): BaseResult<Unit> {
+            return apiCallBuilder(
+                ioDispatcher = ioDispatcher,
+                apiCall = { apiService.deletePreferredExercises(DeletePreferredExerciseDTO(preferredExerciseIds)) },
+                mapper = { Unit },
+            )
+        }
+
         companion object {
             const val IMAGE_PART_ERROR = "IMAGE_PART_ERROR"
         }

data/src/main/java/com/project200/data/mapper/MatchingMapper.kt

@@ -9,7 +9,6 @@ import com.project200.domain.model.ExercisePlace
 import com.project200.domain.model.Location
 import com.project200.domain.model.MatchingMember
 import com.project200.domain.model.MatchingMemberProfile
-import com.project200.domain.model.PreferredExercise
 
 fun GetMatchingMembersDto.toModel(): MatchingMember {
     return MatchingMember(
@@ -43,15 +42,7 @@ fun GetMatchingProfileDTO.toModel(): MatchingMemberProfile {
         exerciseCountInLast30Days = this.exerciseCountInLast30Days,
         exerciseScore = this.exerciseScore,
         preferredExercises =
-            this.preferredExercises.map {
-                PreferredExercise(
-                    preferredExerciseId = it.preferredExerciseId,
-                    name = it.name,
-                    skillLevel = it.skillLevel,
-                    daysOfWeek = it.daysOfWeek,
-                    imageUrl = it.imageUrl,
-                )
-            },
+            this.preferredExercises.map { it.toModel() },
     )
 }