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
3 changes: 2 additions & 1 deletion src/main/java/com/dowe/elasticsearch/mapper/TeamMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
public interface TeamMapper {

@Mapping(target = "maxPeople", expression = "java(AppConstants.TEAM_MAX_SIZE)")
TeamOutline toTeamOutline(Team team);
@Mapping(target = "currentPeople", source = "currentPeople")
TeamOutline toTeamOutline(Team team, int currentPeople);

}
7 changes: 6 additions & 1 deletion src/main/java/com/dowe/member/application/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static com.dowe.util.RandomUtil.*;

import com.dowe.elasticsearch.mapper.TeamMapper;
import com.dowe.profile.infrastructure.ProfileRepository;
import java.util.List;
import java.util.Optional;

Expand All @@ -29,6 +30,7 @@ public class MemberService {

private final TeamMapper teamMapper;

private final ProfileRepository profileRepository;
private final MemberRepository memberRepository;
private final MemberCodeStorage memberCodeStorage;
private final TeamRepository teamRepository;
Expand Down Expand Up @@ -81,7 +83,10 @@ public FetchMyTeamResponse fetchMyTeam(

List<TeamOutline> teamOutlines = teamRepository.findAllTeamsByMemberId(member.getId())
.stream()
.map(teamMapper::toTeamOutline)
.map(team -> {
int currentPeople = profileRepository.countByTeamId(team.getId());
return teamMapper.toTeamOutline(team, currentPeople);
})
.toList();

return FetchMyTeamResponse.from(teamOutlines);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ public interface ProfileRepository extends JpaRepository<Profile, Long> {

long countByMemberId(Long memberId);

int countByTeamId(Long teamId);
}
7 changes: 6 additions & 1 deletion src/main/java/com/dowe/random/application/RandomService.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.dowe.exception.member.MemberNotFoundException;
import com.dowe.member.Member;
import com.dowe.member.infrastructure.MemberRepository;
import com.dowe.profile.infrastructure.ProfileRepository;
import com.dowe.random.dto.response.RandomTeamsResponse;
import com.dowe.team.dto.TeamOutline;
import com.dowe.team.infrastructure.TeamRepository;
Expand All @@ -20,6 +21,7 @@
@RequiredArgsConstructor
public class RandomService {

private final ProfileRepository profileRepository;
private final TeamRepository teamRepository;
private final MemberRepository memberRepository;
private final TeamMapper teamMapper;
Expand All @@ -38,7 +40,10 @@ public RandomTeamsResponse getRandomTeams(

List<TeamOutline> randomTeamOutlines = teamRepository.findTeamsNotJoinedByMemberWithOffset(memberId, randomOffset)
.stream()
.map(teamMapper::toTeamOutline)
.map(team -> {
int currentPeople = profileRepository.countByTeamId(team.getId());
return teamMapper.toTeamOutline(team, currentPeople);
})
.toList();

return RandomTeamsResponse.from(randomTeamOutlines);
Expand Down