통증 기록 api 수정 (#132)

* fix: 통증 강도 필드 삭제

* fix: 통증 부위 신체도 기반 수정

* fix: 통증 기록 오류 수정

Author: oxomi

backend/ongi/src/main/java/ongi/health/controller/HealthRecordController.java

@@ -37,12 +37,16 @@ public ResponseEntity<PainRecordResponse> addPainRecord(
 
         FamilyInfo familyInfo = familyService.getFamily(userDetails.getUser());
         String familyId = familyInfo.code();
-
-        PainRecord record = healthRecordService.addPainRecord(
+        
+        // 여러 통증 부위를 한 번에 저장
+        List<PainRecord.PainArea> painAreas = request.painArea().stream()
+                .map(PainRecord.PainArea::valueOf)
+                .toList();
+        
+        PainRecord record = healthRecordService.addOrUpdatePainRecord(
                 userDetails.getUser().getUuid(),
                 request.date(),
-                PainRecord.PainArea.valueOf(request.painArea()),
-                PainRecord.PainLevel.valueOf(request.painLevel())
+                painAreas
         );
 
         // 온도 상승

backend/ongi/src/main/java/ongi/health/dto/PainRecordRequest.java

@@ -1,9 +1,9 @@
 package ongi.health.dto;
 
 import java.time.LocalDate;
+import java.util.List;
 
 public record PainRecordRequest(
     LocalDate date,
-    String painArea,
-    String painLevel
+    List<String> painArea
 ) {} 

backend/ongi/src/main/java/ongi/health/dto/PainRecordResponse.java

@@ -1,20 +1,21 @@
 package ongi.health.dto;
 
 import java.time.LocalDate;
+import java.util.List;
 import ongi.health.entity.PainRecord;
 
 public record PainRecordResponse(
     Long id,
     LocalDate date,
-    String painArea,
-    String painLevel
+    List<String> painArea
 ) {
     public PainRecordResponse(PainRecord entity) {
         this(
             entity.getId(),
             entity.getDate(),
-            entity.getPainArea().name(),
-            entity.getPainLevel().name()
+            entity.getPainArea().stream()
+                    .map(PainRecord.PainArea::name)
+                    .toList()
         );
     }
 } 

backend/ongi/src/main/java/ongi/health/entity/PainAreaListToJsonConverter.java

@@ -0,0 +1,48 @@
+package ongi.health.entity;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import java.util.List;
+
+@Converter
+public class PainAreaListToJsonConverter implements AttributeConverter<List<PainRecord.PainArea>, String> {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public String convertToDatabaseColumn(List<PainRecord.PainArea> painAreas) {
+        try {
+            return objectMapper.writeValueAsString(painAreas);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("Error converting pain areas to JSON", e);
+        }
+    }
+
+    @Override
+    public List<PainRecord.PainArea> convertToEntityAttribute(String json) {
+        try {
+            if (json == null || json.isEmpty()) {
+                return List.of();
+            }
+            
+            // 기존 단일 값 데이터 처리 (예: "LEFT_SHOULDER")
+            if (!json.startsWith("[")) {
+                try {
+                    PainRecord.PainArea singleArea = PainRecord.PainArea.valueOf(json);
+                    return List.of(singleArea);
+                } catch (IllegalArgumentException e) {
+                    // 기존 데이터가 유효하지 않은 경우 빈 리스트 반환
+                    return List.of();
+                }
+            }
+            
+            // 새로운 JSON 배열 데이터 처리
+            return objectMapper.readValue(json, new TypeReference<List<PainRecord.PainArea>>() {});
+        } catch (JsonProcessingException e) {
+            // JSON 파싱 실패 시 빈 리스트 반환
+            return List.of();
+        }
+    }
+} 

backend/ongi/src/main/java/ongi/health/entity/PainRecord.java

@@ -4,6 +4,7 @@
 import lombok.*;
 import java.time.LocalDate;
 import java.util.UUID;
+import java.util.List;
 
 @Entity
 @Getter
@@ -22,19 +23,44 @@ public class PainRecord {
     @Column(nullable = false)
     private LocalDate date;
 
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
-    private PainArea painArea;
+    @Column(columnDefinition = "json", nullable = false)
+    @Convert(converter = PainAreaListToJsonConverter.class)
+    private List<PainArea> painArea;
 
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
-    private PainLevel painLevel;
 
     public enum PainArea {
-        HEAD, NECK, SHOULDER, CHEST, BACK, ARM, HAND, ABDOMEN, WAIST, LEG, KNEE, FOOT, NONE
+        // 머리
+        HEAD,
+        // 목
+        NECK,
+        // 어깨 (좌우 구분)
+        LEFT_SHOULDER, RIGHT_SHOULDER,
+        // 가슴
+        CHEST,
+        // 등
+        BACK,
+        // 팔 (좌우 구분, 윗팔/아랫팔 구분)
+        LEFT_UPPER_ARM, RIGHT_UPPER_ARM,
+        LEFT_FOREARM, RIGHT_FOREARM,
+        // 손 (좌우 구분)
+        LEFT_HAND, RIGHT_HAND,
+        // 배
+        ABDOMEN,
+        // 허리
+        WAIST,
+        // 골반 (좌우 구분)
+        PELVIS,
+        // 엉덩이 (좌우 구분)
+        HIP,
+        // 다리 (좌우 구분, 허벅지/종아리 구분)
+        LEFT_THIGH, RIGHT_THIGH,
+        LEFT_CALF, RIGHT_CALF,
+        // 무릎 (좌우 구분)
+        LEFT_KNEE, RIGHT_KNEE,
+        // 발 (좌우 구분)
+        LEFT_FOOT, RIGHT_FOOT,
+        // 없음
+        NONE
     }
 
-    public enum PainLevel {
-        STRONG, MID_STRONG, MID_WEAK, WEAK
-    }
 } 

backend/ongi/src/main/java/ongi/health/repository/ExerciseRecordRepository.java

@@ -12,6 +12,6 @@
 public interface ExerciseRecordRepository extends JpaRepository<ExerciseRecord, Long> {
     // 최근 7일간 운동 기록 조회
     List<ExerciseRecord> findByParentIdAndDateBetweenOrderByDateDesc(UUID parentId, LocalDate startDate, LocalDate endDate);
-    // date로 단일 ExerciseRecord 조회
+    // 특정 날짜의 통증 기록 조회
     java.util.Optional<ExerciseRecord> findByParentIdAndDate(UUID parentId, LocalDate date);
 } 

backend/ongi/src/main/java/ongi/health/repository/PainRecordRepository.java

@@ -12,4 +12,6 @@
 public interface PainRecordRepository extends JpaRepository<PainRecord, Long> {
     // 최근 7일간 통증 기록 조회
     List<PainRecord> findByParentIdAndDateBetweenOrderByDateDesc(UUID parentId, LocalDate startDate, LocalDate endDate);
+    // 특정 날짜의 통증 기록 조회
+    java.util.Optional<PainRecord> findByParentIdAndDate(UUID parentId, LocalDate date);
 } 

backend/ongi/src/main/java/ongi/health/service/HealthRecordService.java

@@ -18,15 +18,12 @@ public class HealthRecordService {
     private final PainRecordRepository painRecordRepository;
     private final ExerciseRecordRepository exerciseRecordRepository;
 
-    // 통증 기록 추가
+    // 통증 기록 추가/수정
     @Transactional
-    public PainRecord addPainRecord(UUID parentId, LocalDate date, PainRecord.PainArea area, PainRecord.PainLevel level) {
-        PainRecord record = PainRecord.builder()
-                .parentId(parentId)
-                .date(date)
-                .painArea(area)
-                .painLevel(level)
-                .build();
+    public PainRecord addOrUpdatePainRecord(UUID parentId, LocalDate date, List<PainRecord.PainArea> areas) {
+        PainRecord record = painRecordRepository.findByParentIdAndDate(parentId, date)
+                .orElse(PainRecord.builder().parentId(parentId).date(date).build());
+        record.setPainArea(areas);
         return painRecordRepository.save(record);
     }
 
@@ -60,4 +57,12 @@ public ExerciseRecord getParentExerciseRecordDetail(UUID parentId, LocalDate dat
         return exerciseRecordRepository.findByParentIdAndDate(parentId, date)
                 .orElse(null);
     }
+
+    // 특정 날짜 통증 기록 조회
+    public PainRecord getParentPainRecordDetail(UUID parentId, LocalDate date) {
+        return painRecordRepository.findByParentIdAndDate(parentId, date)
+                .orElse(null);
+    }
+
+
 }