Merge branch 'develop'

src/main/kotlin/com/info/maeumgagym/application/domain/pose/entity/PoseJpaEntity.kt

@@ -10,6 +10,7 @@ import javax.persistence.Entity
 @Entity(name = TableNames.POSE_TABLE)
 class PoseJpaEntity(
     needMachine: Boolean,
+    category: MutableSet<String>,
     simpleName: String,
     exactName: String,
     thumbnail: String,
@@ -27,6 +28,11 @@ class PoseJpaEntity(
     var needMachine: Boolean = needMachine // 기구 운동인지 여부
         protected set
 
+    @Convert(converter = StringAttributeConverter::class)
+    @Column(name = "category", updatable = true, nullable = false)
+    var category: MutableSet<String> = category
+        protected set
+
     @Column(name = "simple_name", length = 30, updatable = true, nullable = false)
     var simpleName: String = simpleName // 간단한 이름
         protected set

src/main/kotlin/com/info/maeumgagym/application/domain/pose/mapper/PoseMapper.kt

@@ -9,6 +9,7 @@ class PoseMapper {
     fun toEntity(pose: Pose): PoseJpaEntity = pose.run {
         PoseJpaEntity(
             needMachine,
+            category,
             simpleName,
             exactName,
             thumbnail,
@@ -26,6 +27,7 @@ class PoseMapper {
     fun toDomain(poseJpaEntity: PoseJpaEntity): Pose = poseJpaEntity.run {
         Pose(
             needMachine,
+            category,
             simpleName,
             exactName,
             thumbnail,

src/main/kotlin/com/info/maeumgagym/core/pose/dto/request/CreatePoseRequest.kt

@@ -4,6 +4,8 @@ data class CreatePoseRequest(
 
     val needMachine: Boolean,
 
+    val category: List<String>,
+
     val simpleName: String,
 
     val exactName: String,

src/main/kotlin/com/info/maeumgagym/core/pose/dto/response/PoseDetailResponse.kt

@@ -4,6 +4,8 @@ data class PoseDetailResponse(
 
     val needMachine: Boolean,
 
+    val category: MutableSet<String>,
+
     val simpleName: String,
 
     val exactName: String,

src/main/kotlin/com/info/maeumgagym/core/pose/dto/response/PoseInfoResponse.kt

@@ -2,6 +2,7 @@ package com.info.maeumgagym.core.pose.dto.response
 
 data class PoseInfoResponse(
     val id: Long,
+    val category: MutableSet<String>,
     val needMachine: Boolean,
     val name: String,
     val simplePart: List<String>,

src/main/kotlin/com/info/maeumgagym/core/pose/model/Pose.kt

@@ -7,6 +7,8 @@ data class Pose(
 
     val needMachine: Boolean,
 
+    val category: MutableSet<String>,
+
     val simpleName: String,
 
     val exactName: String,
@@ -31,6 +33,7 @@ data class Pose(
 ) {
     fun toDetailResponse() = PoseDetailResponse(
         needMachine = needMachine,
+        category = category,
         simpleName = simpleName,
         exactName = exactName,
         thumbnail = thumbnail,
@@ -45,6 +48,7 @@ data class Pose(
 
     fun toInfoResponse() = PoseInfoResponse(
         id = id!!,
+        category = category,
         needMachine = needMachine,
         name = exactName,
         simplePart = simplePart.toList(),

src/main/kotlin/com/info/maeumgagym/core/pose/port/in/ReadAllPoseUseCase.kt

@@ -1,9 +1,9 @@
 package com.info.maeumgagym.core.pose.port.`in`
 
-import com.info.maeumgagym.core.pose.dto.request.ReadAllPoseRequest
 import com.info.maeumgagym.core.pose.dto.response.PoseListResponse
+import java.time.LocalDateTime
 
 interface ReadAllPoseUseCase {
 
-    fun readAll(req: ReadAllPoseRequest): PoseListResponse
+    fun readAll(lastUpdated: LocalDateTime?): PoseListResponse
 }

src/main/kotlin/com/info/maeumgagym/core/pose/service/CreatePoseService.kt

@@ -17,6 +17,7 @@ internal class CreatePoseService(
             savePosePort.save(
                 Pose(
                     needMachine = needMachine,
+                    category = category.toMutableSet(),
                     simpleName = simpleName,
                     exactName = exactName,
                     thumbnail = thumbnail,

src/main/kotlin/com/info/maeumgagym/core/pose/service/ReadAllPoseService.kt

@@ -2,18 +2,22 @@ package com.info.maeumgagym.core.pose.service
 
 import com.info.maeumgagym.common.annotation.responsibility.ReadOnlyUseCase
 import com.info.maeumgagym.common.exception.MaeumGaGymException
-import com.info.maeumgagym.core.pose.dto.request.ReadAllPoseRequest
 import com.info.maeumgagym.core.pose.dto.response.PoseListResponse
 import com.info.maeumgagym.core.pose.port.`in`.ReadAllPoseUseCase
 import com.info.maeumgagym.core.pose.port.out.ReadPosePort
+import java.time.LocalDateTime
 
 @ReadOnlyUseCase
 internal class ReadAllPoseService(
     private val readPosePort: ReadPosePort
 ) : ReadAllPoseUseCase {
 
-    override fun readAll(req: ReadAllPoseRequest): PoseListResponse {
-        if (!req.lastUpdated.isBefore(readPosePort.getLastModifiedAt())) {
+    override fun readAll(lastUpdated: LocalDateTime?): PoseListResponse {
+        // 클라이언트의 자세 정보가 최신인지를 판단하는 로직
+        // 클라이언트의 마지막 조회 시점이 서버의 마지막 변경 시점보다 이후인 경우 No Content 반환
+        // => 클라이언트의 정보가 가장 최신인 경우
+        // 클라이언트가 한 번도 조회한 적 없는 경우 정보 반환 (lastUpdated == null)
+        if (lastUpdated?.isAfter(readPosePort.getLastModifiedAt()) ?: false) {
             throw MaeumGaGymException.NO_CONTENT
         }
 

src/main/kotlin/com/info/maeumgagym/core/pose/service/ReadPosesRecommendationService.kt

@@ -21,17 +21,18 @@ class ReadPosesRecommendationService(
         // 사용자에게 추천할 자세 추출
         readPosePort.readAllRandomLimit30().forEach {
             // 자세의 종류
-            val partName = it.simplePart.first()
-            // 자세의 종류에 해당하는 자세들의 리스트
-            var poses = recommendationPoses[partName]
-            // 만약 이번에 처음으로 자세들을 담은 리스트에 접근한다면
-            if (poses == null) {
-                // 위 주석에서 언급했듯, 새로운 자세 종류이므로 초기화 진행
-                recommendationPoses[partName] = mutableListOf()
-                poses = recommendationPoses[partName]
+            it.category.forEach { partName ->
+                // 자세의 종류에 해당하는 자세들의 리스트
+                var poses = recommendationPoses[partName]
+                // 만약 이번에 처음으로 자세들을 담은 리스트에 접근한다면
+                if (poses == null) {
+                    // 위 주석에서 언급했듯, 새로운 자세 종류이므로 초기화 진행
+                    recommendationPoses[partName] = mutableListOf()
+                    poses = recommendationPoses[partName]
+                }
+                // 자세 리스트에 추가
+                poses!!.add(it)
             }
-            // 자세 리스트에 추가
-            poses!!.add(it)
         }
 
         return PoseRecommendationListResponse(

src/main/kotlin/com/info/maeumgagym/core/user/dto/request/UpdateUserInfoRequest.kt

@@ -6,5 +6,5 @@ data class UpdateUserInfoRequest(
     val nickname: String,
     val weight: Double,
     val height: Double,
-    val genderModel: GenderModel
+    val gender: GenderModel
 )

src/main/kotlin/com/info/maeumgagym/core/user/service/UpdateUserInfoService.kt

@@ -29,7 +29,7 @@ internal class UpdateUserInfoService(
                     physicalInfoModel = PhysicalInfoModel(
                         weight = weight,
                         height = height,
-                        genderModel = genderModel
+                        genderModel = gender
                     )
                 )
             }

src/main/kotlin/com/info/maeumgagym/presentation/controller/pose/PoseController.kt

@@ -10,12 +10,13 @@ import com.info.maeumgagym.core.pose.port.`in`.*
 import com.info.maeumgagym.core.user.model.Role
 import com.info.maeumgagym.presentation.common.locationheader.LocationHeaderManager
 import com.info.maeumgagym.presentation.controller.pose.dto.request.CreatePoseWebRequest
-import com.info.maeumgagym.presentation.controller.pose.dto.request.ReadAllPoseWebRequest
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.format.annotation.DateTimeFormat
 import org.springframework.http.HttpStatus
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
+import java.time.LocalDateTime
 import javax.validation.Valid
 import javax.validation.constraints.NotBlank
 import javax.validation.constraints.Positive
@@ -52,10 +53,11 @@ private class PoseController(
     @RequireAuthentication
     @GetMapping("/all")
     fun readAll(
-        @RequestBody
         @Valid
-        readAllPoseWebRequest: ReadAllPoseWebRequest
-    ): PoseListResponse = readAllPoseUseCase.readAll(readAllPoseWebRequest.toRequest())
+        @RequestParam(value = "last_updated")
+        @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+        lastUpdated: LocalDateTime?
+    ): PoseListResponse = readAllPoseUseCase.readAll(lastUpdated)
 
     @Operation(summary = "자세 id 조회 API")
     @RequireAuthentication

src/main/kotlin/com/info/maeumgagym/presentation/controller/pose/dto/request/CreatePoseWebRequest.kt

@@ -9,6 +9,9 @@ data class CreatePoseWebRequest(
     @field:NotNull(message = "null일 수 없습니다")
     val needMachine: Boolean?,
 
+    @field:NotNull(message = "null일 수 없습니다")
+    val category: List<String>?,
+
     @field:NotBlank(message = "null일 수 없습니다")
     val simpleName: String?,
 
@@ -41,6 +44,7 @@ data class CreatePoseWebRequest(
 ) {
     fun toRequest(): CreatePoseRequest = CreatePoseRequest(
         needMachine = needMachine!!,
+        category = category!!,
         simpleName = simpleName!!,
         exactName = exactName!!,
         thumbnail = thumbnail!!,

src/main/kotlin/com/info/maeumgagym/presentation/controller/user/dto/UpdateUserInfoWebRequest.kt

@@ -19,13 +19,13 @@ data class UpdateUserInfoWebRequest(
     @field:DecimalMax(value = "300.0", message = "신장은 300.0 이하여야 합니다.")
     val height: Double,
 
-    val genderModel: GenderModel
+    val gender: GenderModel
 ) {
     fun toRequest(): UpdateUserInfoRequest =
         UpdateUserInfoRequest(
             nickname = nickname,
             height = height,
             weight = weight,
-            genderModel = genderModel
+            gender = gender
         )
 }

src/main/kotlin/com/info/maeumgagym/security/mgtoken/impl/MaeumgagymTokenValidatorImpl.kt

@@ -46,9 +46,11 @@ internal class MaeumgagymTokenValidatorImpl(
             throw AuthenticationException.EXPIRED_TOKEN
         }
 
-        if (currentRequestContext.getCurrentRequest().remoteAddr != maeumgagymToken.ip) {
-            throw AuthenticationException.WRONG_USER_TOKEN
-        }
+        // 발급 대상과 사용자의 IP 주소를 확인하는 로직
+        // 사용자의 네트워크 환경에 따라 변동될 수 있으므로, 해당 인증은 제거됨
+//        if (currentRequestContext.getCurrentRequest().remoteAddr != maeumgagymToken.ip) {
+//            throw AuthenticationException.WRONG_USER_TOKEN
+//        }
     }
 
     private fun getAccessTokenExpireAt(baseTime: LocalDateTime): LocalDateTime =