Merge pull request #42 from Move-Log/feat/news-create

[REFACTOR] VerbType enum 사용에 따른 기록 생성 기능 수정

Author: EunbeenDev

src/main/java/com/movelog/domain/record/domain/Record.java

@@ -28,8 +28,8 @@ public class Record extends BaseEntity {
     @JoinColumn(name = "keyword_id")
     private Keyword keyword;
 
-    @Column(name = "verb_type")
-    private Long verbType;
+    @Enumerated(EnumType.STRING) // Enum을 문자열로 저장
+    private VerbType verbType;
 
     @Column(name = "record_image")
     private String recordImage;
@@ -38,14 +38,11 @@ public class Record extends BaseEntity {
     private java.time.LocalDateTime actionTime;
 
     @Builder
-    public Record(User user, Keyword keyword, Long verbType, String recordImage) {
+    public Record(User user, Keyword keyword, VerbType verbType, String recordImage) {
         this.user = user;
         this.keyword = keyword;
         this.verbType = verbType;
         this.recordImage = recordImage;
         this.actionTime = actionTime == null? LocalDateTime.now():actionTime;
     }
-
-
-
 }

src/main/java/com/movelog/domain/record/domain/VerbType.java

@@ -0,0 +1,25 @@
+package com.movelog.domain.record.domain;
+
+import lombok.Getter;
+
+@Getter
+public enum VerbType {
+    // 했어요, 먹었어요, 갔어요
+    DO("했어요"), EAT("먹었어요"), GO("갔어요");
+
+    private final String verbType;
+
+    VerbType(String verbType) {
+        this.verbType = verbType;
+    }
+
+    // Enum 매핑 메서드 추가
+    public static VerbType fromValue(String value) {
+        for (VerbType type : values()) {
+            if (type.getVerbType().equals(value)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant for value: " + value);
+    }
+}

…main/record/dto/req/CreateRecordReq.java …/record/dto/request/CreateRecordReq.javasrc/main/java/com/movelog/domain/record/dto/req/CreateRecordReq.java renamed to src/main/java/com/movelog/domain/record/dto/request/CreateRecordReq.java src/main/java/com/movelog/domain/record/dto/req/CreateRecordReq.java renamed to src/main/java/com/movelog/domain/record/dto/request/CreateRecordReq.java

@@ -1,4 +1,4 @@
-package com.movelog.domain.record.dto.req;
+package com.movelog.domain.record.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -11,8 +11,8 @@
 @NoArgsConstructor
 @Getter
 public class CreateRecordReq {
-    @Schema(type = "Long", example = "0", description = "0 -> 했어요, 1 -> 먹었어요, 2 -> 갔어요")
-    private Long verbType;
+    @Schema(type = "String", example = "했어요", description = "했어요, 먹었어요, 갔어요")
+    private String verbType;
 
     @Schema(type = "String", example = "헬스", description = "명사 작성")
     private String noun;

src/main/java/com/movelog/domain/record/presentation/RecordController.java

@@ -1,7 +1,6 @@
 package com.movelog.domain.record.presentation;
 
-import com.movelog.domain.record.dto.req.CreateRecordReq;
-import com.movelog.domain.record.repository.RecordRepository;
+import com.movelog.domain.record.dto.request.CreateRecordReq;
 import com.movelog.domain.record.service.RecordService;
 import com.movelog.global.config.security.token.UserPrincipal;
 import com.movelog.global.payload.ApiResponse;

src/main/java/com/movelog/domain/record/service/RecordService.java

@@ -2,14 +2,16 @@
 
 import com.movelog.domain.record.domain.Keyword;
 import com.movelog.domain.record.domain.Record;
-import com.movelog.domain.record.dto.req.CreateRecordReq;
+import com.movelog.domain.record.domain.VerbType;
+import com.movelog.domain.record.dto.request.CreateRecordReq;
 import com.movelog.domain.record.repository.KeywordRepository;
 import com.movelog.domain.record.repository.RecordRepository;
 import com.movelog.domain.user.domain.User;
 import com.movelog.domain.user.domain.repository.UserRepository;
 import com.movelog.global.DefaultAssert;
 import com.movelog.global.util.S3Util;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -24,6 +26,7 @@
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
+@Slf4j
 public class RecordService {
     private final RecordRepository recordRepository;
     private final UserRepository userRepository;
@@ -34,30 +37,37 @@ public class RecordService {
     public void createRecord(Long userId, CreateRecordReq createRecordReq, MultipartFile img) {
         User user = validUserById(userId);
         String recordImgUrl = s3Util.upload(img);
+        log.info("recordImgUrl: {}", recordImgUrl);
 
         Keyword keyword = Keyword.builder()
                 .keyword(createRecordReq.getNoun())
                 .build();
 
         keywordRepository.save(keyword);
+        String verb = createRecordReq.getVerbType();
+        try {
+            VerbType verbType = VerbType.fromValue(verb);
 
-        Record record = Record.builder()
-                .user(user)
-                .keyword(keyword)
-                .verbType(createRecordReq.getVerbType())
-                .recordImage(recordImgUrl)
+            Record record = Record.builder()
+                    .user(user)
+                    .keyword(keyword)
+                    .verbType(verbType)
+                    .recordImage(recordImgUrl)
 //                .actionTime(LocalDateTime.now())
-                .build();
+                    .build();
+
+            recordRepository.save(record);
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException("Invalid verb type: " + verb, e);
+        }
 
-        recordRepository.save(record);
     }
     private User validUserById(Long userId) {
         Optional<User> userOptional = userRepository.findById(userId);
-        DefaultAssert.isOptionalPresent(userOptional);
         return userOptional.get();
     }
 
-    public List<Long> retrieveTodayRecord(Long userId) {
+    public List<VerbType> retrieveTodayRecord(Long userId) {
         User user = validUserById(userId);
         // 현재 날짜 가져오기
         LocalDate today = LocalDate.now(); // 오늘 날짜 (2025-01-05 기준)