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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FROM eclipse-temurin:21-jdk

COPY build/libs/tennis-park-0.0.1-SNAPSHOT.jar app.jar

CMD ["java", "-jar", "app.jar"]
CMD ["java", "-jar", "app.jar"]
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import java.util.List;
import kr.tennispark.members.common.domain.entity.Member;
import kr.tennispark.members.common.domain.entity.vo.Phone;
import kr.tennispark.members.user.infrastructure.repository.MemberRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand All @@ -21,11 +22,15 @@ public class MemberDetailsService implements UserDetailsService {

@Override
public UserDetails loadUserByUsername(String phoneNumber) {
Member member = memberRepository.findByPhone_Number(phoneNumber)

Member member = memberRepository.findByPhone(Phone.of(phoneNumber))
.orElseThrow(() ->
new UsernameNotFoundException("์กด์žฌํ•˜์ง€ ์•Š๋Š” ํšŒ์› ์ „ํ™”๋ฒˆํ˜ธ"));
return new MemberPrincipal(member,
List.of(new SimpleGrantedAuthority(ROLE_PREFIX + USER_ROLE_VALUE)));
new UsernameNotFoundException("์กด์žฌํ•˜์ง€ ์•Š๋Š” ํšŒ์› ์ „ํ™”๋ฒˆํ˜ธ")
);

return new MemberPrincipal(
member,
List.of(new SimpleGrantedAuthority(ROLE_PREFIX + USER_ROLE_VALUE))
);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ public void createMember(RegisterMemberRequest request) {
memberRepository.save(member);
}

/* โœ… ํ•ต์‹ฌ ์ˆ˜์ • ํฌ์ธํŠธ */
public boolean existsMemberByPhone(String phoneNumber) {
return memberRepository.existsByPhone_Number(phoneNumber);
return memberRepository.existsByPhone(Phone.of(phoneNumber));
}

public GetMemberMatchRecordResponse getMemberMatchRecord(Member member) {
Expand All @@ -57,7 +58,14 @@ public GetMemberMatchRecordResponse getMemberMatchRecord(Member member) {
int matchPoint = member.getMatchPoint();
long ranking = rankingRepository.getRank(member.getId());

return GetMemberMatchRecordResponse.of(wins, draws, losses, matchPoint, ranking, member.getCoupon());
return GetMemberMatchRecordResponse.of(
wins,
draws,
losses,
matchPoint,
ranking,
member.getCoupon()
);
}

@Transactional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Optional;
import kr.tennispark.members.common.domain.entity.Member;
import kr.tennispark.members.common.domain.entity.enums.MemberShipType;
import kr.tennispark.members.common.domain.entity.vo.Phone;
import kr.tennispark.members.common.domain.exception.NoSuchMemberException;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
Expand All @@ -14,7 +15,13 @@
@Repository
public interface MemberRepository extends JpaRepository<Member, Long> {

boolean existsByPhone_Number(String number);
/* โœ… ํ•ต์‹ฌ ์ˆ˜์ •: VO ๊ธฐ์ค€ ์กฐํšŒ */
boolean existsByPhone(Phone phone);
Optional<Member> findByPhone(Phone phone);

/* โ— ๋ ˆ๊ฑฐ์‹œ (์‚ฌ์šฉ ๊ธˆ์ง€, ์‚ญ์ œ๋Š” ์„ ํƒ) */
// boolean existsByPhone_Number(String number);
// Optional<Member> findByPhone_Number(String number);

List<Member> findByNameContaining(String name);

Expand All @@ -23,24 +30,21 @@ default Member getById(Long id) {
.orElseThrow(NoSuchMemberException::new);
}

Optional<Member> findByPhone_Number(String number);

int countByMemberShipType(MemberShipType memberShipType);

@Query("""
SELECT m
FROM Member m
WHERE m.status = true
ORDER BY m.matchPoint DESC
LIMIT 1
""")
Optional<Member> findTopScorerMember();

@Query("""
SELECT SUM(m.matchPoint)
FROM Member m
WHERE m.id = :memberId
AND m.status = true
AND m.status = true
""")
Integer sumScoreByMemberId(@Param("memberId") Long memberId);

Expand All @@ -51,12 +55,12 @@ SELECT SUM(m.matchPoint)
List<Member> findByIdIn(List<Long> memberIds);

@Query("""
SELECT m
FROM Member m
WHERE m.status = true
AND m.fcmToken IS NOT NULL
AND TRIM(m.fcmToken) <> ''
ORDER BY m.id ASC
SELECT m
FROM Member m
WHERE m.status = true
AND m.fcmToken IS NOT NULL
AND TRIM(m.fcmToken) <> ''
ORDER BY m.id ASC
""")
List<Member> findAllWithValidFcmToken();
}
Loading