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
Expand Up @@ -12,9 +12,8 @@ public class NicknameGenerator {
private final NicknameAdjectiveRepository nicknameAdjectiveRepository;

public String generate(Role role) {
long randomIndex = (long)(Math.random() * 500);
return nicknameAdjectiveRepository.findNicknameAdjectiveById(randomIndex)
return nicknameAdjectiveRepository.findRandomNicknameAdjective()
.map(adjective -> adjective.getAdjective() + " " + role.getNickname())
.orElse("user_" + System.currentTimeMillis());
.orElse("숨겨진 " + role.getNickname());
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
package com.swyp8team2.user.domain;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;

import java.util.Optional;

@Repository
public interface NicknameAdjectiveRepository extends JpaRepository<NicknameAdjective, Long> {

Optional<NicknameAdjective> findNicknameAdjectiveById(Long id);
@Query("""
SELECT na
FROM NicknameAdjective na
ORDER BY RAND()
LIMIT 1
"""
)
Optional<NicknameAdjective> findRandomNicknameAdjective();
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class NicknameGeneratorTest {
void generate() throws Exception {
//given
Role role = Role.USER;
given(nicknameAdjectiveRepository.findNicknameAdjectiveById(any()))
given(nicknameAdjectiveRepository.findRandomNicknameAdjective())
.willReturn(Optional.of(new NicknameAdjective("호기심 많은")));

//when
Expand All @@ -47,7 +47,7 @@ void generate() throws Exception {
void generate_guest() throws Exception {
//given
Role role = Role.GUEST;
given(nicknameAdjectiveRepository.findNicknameAdjectiveById(any()))
given(nicknameAdjectiveRepository.findRandomNicknameAdjective())
.willReturn(Optional.of(new NicknameAdjective("호기심 많은")));

//when
Expand Down