Skip to content

fix: able rival list/#624 #655

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

Merged
redjungi09 merged 1 commit into from
Apr 8, 2026
Merged

fix: able rival list/#624 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions ...va/com/process/clash/application/compete/rival/rival/service/GetAllAbleRivalsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,31 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class GetAllAbleRivalsService implements GetAllAbleRivalsUseCase {

private static final int MAX_RIVAL_COUNT = 4;

private final RivalRepositoryPort rivalRepositoryPort;
private final UserRepositoryPort userRepositoryPort;

@Override
public GetAllAbleRivalsData.Result execute(GetAllAbleRivalsData.Command command) {

List<Rival> rivals = rivalRepositoryPort.findAllRivalsByUserId(command.actor().id());

Long myId = command.actor().id();

if (rivalRepositoryPort.countAcceptedByUserId(myId) >= MAX_RIVAL_COUNT) {
return GetAllAbleRivalsData.Result.from(List.of());
}

List<Rival> rivals = rivalRepositoryPort.findAllRivalsByUserId(myId);

List<Long> excludedUserIds = Stream.concat(
rivals.stream()
.filter(rival -> rival.rivalLinkingStatus() == RivalLinkingStatus.PENDING
Expand All @@ -42,8 +50,23 @@ public GetAllAbleRivalsData.Result execute(GetAllAbleRivalsData.Command command)
Stream.of(myId)
).distinct().toList();

List<AbleRivalInfoForRival> candidates = userRepositoryPort.findAbleRivalsWithUserInfo(excludedUserIds);

if (candidates.isEmpty()) {
return GetAllAbleRivalsData.Result.from(List.of());
}

List<Long> candidateIds = candidates.stream().map(AbleRivalInfoForRival::id).toList();
Map<Long, Integer> acceptedCounts = rivalRepositoryPort.countAcceptedByUserIdsGrouped(candidateIds)
.stream()
.collect(Collectors.toMap(
map -> ((Number) map.get("user_id")).longValue(),
map -> ((Number) map.get("count")).intValue()
));

List<AbleRivalInfoForRival> ableRivalInfoForRivals = userRepositoryPort.findAbleRivalsWithUserInfo(excludedUserIds);
List<AbleRivalInfoForRival> ableRivalInfoForRivals = candidates.stream()
.filter(user -> acceptedCounts.getOrDefault(user.id(), 0) < MAX_RIVAL_COUNT)
.toList();

return GetAllAbleRivalsData.Result.from(ableRivalInfoForRivals);
}
Expand Down
33 changes: 30 additions & 3 deletions ...om/process/clash/application/compete/rival/rival/service/SearchRivalByKeywordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,23 @@
import com.process.clash.application.compete.rival.rival.port.out.RivalRepositoryPort;
import com.process.clash.application.user.usergithub.port.out.UserGitHubRepositoryPort;
import com.process.clash.domain.rival.rival.entity.Rival;
import com.process.clash.domain.rival.rival.enums.RivalLinkingStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class SearchRivalByKeywordService implements SearchRivalByKeywordUseCase {

private static final int MAX_RIVAL_COUNT = 4;

private final RivalRepositoryPort rivalRepositoryPort;
private final UserGitHubRepositoryPort userGitHubRepositoryPort;

Expand All @@ -26,10 +31,16 @@ public SearchRivalByKeywordData.Result execute(SearchRivalByKeywordData.Command

Long myId = command.actor().id();

List<Rival> rivals = rivalRepositoryPort.findAllByUserId(myId);
if (rivalRepositoryPort.countAcceptedByUserId(myId) >= MAX_RIVAL_COUNT) {
return SearchRivalByKeywordData.Result.from(List.of());
}

List<Rival> rivals = rivalRepositoryPort.findAllRivalsByUserId(myId);

List<Long> excludedUserIds = Stream.concat(
rivals.stream()
.filter(rival -> rival.rivalLinkingStatus() == RivalLinkingStatus.PENDING
|| rival.rivalLinkingStatus() == RivalLinkingStatus.ACCEPTED)
.map(rival -> {
if (rival.firstUserId().equals(myId)) {
return rival.secondUserId();
Expand All @@ -38,14 +49,30 @@ public SearchRivalByKeywordData.Result execute(SearchRivalByKeywordData.Command
}
}),
Stream.of(myId)
).toList();
).distinct().toList();

List<AbleRivalInfoForRival> ableRivalInfoForRivals =
List<AbleRivalInfoForRival> candidates =
userGitHubRepositoryPort.findAbleRivalsWithUserInfoByKeyword(
excludedUserIds,
command.keyword()
);

if (candidates.isEmpty()) {
return SearchRivalByKeywordData.Result.from(List.of());
}

List<Long> candidateIds = candidates.stream().map(AbleRivalInfoForRival::id).toList();
Map<Long, Integer> acceptedCounts = rivalRepositoryPort.countAcceptedByUserIdsGrouped(candidateIds)
.stream()
.collect(Collectors.toMap(
map -> ((Number) map.get("user_id")).longValue(),
map -> ((Number) map.get("count")).intValue()
));

List<AbleRivalInfoForRival> ableRivalInfoForRivals = candidates.stream()
.filter(user -> acceptedCounts.getOrDefault(user.id(), 0) < MAX_RIVAL_COUNT)
.toList();

return SearchRivalByKeywordData.Result.from(ableRivalInfoForRivals);
}

Expand Down
Loading