Merge pull request #158 from ItRecode/feature/BE-201

[BE-201] 레코드 쓴 날짜 반환

Author: kdomo

src/main/java/com/recordit/server/controller/RecordController.java

@@ -31,6 +31,8 @@
 import com.recordit.server.dto.record.RecordDetailResponseDto;
 import com.recordit.server.dto.record.WriteRecordRequestDto;
 import com.recordit.server.dto.record.WriteRecordResponseDto;
+import com.recordit.server.dto.record.WrittenRecordDayRequestDto;
+import com.recordit.server.dto.record.WrittenRecordDayResponseDto;
 import com.recordit.server.dto.record.memory.MemoryRecordRequestDto;
 import com.recordit.server.dto.record.memory.MemoryRecordResponseDto;
 import com.recordit.server.dto.record.mix.MixRecordResponseDto;
@@ -244,4 +246,11 @@ public ResponseEntity<RecordBySearchResponseDto> getRecordsBySearch(
 	) {
 		return ResponseEntity.ok().body(recordService.getRecordsBySearch(recordBySearchRequestDto));
 	}
+
+	@GetMapping("/days")
+	public ResponseEntity<WrittenRecordDayResponseDto> getWrittenRecordDays(
+			@Valid WrittenRecordDayRequestDto writtenRecordDayRequestDto
+	) {
+		return ResponseEntity.ok(recordService.getWrittenRecordDays(writtenRecordDayRequestDto));
+	}
 }

src/main/java/com/recordit/server/dto/record/WrittenRecordDayRequestDto.java

@@ -0,0 +1,27 @@
+package com.recordit.server.dto.record;
+
+import java.time.YearMonth;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+@ApiModel
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+public class WrittenRecordDayRequestDto {
+
+	@NotNull(message = "날짜를 입력해주세요.")
+	@DateTimeFormat(pattern = "yyyy-MM")
+	private YearMonth yearMonth;
+}
+

src/main/java/com/recordit/server/dto/record/WrittenRecordDayResponseDto.java

@@ -0,0 +1,24 @@
+package com.recordit.server.dto.record;
+
+import java.util.Set;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class WrittenRecordDayResponseDto {
+	@ApiParam(value = "내가 쓴 레코드 일자 목록", required = true)
+	private Set<Integer> WrittenRecordDayDto;
+
+	private WrittenRecordDayResponseDto(Set<Integer> WrittenRecordDayDto) {
+		this.WrittenRecordDayDto = WrittenRecordDayDto;
+	}
+
+	public static WrittenRecordDayResponseDto of(Set<Integer> WrittenRecordDayDto) {
+		return new WrittenRecordDayResponseDto(WrittenRecordDayDto);
+	}
+}

src/main/java/com/recordit/server/repository/RecordRepository.java

@@ -74,4 +74,10 @@ Page<Record> findByWriterAndTitleContaining(
 			String searchKeyword,
 			Pageable pageable
 	);
+
+	List<Record> findAllByWriterAndCreatedAtBetween(
+			Member writer,
+			LocalDateTime startTime,
+			LocalDateTime endTime
+	);
 }

src/main/java/com/recordit/server/service/RecordService.java

@@ -1,10 +1,14 @@
 package com.recordit.server.service;
 
+import static com.recordit.server.util.DateTimeUtil.*;
+
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
@@ -34,6 +38,8 @@
 import com.recordit.server.dto.record.RecordDetailResponseDto;
 import com.recordit.server.dto.record.WriteRecordRequestDto;
 import com.recordit.server.dto.record.WriteRecordResponseDto;
+import com.recordit.server.dto.record.WrittenRecordDayRequestDto;
+import com.recordit.server.dto.record.WrittenRecordDayResponseDto;
 import com.recordit.server.dto.record.memory.MemoryRecordRequestDto;
 import com.recordit.server.dto.record.memory.MemoryRecordResponseDto;
 import com.recordit.server.dto.record.mix.MixRecordDto;
