feat: diary total duration

sinsehwan · web-flow · commit 1c280df3fa2b · 2025-11-20T13:27:25.000+09:00
# 변경점 👍

1. DiaryEntity에 totalDuration 추가
2. diary Domain DTO에 totalDuration추가

# 비고 ✏

nullable = false인 totalDuration이 들어가면 기존의 데이터가 제약조건을 만족하지 못할 것 같아서 DB
default 값을 추가해서 반영했습니다.
diff --git a/src/main/java/apptive/team5/diary/domain/DiaryEntity.java b/src/main/java/apptive/team5/diary/domain/DiaryEntity.java
@@ -55,6 +55,8 @@ public class DiaryEntity extends BaseTimeEntity {
 
     @Column(nullable = false)
     private String duration;
+    @Column(nullable = false, columnDefinition = "VARCHAR(255) DEFAULT '0'")
+    private String totalDuration;
     @Column(nullable = false)
     private String start;
     @Column(nullable = false)
@@ -75,6 +77,7 @@ public DiaryEntity(
             String content,
             DiaryScope scope,
             String duration,
+            String totalDuration,
             String start,
             String end,
             UserEntity user
@@ -88,6 +91,7 @@ public DiaryEntity(
                 content,
                 scope,
                 duration,
+                totalDuration,
                 start,
                 end,
                 user
@@ -122,14 +126,22 @@ public void update(
             String albumImageUrl,
             String videoUrl,
             String content,
-            DiaryScope scope
+            DiaryScope scope,
+            String duration,
+            String totalDuration,
+            String start,
+            String end
     ) {
         updateMusicTitle(musicTitle);
         updateArtist(artist);
         updateAlbumImageUrl(albumImageUrl);
         updateVideoUrl(videoUrl);
         updateContent(content);
         updateScope(scope);
+        updateDuration(duration);
+        updateTotalDuration(totalDuration);
+        updateStart(start);
+        updateEnd(end);
     }
 
     private void updateMusicTitle(String musicTitle) {
@@ -167,4 +179,28 @@ private void updateScope(DiaryScope scope) {
             this.scope = scope;
         }
     }
+
+    private void updateDuration(String duration) {
+        if (duration != null && !duration.isBlank()) {
+            this.duration = duration;
+        }
+    }
+
+    private void updateTotalDuration(String totalDuration) {
+        if (totalDuration != null && !totalDuration.isBlank()) {
+            this.totalDuration = totalDuration;
+        }
+    }
+
+    private void updateStart(String start) {
+        if (start != null && !start.isBlank()) {
+            this.start = start;
+        }
+    }
+
+    private void updateEnd(String end) {
+        if (end != null && !end.isBlank()) {
+            this.end = end;
+        }
+    }
 }
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryCreateRequest.java b/src/main/java/apptive/team5/diary/dto/DiaryCreateRequest.java
@@ -19,8 +19,10 @@ public record DiaryCreateRequest(
         String content,
         @NotNull(message = "공개 범위는 필수 입력입니다.")
         DiaryScope scope,
-        @NotBlank(message = "영상 길이는 필수 입력입니다.")
+        @NotBlank(message = "킬링파트 길이는 필수 입력입니다.")
         String duration,
+        @NotBlank(message = "영상 길이는 필수 입력입니다.")
+        String totalDuration,
         @NotBlank(message = "킬링파트 시작 시간은 필수 입력입니다.")
         String start,
         @NotBlank(message = "킬링파트 종료 시간은 필수 입력입니다.")
@@ -35,7 +37,8 @@ public static DiaryEntity toEntity(DiaryCreateRequest diaryRequest, UserEntity u
                         diaryRequest.content,
                         diaryRequest.scope,
                         diaryRequest.duration,
-                        diaryRequest.start(),
+                        diaryRequest.totalDuration,
+                        diaryRequest.start,
                         diaryRequest.end,
                         user
                 );
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryUpdateDto.java b/src/main/java/apptive/team5/diary/dto/DiaryUpdateDto.java
@@ -10,6 +10,7 @@ public record DiaryUpdateDto(
         String content,
         DiaryScope scope,
         String duration,
+        String totalDuration,
         String start,
         String end
 ) {
diff --git a/src/main/java/apptive/team5/diary/dto/DiaryUpdateRequestDto.java b/src/main/java/apptive/team5/diary/dto/DiaryUpdateRequestDto.java
@@ -10,6 +10,7 @@ public record DiaryUpdateRequestDto(
         String content,
         DiaryScope scope,
         String duration,
+        String totalDuration,
         String start,
         String end
 ) {
@@ -22,6 +23,7 @@ public static DiaryUpdateDto toUpdateDto(DiaryUpdateRequestDto updateRequest) {
                 updateRequest.content,
                 updateRequest.scope,
                 updateRequest.duration,
+                updateRequest.totalDuration,
                 updateRequest.start,
                 updateRequest.end
         );
diff --git a/src/main/java/apptive/team5/diary/dto/FeedDiaryResponseDto.java b/src/main/java/apptive/team5/diary/dto/FeedDiaryResponseDto.java
@@ -18,6 +18,7 @@ public record FeedDiaryResponseDto(
         String videoUrl,
         DiaryScope scope,
         String duration,
+        String totalDuration,
         String start,
         String end,
         LocalDateTime createDate,
@@ -50,6 +51,7 @@ public static FeedDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long
                 diary.getVideoUrl(),
                 diary.getScope(),
                 diary.getDuration(),
+                diary.getTotalDuration(),
                 diary.getStart(),
                 diary.getEnd(),
                 diary.getCreateDateTime(),
diff --git a/src/main/java/apptive/team5/diary/dto/MyDiaryResponseDto.java b/src/main/java/apptive/team5/diary/dto/MyDiaryResponseDto.java
@@ -14,6 +14,7 @@ public record MyDiaryResponseDto(
         String videoUrl,
         DiaryScope scope,
         String duration,
+        String totalDuration,
         String start,
         String end,
         LocalDateTime createDate,
@@ -29,6 +30,7 @@ public static MyDiaryResponseDto from(DiaryEntity diary) {
                 diary.getVideoUrl(),
                 diary.getScope(),
                 diary.getDuration(),
+                diary.getTotalDuration(),
                 diary.getStart(),
                 diary.getEnd(),
                 diary.getCreateDateTime(),
diff --git a/src/main/java/apptive/team5/diary/dto/UserDiaryResponseDto.java b/src/main/java/apptive/team5/diary/dto/UserDiaryResponseDto.java
@@ -16,6 +16,7 @@ public record UserDiaryResponseDto(
         String videoUrl,
         DiaryScope scope,
         String duration,
+        String totalDuration,
         String start,
         String end,
         LocalDateTime createDate,
@@ -43,6 +44,7 @@ public static UserDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long
                 diary.getVideoUrl(),
                 diary.getScope(),
                 diary.getDuration(),
+                diary.getTotalDuration(),
                 diary.getStart(),
                 diary.getEnd(),
                 diary.getCreateDateTime(),
diff --git a/src/main/java/apptive/team5/diary/service/DiaryLowService.java b/src/main/java/apptive/team5/diary/service/DiaryLowService.java
@@ -60,7 +60,11 @@ public void updateDiary(DiaryEntity diary, DiaryUpdateDto updateDto) {
                 updateDto.albumImageUrl(),
                 updateDto.videoUrl(),
                 updateDto.content(),
-                updateDto.scope()
+                updateDto.scope(),
+                updateDto.duration(),
+                updateDto.totalDuration(),
+                updateDto.start(),
+                updateDto.end()
         );
     }
 
diff --git a/src/test/java/apptive/team5/diary/controller/DiaryControllerTest.java b/src/test/java/apptive/team5/diary/controller/DiaryControllerTest.java
@@ -110,6 +110,7 @@ void getMyMusicDiary() throws Exception {
             softly.assertThat(diaryResponse.musicTitle()).isEqualTo(diary.getMusicTitle());
             softly.assertThat(diaryResponse.artist()).isEqualTo(diary.getArtist());
             softly.assertThat(diaryResponse.duration()).isEqualTo(diary.getDuration());
+            softly.assertThat(diaryResponse.totalDuration()).isEqualTo(diary.getTotalDuration());
             softly.assertThat(diaryResponse.start()).isEqualTo(diary.getStart());
             softly.assertThat(diaryResponse.end()).isEqualTo(diary.getEnd());
         });
@@ -270,6 +271,7 @@ void createDiary() throws Exception {
             softly.assertThat(diaryEntity.getAlbumImageUrl()).isEqualTo(diaryRequest.albumImageUrl());
             softly.assertThat(diaryEntity.getEnd()).isEqualTo(diaryRequest.end());
             softly.assertThat(diaryEntity.getDuration()).isEqualTo(diaryRequest.duration());
+            softly.assertThat(diaryEntity.getTotalDuration()).isEqualTo(diaryRequest.totalDuration());
             softly.assertThat(diaryEntity.getStart()).isEqualTo(diaryRequest.start());
             softly.assertThat(diaryEntity.getArtist()).isEqualTo(diaryRequest.artist());
             softly.assertThat(diaryEntity.getMusicTitle()).isEqualTo(diaryRequest.musicTitle());
@@ -291,6 +293,14 @@ void updateDiary() throws Exception {
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(updateRequest)))
                 .andExpect(status().isOk());
+
+        DiaryEntity updatedDiary = diaryRepository.findById(diary.getId()).orElseThrow();
+
+        assertSoftly(softly -> {
+            softly.assertThat(updatedDiary.getMusicTitle()).isEqualTo(updateRequest.musicTitle());
+            softly.assertThat(updatedDiary.getTotalDuration()).isEqualTo(updateRequest.totalDuration());
+            softly.assertThat(updatedDiary.getContent()).isEqualTo(updateRequest.content());
+        });
     }
 
     @Test
diff --git a/src/test/java/apptive/team5/diary/service/DiaryServiceTest.java b/src/test/java/apptive/team5/diary/service/DiaryServiceTest.java
@@ -105,11 +105,13 @@ void getUserDiaries_OtherUser() {
 
         UserDiaryResponseDto publicDto = result.getContent().get(0);
         assertThat(publicDto.scope()).isEqualTo(DiaryScope.PUBLIC);
+        assertThat(publicDto.totalDuration()).isEqualTo(publicDiary.getTotalDuration());
         assertThat(publicDto.content()).isEqualTo(publicDiary.getContent());
         assertThat(publicDto.isLiked()).isTrue();
 
         UserDiaryResponseDto killingPartDto = result.getContent().get(1);
         assertThat(killingPartDto.scope()).isEqualTo(DiaryScope.KILLING_PART);
+        assertThat(killingPartDto.totalDuration()).isEqualTo(killingPartDiary.getTotalDuration());
         assertThat(killingPartDto.content()).isEqualTo(UserDiaryResponseDto.defaultContentMsg);
         assertThat(killingPartDto.isLiked()).isFalse();
 
@@ -152,7 +154,7 @@ void getUserDiaries_OwnUser() {
 
         UserDiaryResponseDto killingPartDto = result.getContent().get(1);
         assertThat(killingPartDto.scope()).isEqualTo(DiaryScope.KILLING_PART);
-        assertThat(killingPartDto.content()).isEqualTo(killingPartDiary.getContent()); // 자신의 KILLING_PART 내용은 보여야 함
+        assertThat(killingPartDto.content()).isEqualTo(killingPartDiary.getContent());
         assertThat(killingPartDto.isLiked()).isFalse();
 
         verify(userLowService).getReferenceById(userId);
diff --git a/src/test/java/apptive/team5/util/TestUtil.java b/src/test/java/apptive/team5/util/TestUtil.java
@@ -51,6 +51,7 @@ public static DiaryEntity makeDiaryEntity(UserEntity user) {
                 "video.url",
                 "Test content",
                 DiaryScope.PUBLIC,
+                "30S",
                 "PT2M58S",
                 "PT1M1S",
                 "PT1M31S",
@@ -66,6 +67,7 @@ public static DiaryEntity makeDiaryEntityWithScope(UserEntity user, DiaryScope s
                 "video.url",
                 "Test content",
                 scope,
+                "30S",
                 "PT2M58S",
                 "PT1M1S",
                 "PT1M31S",
@@ -82,6 +84,7 @@ public static DiaryEntity makeDiaryEntityWithId(Long diaryId, UserEntity user) {
                 "video.url",
                 "Test content",
                 DiaryScope.PUBLIC,
+                "30S",
                 "PT2M58S",
                 "PT1M1S",
                 "PT1M31S",
@@ -97,6 +100,7 @@ public static DiaryCreateRequest makeDiaryCreateRequest() {
                 "url",
                 "Test Content",
                 DiaryScope.PUBLIC,
+                "30S",
                 "PT2M58S",
                 "PT1M1S",
                 "PT1M31S"
@@ -111,6 +115,7 @@ public static DiaryUpdateRequestDto makeDiaryUpdateRequest() {
                 "updated.video.url",
                 "Updated Content",
                 DiaryScope.PUBLIC,
+                "30S",
                 "PT2M58S",
                 "PT1M1S",
                 "PT1M31S"
