Skip to content

Commit

Permalink
fix: 일기가 존재하는 날짜 반환 기능에서 리스트 중복 제거 로직 추가 (#25)
Browse files Browse the repository at this point in the history
* fix: 날짜 반환 리스트 중복 제거 로직 추가

* refact: getDiaryDates 코드 리팩터링

* style: jwt 토큰 유효기간 변경

* style: 사용하지 않는 환경 변수 삭제
  • Loading branch information
Ji-soo708 authored Nov 24, 2023
1 parent 4600232 commit 4c96db3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
16 changes: 6 additions & 10 deletions src/main/java/com/thanksd/server/service/DiaryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@
import com.thanksd.server.domain.Member;
import com.thanksd.server.dto.request.DiaryRequest;
import com.thanksd.server.dto.request.DiaryUpdateRequest;
import com.thanksd.server.dto.response.DiaryAllResponse;
import com.thanksd.server.dto.response.DiaryDateResponse;
import com.thanksd.server.dto.response.DiaryIdResponse;
import com.thanksd.server.dto.response.DiaryInfoListResponse;
import com.thanksd.server.dto.response.DiaryInfoResponse;
import com.thanksd.server.dto.response.DiaryResponse;
import com.thanksd.server.dto.response.DiaryWeekCountResponse;
import com.thanksd.server.dto.response.*;
import com.thanksd.server.exception.badrequest.InvalidDateException;
import com.thanksd.server.exception.notfound.NotFoundDiaryException;
import com.thanksd.server.exception.notfound.NotFoundMemberException;
import com.thanksd.server.repository.DiaryRepository;
import com.thanksd.server.repository.MemberRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.sql.Timestamp;
import java.time.DateTimeException;
import java.time.DayOfWeek;
Expand All @@ -26,9 +24,6 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
@Transactional(readOnly = true)
Expand Down Expand Up @@ -145,6 +140,7 @@ private List<LocalDate> getDiaryDates(Member member, Timestamp start, Timestamp
List<Diary> diaries = diaryRepository.findByMemberAndCreatedTimeBetween(member, start, end);
return diaries.stream()
.map(diary -> diary.getCreatedTime().toLocalDateTime().toLocalDate())
.distinct()
.collect(Collectors.toList());
}

Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,10 @@ spring:
redirect-uri: ${GOOGLE_REDIRECT_URI}
scope:
- email
config:
activate:
on-profile:

security.jwt.token:
secret-key: testtesttesttesttesttesttesttesttestttttest
expire-length: 1800000
expire-length: 604800000

springdoc:
default-consumes-media-type: application/json
Expand Down

0 comments on commit 4c96db3

Please sign in to comment.