merge: pull request #38 from feat/emotionRecord/main

Author: HYEONSIKOH

.DS_Store

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.dfbf.soundlink.domain.blocklist.dto.BlockReq;
 import org.dfbf.soundlink.domain.blocklist.service.BlockListService;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -22,7 +23,7 @@ public class BlockListController {
     )
     public ResponseResult blockUser(
             @AuthenticationPrincipal Long userId,
-            @RequestBody String tag
+            @RequestBody BlockReq tag
     ) {
         return blockListService.blockUser(userId, tag);
     }

src/.DS_Store

@@ -0,0 +1,6 @@
+package org.dfbf.soundlink.domain.blocklist.dto;
+
+public record BlockReq(
+        String tag
+) {
+}

src/main/.DS_Store

@@ -2,6 +2,7 @@
 
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.dfbf.soundlink.domain.blocklist.dto.BlockReq;
 import org.dfbf.soundlink.domain.blocklist.dto.BlockRes;
 import org.dfbf.soundlink.domain.blocklist.entity.Blocklist;
 import org.dfbf.soundlink.domain.blocklist.exception.AlreadyBlockedUser;
@@ -26,18 +27,18 @@ public class BlockListService {
     private final BlockListRepository blockListRepository;
 
     @Transactional
-    public ResponseResult blockUser(Long userId, String tag) {
+    public ResponseResult blockUser(Long userId, BlockReq req) {
         try {
             User user = userRepository.findById(userId)
                     .orElseThrow(
                             BlockedUserNotFound::new
                     );
-            User blockedUser = userRepository.findByLoginId(tag)
+            User blockedUser = userRepository.findByLoginId(req.tag())
                     .orElseThrow(
                             BlockingUserNotFound::new
                     );
             blockListQueryRepository.findByUser_UserIdAndBlockedUser_LoginId(
-                    userId, tag
+                    userId, req.tag()
             ).ifPresent(block -> {
                 throw new AlreadyBlockedUser();
             });

src/main/generated/org/dfbf/soundlink/domain/emotionRecord/entity/QSpotifyMusic.java

@@ -5,8 +5,6 @@
 import jakarta.validation.constraints.Size;
 import org.dfbf.soundlink.global.comm.enums.Emotions;
 
-import java.sql.Timestamp;
-
 public record EmotionRecordRequestDTO(
 
         @NotNull(message = "spotifyId 필요")
@@ -25,8 +23,6 @@ public record EmotionRecordRequestDTO(
 
         @NotBlank(message = "comment 필요")
         @Size(max = 200, message = "comment는 200자 이내여야 합니다.")
-        String comment,
-
-        Timestamp createdAt
+        String comment
 ) {
 }

src/main/java/org/dfbf/soundlink/domain/blocklist/controller/BlockListController.java

@@ -8,6 +8,7 @@
 public record EmotionRecordResponseWithOwnerDTO(
         Long recordId,
         String nickName,
+        String loginId,
         String emotion,
         SpotifyMusicResponseDTO spotifyMusic,
         String comment,
@@ -18,6 +19,7 @@ public static EmotionRecordResponseWithOwnerDTO fromEntity(EmotionRecord record,
         return new EmotionRecordResponseWithOwnerDTO(
                 record.getRecordId(),
                 record.getUser().getNickname(),
+                record.getUser().getLoginId(),
                 record.getEmotion().name(),
                 record.getSpotifyMusic() != null ? SpotifyMusicResponseDTO.fromEntity(record.getSpotifyMusic()) : null,
                 record.getComment(),

src/main/java/org/dfbf/soundlink/domain/blocklist/dto/BlockReq.java

@@ -28,7 +28,7 @@ public class EmotionRecord {
     private Emotions emotion;
 
     @ManyToOne
-    @JoinColumn(name = "spotify_music_id")
+    @JoinColumn(name = "spotify_id")
     private SpotifyMusic spotifyMusic;
 
     @Column(name = "comment")