feat : 다이어리 필드 추가 및 유튜브 api 응답 정렬 기준 추가 (#8)

jinwon1234 · web-flow · commit 93c19e69c5be · 2025-10-01T11:02:32.000+09:00
# 변경점 👍 close: #7 1. DiaryEntity에 duration, start, end 추가 2. 유튜브 api 응답 정렬기준 추가 (Official Audio, Lyrics, 가사, Official MV, 나머지) 순으로 정렬 3. BaseTimeEntity 추가 # 비고 ✏ 테스트에서 응답값 검증할 때 `SoftAssertions.assertSoftly` 사용했으면 좋겠습니다. 참고 : https://zzang9ha.tistory.com/418
diff --git a/src/main/java/apptive/team5/diary/controller/DiaryController.java b/src/main/java/apptive/team5/diary/controller/DiaryController.java
@@ -1,5 +1,6 @@
 package apptive.team5.diary.controller;
 
+import apptive.team5.diary.domain.DiaryEntity;
 import apptive.team5.diary.dto.DiaryCreateRequest;
 import apptive.team5.diary.dto.DiaryResponse;
 import apptive.team5.diary.dto.DiaryUpdateRequest;
@@ -21,6 +22,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.URI;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/diaries")
@@ -45,9 +48,9 @@ public ResponseEntity<Page<DiaryResponse>> getMyMusicDiary(
 
     @PostMapping
     public ResponseEntity<Void> createDiary(@AuthenticationPrincipal String identifier, @Valid @RequestBody DiaryCreateRequest diaryRequest) {
-        diaryService.createDiary(identifier, diaryRequest);
+        DiaryEntity diary = diaryService.createDiary(identifier, diaryRequest);
 
-        return ResponseEntity.status(HttpStatus.CREATED).build();
+        return ResponseEntity.status(HttpStatus.CREATED).location(URI.create("/api/diaries/" + diary.getId())).build();
     }
 
     @PutMapping("/{diaryId}")
diff --git a/src/main/java/apptive/team5/diary/domain/DiaryEntity.java b/src/main/java/apptive/team5/diary/domain/DiaryEntity.java
@@ -1,5 +1,6 @@
 package apptive.team5.diary.domain;
 
+import apptive.team5.global.entity.BaseTimeEntity;
 import apptive.team5.user.domain.UserEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -22,7 +23,7 @@
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class DiaryEntity {
+public class DiaryEntity extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -33,16 +34,23 @@ public class DiaryEntity {
     private String musicTitle;
     @Column(nullable = false, length = 255)
     private String artist;
-    @Column(columnDefinition = "TEXT")
+    @Column(columnDefinition = "TEXT", nullable = false)
     private String albumImageUrl;
-    @Column(columnDefinition = "TEXT")
+    @Column(columnDefinition = "TEXT", nullable = false)
     private String videoUrl;
-    @Column(columnDefinition = "TEXT")
+    @Column(columnDefinition = "TEXT", nullable = false)
     private String content;
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private DiaryScope scope;
 
+    @Column(nullable = false)
+    private String duration;
+    @Column(nullable = false)
+    private String start;
+    @Column(nullable = false)
+    private String end;
+
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(
             name = "user_id",
@@ -58,6 +66,9 @@ public DiaryEntity(
             String videoUrl,
             String content,
             DiaryScope scope,
+            String duration,
+            String start,
+            String end,
             UserEntity user
     ) {
         this(
@@ -68,6 +79,9 @@ public DiaryEntity(
                 videoUrl,
                 content,
                 scope,
+                duration,
+                start,
+                end,
                 user
         );
     }
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryCreateRequest.java b/src/main/java/apptive/team5/diary/dto/DiaryCreateRequest.java
@@ -18,7 +18,13 @@ public record DiaryCreateRequest(
         @NotBlank(message = "내용을 입력해주세요")
         String content,
         @NotNull(message = "공개 범위는 필수 입력입니다.")
-        DiaryScope scope
+        DiaryScope scope,
+        @NotBlank(message = "영상 길이는 필수 입력입니다.")
+        String duration,
+        @NotBlank(message = "킬링파트 시작 시간은 필수 입력입니다.")
+        String start,
+        @NotBlank(message = "킬링파트 종료 시간은 필수 입력입니다.")
+        String end
 ) {
         public static DiaryEntity toEntity(DiaryCreateRequest diaryRequest, UserEntity user) {
                 return new DiaryEntity(
@@ -28,6 +34,9 @@ public static DiaryEntity toEntity(DiaryCreateRequest diaryRequest, UserEntity u
                         diaryRequest.videoUrl,
                         diaryRequest.content,
                         diaryRequest.scope,
+                        diaryRequest.duration,
+                        diaryRequest.start(),
+                        diaryRequest.end,
                         user
                 );
         }
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryResponse.java b/src/main/java/apptive/team5/diary/dto/DiaryResponse.java
@@ -3,14 +3,20 @@
 
 import apptive.team5.diary.domain.DiaryEntity;
 import apptive.team5.diary.domain.DiaryScope;
+import java.time.LocalDateTime;
 
 public record DiaryResponse(
         String artist,
         String musicTitle,
         String albumImageUrl,
         String content,
         String videoUrl,
-        DiaryScope scope
+        DiaryScope scope,
+        String duration,
+        String start,
+        String end,
+        LocalDateTime createDate,
+        LocalDateTime updateDate
 ) {
     public static DiaryResponse from(DiaryEntity diary) {
         return new DiaryResponse(
@@ -19,7 +25,12 @@ public static DiaryResponse from(DiaryEntity diary) {
                 diary.getAlbumImageUrl(),
                 diary.getContent(),
                 diary.getVideoUrl(),
-                diary.getScope()
+                diary.getScope(),
+                diary.getDuration(),
+                diary.getStart(),
+                diary.getEnd(),
+                diary.getCreateDateTime(),
+                diary.getUpdateDateTime()
         );
     }
 }
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryUpdateDto.java b/src/main/java/apptive/team5/diary/dto/DiaryUpdateDto.java
@@ -8,6 +8,9 @@ public record DiaryUpdateDto(
         String albumImageUrl,
         String videoUrl,
         String content,
-        DiaryScope scope
+        DiaryScope scope,
+        String duration,
+        String start,
+        String end
 ) {
 }
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryUpdateRequest.java b/src/main/java/apptive/team5/diary/dto/DiaryUpdateRequest.java
@@ -8,7 +8,10 @@ public record DiaryUpdateRequest(
         String albumImageUrl,
         String videoUrl,
         String content,
-        DiaryScope scope
+        DiaryScope scope,
+        String duration,
+        String start,
+        String end
 ) {
     public static DiaryUpdateDto toUpdateDto(DiaryUpdateRequest updateRequest) {
         return new DiaryUpdateDto(
@@ -17,7 +20,10 @@ public static DiaryUpdateDto toUpdateDto(DiaryUpdateRequest updateRequest) {
                 updateRequest.albumImageUrl,
                 updateRequest.videoUrl,
                 updateRequest.content,
-                updateRequest.scope
+                updateRequest.scope,
+                updateRequest.duration,
+                updateRequest.start,
+                updateRequest.end
         );
     }
 }
diff --git a/src/main/java/apptive/team5/diary/service/DiaryLowService.java b/src/main/java/apptive/team5/diary/service/DiaryLowService.java
@@ -17,8 +17,8 @@ public class DiaryLowService {
     private final DiaryRepository diaryRepository;
 
     @Transactional
-    public void saveDiary(DiaryEntity diary) {
-        diaryRepository.save(diary);
+    public DiaryEntity saveDiary(DiaryEntity diary) {
+        return diaryRepository.save(diary);
     }
 
     @Transactional(readOnly = true)
diff --git a/src/main/java/apptive/team5/diary/service/DiaryService.java b/src/main/java/apptive/team5/diary/service/DiaryService.java
@@ -28,12 +28,12 @@ public Page<DiaryResponse> getMyDiaries(String identifier, Pageable pageable) {
     }
 
     @Transactional
-    public void createDiary(String identifier, DiaryCreateRequest diaryRequest) {
+    public DiaryEntity createDiary(String identifier, DiaryCreateRequest diaryRequest) {
         UserEntity foundUser = findUserByIdentifier(identifier);
 
         DiaryEntity diary = DiaryCreateRequest.toEntity(diaryRequest, foundUser);
 
-        diaryLowService.saveDiary(diary);
+        return diaryLowService.saveDiary(diary);
     }
 
     @Transactional
diff --git a/src/main/java/apptive/team5/global/entity/BaseTimeEntity.java b/src/main/java/apptive/team5/global/entity/BaseTimeEntity.java
@@ -0,0 +1,26 @@
+package apptive.team5.global.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class BaseTimeEntity {
+
+    @CreatedDate
+    @Column(updatable = false, nullable = false)
+    private LocalDateTime createDateTime;
+
+    @LastModifiedDate
+    @Column(nullable = false)
+    private LocalDateTime updateDateTime;
+}
+
diff --git a/src/main/java/apptive/team5/jwt/domain/RefreshToken.java b/src/main/java/apptive/team5/jwt/domain/RefreshToken.java
@@ -1,5 +1,6 @@
 package apptive.team5.jwt.domain;
 
+import apptive.team5.global.entity.BaseTimeEntity;
 import apptive.team5.user.domain.UserEntity;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -16,7 +17,7 @@
 @EntityListeners(AuditingEntityListener.class)
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class RefreshToken {
+public class RefreshToken extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/apptive/team5/user/domain/UserEntity.java b/src/main/java/apptive/team5/user/domain/UserEntity.java
@@ -1,5 +1,6 @@
 package apptive.team5.user.domain;
 
+import apptive.team5.global.entity.BaseTimeEntity;
 import apptive.team5.jwt.domain.RefreshToken;
 import apptive.team5.oauth2.dto.OAuth2Response;
 import jakarta.persistence.*;
@@ -12,7 +13,7 @@
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class UserEntity {
+public class UserEntity extends BaseTimeEntity {
 
     private static String defaultImage;
 
diff --git a/src/main/java/apptive/team5/youtube/dto/YoutubeVideoResponse.java b/src/main/java/apptive/team5/youtube/dto/YoutubeVideoResponse.java
@@ -6,10 +6,23 @@ public record YoutubeVideoResponse (
         String title,
         String duration,
         String url
-){
+) implements Comparable<YoutubeVideoResponse> {
 
     public YoutubeVideoResponse(Video video) {
         this(video.getSnippet().getTitle(), video.getContentDetails().getDuration(),
                 "https://www.youtube-nocookie.com/embed/" + video.getId());
     }
+
+    @Override
+    public int compareTo(YoutubeVideoResponse other) {
+        return Integer.compare(priority(this.title), priority(other.title));
+    }
+
+    private int priority(String title) {
+        if (title.contains("Official Audio")) return 1;
+        if (title.contains("Lyrics")) return 2;
+        if (title.contains("가사")) return 3;
+        if (title.contains("Official MV")) return 4;
+        return 5;
+    }
 }
diff --git a/src/main/java/apptive/team5/youtube/service/YoutubeService.java b/src/main/java/apptive/team5/youtube/service/YoutubeService.java
@@ -53,7 +53,9 @@ public List<YoutubeVideoResponse> searchVideo(YoutubeSearchRequest searchRequest
                     .execute();
 
             return videoResponse.getItems()
-                    .stream().map(YoutubeVideoResponse::new).toList();
+                    .stream().map(YoutubeVideoResponse::new)
+                    .sorted()
+                    .toList();
 
         } catch (IOException e) {
             throw new ExternalApiConnectException(ExceptionCode.YOUTUBE_API_EXCEPTION.getDescription(), HttpStatus.INTERNAL_SERVER_ERROR);
diff --git a/src/test/java/apptive/team5/diary/controller/DiaryControllerTest.java b/src/test/java/apptive/team5/diary/controller/DiaryControllerTest.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -21,11 +22,14 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -61,7 +65,7 @@ void setUp() {
     @WithCustomMockUser(identifier = TestUtil.userIdentifier)
     void getMyMusicDiary() throws Exception {
         // given
-        diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
+        DiaryEntity diary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
 
         // when & then
         String response = mockMvc.perform(get("/api/diaries/my")
@@ -79,9 +83,16 @@ void getMyMusicDiary() throws Exception {
                 new TypeReference<List<DiaryResponse>>() {}
         );
 
-        assertThat(content).hasSize(1);
-        assertThat(content.getFirst().musicTitle()).isEqualTo("Test Music");
-        assertThat(content.getFirst().artist()).isEqualTo("Test Artist");
+        DiaryResponse diaryResponse = content.getFirst();
+
+        assertSoftly(softly-> {
+            softly.assertThat(content).hasSize(1);
+            softly.assertThat(diaryResponse.musicTitle()).isEqualTo(diary.getMusicTitle());
+            softly.assertThat(diaryResponse.artist()).isEqualTo(diary.getArtist());
+            softly.assertThat(diaryResponse.duration()).isEqualTo(diary.getDuration());
+            softly.assertThat(diaryResponse.start()).isEqualTo(diary.getStart());
+            softly.assertThat(diaryResponse.end()).isEqualTo(diary.getEnd());
+        });
     }
 
     @Test
@@ -92,10 +103,26 @@ void createDiary() throws Exception {
         DiaryCreateRequest diaryRequest = TestUtil.makeDiaryCreateRequest();
 
         // when & then
-        mockMvc.perform(post("/api/diaries")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(diaryRequest)))
-                .andExpect(status().isCreated());
+        String header = mockMvc.perform(post("/api/diaries")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(diaryRequest)))
+                .andExpect(MockMvcResultMatchers.header().exists("location"))
+                .andExpect(status().isCreated())
+                .andReturn().getResponse().getHeader("location");
+
+        Long id = Long.parseLong(header.substring(header.lastIndexOf("/") + 1));
+
+        DiaryEntity diaryEntity = diaryRepository.findById(id).get();
+
+        assertSoftly(softly-> {
+            softly.assertThat(diaryEntity.getAlbumImageUrl()).isEqualTo(diaryRequest.albumImageUrl());
+            softly.assertThat(diaryEntity.getEnd()).isEqualTo(diaryRequest.end());
+            softly.assertThat(diaryEntity.getDuration()).isEqualTo(diaryRequest.duration());
+            softly.assertThat(diaryEntity.getStart()).isEqualTo(diaryRequest.start());
+            softly.assertThat(diaryEntity.getArtist()).isEqualTo(diaryRequest.artist());
+            softly.assertThat(diaryEntity.getMusicTitle()).isEqualTo(diaryRequest.musicTitle());
+            softly.assertThat(diaryEntity.getScope()).isEqualTo(diaryRequest.scope());
+        });
     }
 
     @Test
diff --git a/src/test/java/apptive/team5/util/TestUtil.java b/src/test/java/apptive/team5/util/TestUtil.java

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public class DiaryLowService {`
`17`	`17`	`private final DiaryRepository diaryRepository;`
`18`	`18`
`19`	`19`	`@Transactional`
`20`		`- public void saveDiary(DiaryEntity diary) {`
`21`		`- diaryRepository.save(diary);`
	`20`	`+ public DiaryEntity saveDiary(DiaryEntity diary) {`
	`21`	`+ return diaryRepository.save(diary);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Transactional(readOnly = true)`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ public Page<DiaryResponse> getMyDiaries(String identifier, Pageable pageable) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Transactional`
`31`		`- public void createDiary(String identifier, DiaryCreateRequest diaryRequest) {`
	`31`	`+ public DiaryEntity createDiary(String identifier, DiaryCreateRequest diaryRequest) {`
`32`	`32`	`UserEntity foundUser = findUserByIdentifier(identifier);`
`33`	`33`
`34`	`34`	`DiaryEntity diary = DiaryCreateRequest.toEntity(diaryRequest, foundUser);`
`35`	`35`
`36`		`- diaryLowService.saveDiary(diary);`
	`36`	`+ return diaryLowService.saveDiary(diary);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Transactional`