Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] complete rally JPA 에러 수정 #105

Merged
merged 2 commits into from
Feb 18, 2024
Merged

[FIX] complete rally JPA 에러 수정 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca13f67
[FIX #91] complete rally JPA 수정
ppparkta Feb 18, 2024
5e0c8de
Merge pull request #104 from UMC5th-bias/fix/#91
ppparkta Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/favoriteplace/app/repository/CompleteRallyRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

@Repository
public interface CompleteRallyRepository extends JpaRepository<CompleteRally, Long> {
CompleteRally findByMemberAndRally(Member member, Rally rally);
List<CompleteRally> findByMemberAndRally(Member member, Rally rally);
List<CompleteRally> findByMember(Member member);
}
19 changes: 11 additions & 8 deletions src/main/java/com/favoriteplace/app/service/PilgrimageCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,17 @@ public CommonResponseDto.RallyResponseDto certifyToPilgrimage(Long pilgrimageId,
PilgrimageDto.PilgrimageCertifyRequestDto form) {
Pilgrimage pilgrimage = pilgrimageRepository.findById(pilgrimageId).orElseThrow(
() -> new RestApiException(ErrorCode.PILGRIMAGE_NOT_FOUND));
log.info("pilgrimage coordinate="+pilgrimage.getLatitude().toString()+pilgrimage.getLongitude().toString());

List<VisitedPilgrimage> visitedPilgrimages = visitedPilgrimageRepository
.findByPilgrimageAndMemberOrderByCreatedAtDesc(pilgrimage, member);

ZoneId serverZoneId = ZoneId.of("Asia/Seoul");
ZonedDateTime nowInServerTimeZone = ZonedDateTime.now(serverZoneId);

log.info("now="+nowInServerTimeZone);
if (!visitedPilgrimages.isEmpty()) {
log.info("pilgrimage="+visitedPilgrimages.get(0).getPilgrimage().getCreatedAt().atZone(serverZoneId));
}
// log.info("now="+nowInServerTimeZone);
// if (!visitedPilgrimages.isEmpty()) {
// log.info("pilgrimage="+visitedPilgrimages.get(0).getPilgrimage().getCreatedAt().atZone(serverZoneId));
// }

if (visitedPilgrimages.isEmpty()
|| (!visitedPilgrimages.isEmpty()
Expand All @@ -96,7 +95,8 @@ public CommonResponseDto.RallyResponseDto certifyToPilgrimage(Long pilgrimageId,
successVisitedAndPointProcess(member, pilgrimage);

Long completeCount = visitedPilgrimageRepository.findByDistinctCount(member.getId(), pilgrimage.getRally().getId());
// 랠리를 완료했는지 확인
log.info("completeCount="+completeCount);
// // 랠리를 완료했는지 확인
if (checkCompleteRally(member, pilgrimage, completeCount))
return CommonConverter.toRallyResponseDto(true, true,"<"+pilgrimage.getRally().getItem().getName()+"> 칭호를 얻었습니다!");
} else
Expand All @@ -106,9 +106,10 @@ public CommonResponseDto.RallyResponseDto certifyToPilgrimage(Long pilgrimageId,

private boolean checkCompleteRally(Member member, Pilgrimage pilgrimage, Long completeCount) {
if (completeCount == pilgrimage.getRally().getPilgrimageNumber()) {
CompleteRally completeRally = completeRallyRepository.findByMemberAndRally(member, pilgrimage.getRally());
List<CompleteRally> completeRally = completeRallyRepository.findByMemberAndRally(member, pilgrimage.getRally());
log.info("size="+completeRally.size());
// 이전에 이미 랠리를 완료한 상태인지 확인
if (completeRally == null || !completeRally.getVersion().getVersion().equals(RallyVersion.v1)) {
if (completeRally.isEmpty()) {
// 최초 완료에 한해 칭호 획득
if (completeRally == null)
acquiredItemRepository.save(AcquiredItem.builder().item(pilgrimage.getRally().getItem()).member(member).build());
Expand All @@ -132,8 +133,10 @@ private boolean checkCoordinate(PilgrimageDto.PilgrimageCertifyRequestDto form,

private void successVisitedAndPointProcess(Member member, Pilgrimage pilgrimage) {
VisitedPilgrimage newVisited = VisitedPilgrimage.builder().pilgrimage(pilgrimage).member(member).build();
log.info("visited="+newVisited.getId());
visitedPilgrimageRepository.save(newVisited);
pointHistoryRepository.save(PointHistoryConverter.toPointHistory(member, 15L, PointType.ACQUIRE));
member.updatePoint(15L);
log.info("clear");
}
}
Loading