@@ -153,7 +159,7 @@ public RecordByDateResponseDto getRecordBy(RecordByDateRequestDto recordByDateRe
 
 		Page<Record> findRecords = recordRepository.findAllByWriterAndCreatedAtBetweenOrderByCreatedAtDesc(
 				member,
-				DateTimeUtil.getStartOfDay(recordByDateRequestDto.getDate()),
+				getStartOfDay(recordByDateRequestDto.getDate()),
 				DateTimeUtil.getEndOfDay(recordByDateRequestDto.getDate()),
 				PageRequest.of(
 						recordByDateRequestDto.getPage(),
@@ -390,4 +396,25 @@ public RecordBySearchResponseDto getRecordsBySearch(
 				.recordToNumOfComments(recordToNumOfComment)
 				.build();
 	}
+
+	public WrittenRecordDayResponseDto getWrittenRecordDays(
+			WrittenRecordDayRequestDto writtenRecordDayRequestDto
+	) {
+		Long userIdBySession = sessionUtil.findUserIdBySession();
+		log.info("세션에서 찾은 사용자 ID : {}", userIdBySession);
+
+		Member member = memberRepository.findById(userIdBySession)
+				.orElseThrow(() -> new MemberNotFoundException("회원 정보를 찾을 수 없습니다."));
+
+		LocalDateTime start = getFirstDayOfMonth(writtenRecordDayRequestDto.getYearMonth());
+		LocalDateTime end = getLastDayOfMonth(writtenRecordDayRequestDto.getYearMonth());
+
+		TreeSet<Integer> writtenRecordDays =
+				recordRepository.findAllByWriterAndCreatedAtBetween(member, start, end)
+						.stream()
+						.map(record -> record.getCreatedAt().getDayOfMonth())
+						.collect(Collectors.toCollection(TreeSet::new));
+
+		return WrittenRecordDayResponseDto.of(writtenRecordDays);
+	}
 }

src/main/java/com/recordit/server/util/DateTimeUtil.java

@@ -3,6 +3,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.YearMonth;
 
 public class DateTimeUtil {
 
@@ -17,4 +18,22 @@ public static LocalDateTime getStartOfDay(LocalDate localDate) {
 	public static LocalDateTime getEndOfDay(LocalDate localDate) {
 		return LocalDateTime.of(localDate, LocalTime.MAX);
 	}
+
+	public static LocalDateTime getFirstDayOfMonth(YearMonth yearMonth) {
+		LocalDate standardDate = getStandardDate(yearMonth);
+		return getStartOfDay(standardDate.withDayOfMonth(1));
+	}
+
+	public static LocalDateTime getLastDayOfMonth(YearMonth yearMonth) {
+		LocalDate standardDate = getStandardDate(yearMonth);
+		return getEndOfDay(standardDate.withDayOfMonth(standardDate.lengthOfMonth()));
+	}
+
+	private static LocalDate getStandardDate(YearMonth yearMonth) {
+		return LocalDate.of(
+				yearMonth.getYear(),
+				yearMonth.getMonth(),
+				1
+		);
+	}
 }

src/test/java/com/recordit/server/service/RecordServiceTest.java

@@ -1,10 +1,12 @@
 package com.recordit.server.service;
 
+import static com.recordit.server.util.DateTimeUtil.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.BDDMockito.*;
 
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,6 +40,8 @@
 import com.recordit.server.dto.record.RecordByDateRequestDto;
 import com.recordit.server.dto.record.RecordBySearchRequestDto;
 import com.recordit.server.dto.record.WriteRecordRequestDto;
+import com.recordit.server.dto.record.WrittenRecordDayRequestDto;
+import com.recordit.server.dto.record.WrittenRecordDayResponseDto;
 import com.recordit.server.dto.record.memory.MemoryRecordRequestDto;
 import com.recordit.server.exception.member.MemberNotFoundException;
 import com.recordit.server.exception.record.FixRecordNotExistException;
@@ -693,4 +697,52 @@ class 검색으로_레코드를_조회할_때 {
 					.doesNotThrowAnyException();
 		}
 	}
+
+	@Nested
+	@DisplayName("작성된 레코드의 일자를 리스트로 조회할 때")
+	class 작성된_레코드의_일자를_리스트로_조회할_때 {
+		WrittenRecordDayRequestDto writtenRecordDayRequestDto = WrittenRecordDayRequestDto.builder()
+				.yearMonth(YearMonth.of(2023, 01))
+				.build();
+
+		@Test
+		@DisplayName("회원_정보를_찾을 수 없다면 예외를 던진다")
+		void 회원_정보를_찾을_수_없다면_예외를_던진다() {
+			// given
+			given(memberRepository.findById(anyLong()))
+					.willReturn(Optional.empty());
+
+			// when, then
+			assertThatThrownBy(() -> recordService.getWrittenRecordDays(writtenRecordDayRequestDto))
+					.isInstanceOf(MemberNotFoundException.class)
+					.hasMessage("회원 정보를 찾을 수 없습니다.");
+		}
+
+		@Test
+		@DisplayName("정상적이라면 예외를 던지지 않는다")
+		void 정상적이라면_예외를_던지지_않는다() {
+			// given
+			given(memberRepository.findById(anyLong()))
+					.willReturn(Optional.of(mockMember));
+
+			LocalDateTime start = getFirstDayOfMonth(writtenRecordDayRequestDto.getYearMonth());
+			LocalDateTime end = getLastDayOfMonth(writtenRecordDayRequestDto.getYearMonth());
+
+			given(recordRepository.findAllByWriterAndCreatedAtBetween(mockMember, start, end))
+					.willReturn(List.of(mockRecord));
+			given(mockRecord.getCreatedAt())
+					.willReturn(mock(LocalDateTime.class));
+			given(mockRecord.getCreatedAt().getDayOfMonth())
+					.willReturn(2);
+
+			// when
+			WrittenRecordDayResponseDto writtenRecordDays = recordService.getWrittenRecordDays(
+					writtenRecordDayRequestDto);
+
+			// then
+			assertThatCode(() -> recordService.getWrittenRecordDays(writtenRecordDayRequestDto))
+					.doesNotThrowAnyException();
+			assertThat(writtenRecordDays.getWrittenRecordDayDto().contains(2)).isTrue();
+		}
+	}
 }