fix: 트랙 커버 사진 제거, 가수이름 추가

Team-baebae · May 5, 2024 · 9f744b7 · 9f744b7
1 parent d77b7fc
commit 9f744b7
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 25 deletions.
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/application/answer/AnswerApplication.java b/baebae-BE/src/main/java/com/web/baebaeBE/application/answer/AnswerApplication.java
@@ -74,4 +74,4 @@ public AnswerDetailResponse updateAnswer(Long answerId, AnswerCreateRequest requ
     public void deleteAnswer(Long answerId) {
         answerService.deleteAnswer(answerId);
     }
-}
+}
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/domain/answer/exception/AnswerError.java b/baebae-BE/src/main/java/com/web/baebaeBE/domain/answer/exception/AnswerError.java
@@ -18,4 +18,4 @@ public enum AnswerError implements ErrorCode {
     private final String errorCode;
     private final String message;
 
-}
+}
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/domain/answer/service/AnswerService.java b/baebae-BE/src/main/java/com/web/baebaeBE/domain/answer/service/AnswerService.java
@@ -75,7 +75,7 @@ public Answer updateAnswer(Long answerId, AnswerCreateRequest request, Multipart
     @Transactional
     public void deleteAnswer(Long answerId) {
         Answer answer = answerRepository.findByAnswerId(answerId)
-                .orElseThrow(() -> new IllegalArgumentException("No answer found with id " + answerId));
+                .orElseThrow(() -> new BusinessException(AnswerError.NO_EXIST_QUESTION));
         answer.getImageFiles().forEach(url -> {
             String fileName = url.substring(url.lastIndexOf("/") + 1);
             s3ImageStorageService.deleteFile("answers/images", fileName);

diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/entity/Answer.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/entity/Answer.java
@@ -41,8 +41,8 @@ public class Answer {
     @Column(name = "music_name")
     private String musicName;
 
-    @Column(name = "music_picture")
-    private String musicPicture;
+    @Column(name = "muic_singer")
+    private String musicSinger;
 
     @Column(name = "music_audio")
     private String musicAudio;

diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerJpaRepository.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerJpaRepository.java
@@ -8,4 +8,3 @@
 public interface AnswerJpaRepository extends JpaRepository<Answer, Long> {
     Page<Answer> findAllByMemberId(Long memberId, Pageable pageable);
 }
-
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerMapper.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerMapper.java
@@ -21,12 +21,12 @@ public Answer toEntity(AnswerCreateRequest request, Question question, Member me
                 .content(request.getContent())
                 .linkAttachments(request.getLinkAttachments()) // 링크 첨부 리스트 처리
                 .musicName(request.getMusicName())
-                .musicPicture(request.getMusicPicture())
+                .musicSinger(request.getMusicSinger())
                 .musicAudio(request.getMusicAudio())
                 .createdDate(LocalDateTime.now())
-                .heartCount(0) // 초기 감정 횟수 설정
-                .curiousCount(0) // 초기 궁금함 횟수
-                .sadCount(0) // 초기 슬픔 횟수
+                .heartCount(0)
+                .curiousCount(0)
+                .sadCount(0)
                 .build();
     }
 
@@ -38,7 +38,7 @@ public AnswerDetailResponse toDomain(Answer answer) {
                 answer.getContent(),
                 answer.getLinkAttachments(),
                 answer.getMusicName(),
-                answer.getMusicPicture(),
+                answer.getMusicSinger(),
                 answer.getMusicAudio(),
                 answer.getImageFiles(),
                 answer.getCreatedDate(),

diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerRepository.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerRepository.java
@@ -11,4 +11,4 @@ public interface AnswerRepository {
     Answer save(Answer answer);
     Page<Answer> findAllByMemberId(Long memberId, Pageable pageable);
     void delete(Answer answer);
-}
+}
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerRepositoryImpl.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/answer/repository/AnswerRepositoryImpl.java
@@ -38,4 +38,4 @@ public Page<Answer> findAllByMemberId(Long memberId, Pageable pageable) {
     public void delete(Answer answerEntity) {
         jpaRepository.delete(answerEntity);
     }
-}
+}
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/AnswerController.java b/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/AnswerController.java
@@ -46,4 +46,4 @@ public ResponseEntity<Void> deleteAnswer(@PathVariable Long answerId) {
         answerApplication.deleteAnswer(answerId);
         return ResponseEntity.noContent().build();
     }
-}
+}
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/dto/AnswerCreateRequest.java b/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/dto/AnswerCreateRequest.java
@@ -13,28 +13,28 @@ public class AnswerCreateRequest {
     private String content;
     private List<String> linkAttachments;
     private String musicName;
-    private String musicPicture;
+    private String musicSinger;
     private String musicAudio;
     private List<String> imageUrls; // 이미지 URL 리스트
     private List<MultipartFile> imageFiles; // MultipartFile 리스트, 파일 업로드용
 
     public AnswerCreateRequest(Long questionId, String content, List<String> linkAttachments,
-                               String musicName, String musicPicture, String musicAudio,
+                               String musicName, String musicSinger, String musicAudio,
                                List<String> imageUrls, List<MultipartFile> imageFiles) {
         this.questionId = questionId;
         this.content = content;
         this.linkAttachments = linkAttachments;
         this.musicName = musicName;
-        this.musicPicture = musicPicture;
+        this.musicSinger = musicSinger;
         this.musicAudio = musicAudio;
         this.imageUrls = imageUrls;
         this.imageFiles = imageFiles;
     }
 
     public static AnswerCreateRequest of(Long questionId, String content, List<String> linkAttachments,
-                                         String musicName, String musicPicture, String musicAudio,
+                                         String musicName, String musicSinger, String musicAudio,
                                          List<String> imageUrls, List<MultipartFile> imageFiles) {
-        return new AnswerCreateRequest(questionId, content, linkAttachments, musicName, musicPicture,
-                musicAudio, imageUrls,imageFiles);
+        return new AnswerCreateRequest(questionId, content, linkAttachments, musicName,
+                musicSinger, musicAudio, imageUrls,imageFiles);
     }
 }
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/dto/AnswerDetailResponse.java b/baebae-BE/src/main/java/com/web/baebaeBE/presentation/answer/dto/AnswerDetailResponse.java
@@ -15,7 +15,7 @@ public class AnswerDetailResponse {
     private String content;
     private List<String> linkAttachments;
     private String musicName;
-    private String musicPictureUrl;
+    private String musicSinger;
     private String musicAudioUrl;
     private List<String> imageUrls;
     private LocalDateTime createdDate;
@@ -24,7 +24,7 @@ public class AnswerDetailResponse {
     private Integer sadCount;
 
     public AnswerDetailResponse(Long answerId, Long questionId, Long memberId, String content,
-                                List<String> linkAttachments, String musicName, String musicPictureUrl,
+                                List<String> linkAttachments, String musicName, String musicSinger,
                                 String musicAudioUrl, List<String> imageUrls, LocalDateTime createdDate,
                                 Integer heartCount, Integer curiousCount, Integer sadCount) {
         this.answerId = answerId;
@@ -33,7 +33,7 @@ public AnswerDetailResponse(Long answerId, Long questionId, Long memberId, Strin
         this.content = content;
         this.linkAttachments = linkAttachments;
         this.musicName = musicName;
-        this.musicPictureUrl = musicPictureUrl;
+        this.musicSinger = musicSinger;
         this.musicAudioUrl = musicAudioUrl;
         this.imageUrls = imageUrls;
         this.createdDate = createdDate;
@@ -43,11 +43,11 @@ public AnswerDetailResponse(Long answerId, Long questionId, Long memberId, Strin
     }
 
     public static AnswerDetailResponse of(Long answerId, Long questionId, Long memberId, String content,
-                                          List<String> linkAttachments, String musicName, String musicPictureUrl,
+                                          List<String> linkAttachments, String musicName, String musicSinger,
                                           String musicAudioUrl, List<String> imageUrls, LocalDateTime createdDate,
                                           Integer heartCount, Integer curiousCount, Integer sadCount) {
         return new AnswerDetailResponse(answerId, questionId, memberId, content, linkAttachments, musicName,
-                musicPictureUrl, musicAudioUrl, imageUrls, createdDate,
+                musicSinger, musicAudioUrl, imageUrls, createdDate,
                 heartCount, curiousCount, sadCount);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         public void deleteAnswer(Long answerId) {
             answerService.deleteAnswer(answerId);
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,3 @@
		public interface AnswerJpaRepository extends JpaRepository<Answer, Long> {
		Page<Answer> findAllByMemberId(Long memberId, Pageable pageable);
		}