Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
package org.withtime.be.withtimebe.domain.member.repository;

import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.withtime.be.withtimebe.domain.member.entity.Grade;

public interface GradeRepository extends JpaRepository<Grade, Long> {

@Query("SELECT g FROM Grade g " +
"WHERE g.requiredPoint <= :point " +
"ORDER BY g.requiredPoint DESC")
Optional<Grade> findCurrentGrade(@Param("point") int point);

@Query("SELECT g FROM Grade g " +
"WHERE g.requiredPoint > :point " +
"ORDER BY g.requiredPoint ASC")
Optional<Grade> findNextGrade(@Param("point") int point);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.withtime.be.withtimebe.domain.member.service.query;

import java.util.Comparator;
import java.util.List;

import org.springframework.stereotype.Service;
import org.springframework.web.ErrorResponseException;
import org.withtime.be.withtimebe.domain.member.converter.GradeConverter;
Expand All @@ -23,10 +26,21 @@ public GradeResponseDTO.FindMyGrade findMyGrade(Member member) {

int currentPoint = member.getPoint();

Grade currentGrade = gradeRepository.findCurrentGrade(currentPoint)
List<Grade> gradeList = gradeRepository.findAll();

// ν•„μš” 포인트 κΈ°μ€€ μ˜€λ¦„μ°¨μˆœ μ •λ ¬
gradeList.sort(Comparator.comparingInt(Grade::getRequiredPoint));

// ν˜„μž¬ Grade
Grade currentGrade = gradeList.stream()
.filter(g -> g.getRequiredPoint() <= currentPoint)
.max(Comparator.comparingInt(Grade::getRequiredPoint))
.orElseThrow(() -> new GradeException(GradeErrorCode.GRADE_NOT_FOUND));

Grade nextGrade = gradeRepository.findNextGrade(currentPoint)
// λ‹€μŒ Grade
Grade nextGrade = gradeList.stream()
.filter(g -> g.getRequiredPoint() > currentPoint)
.findFirst()
.orElse(null);

return GradeConverter.toFindMyGrade(member, currentGrade, nextGrade);
Expand Down