Skip to content
Merged
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 @@ -24,21 +24,21 @@ public class MypageProjectHistoryService {

@Transactional(readOnly = true)
public ProjectHistorySummaryResponseDTO getProjectHistorySummary(Long userId) {
long totalProjectCount = projectTeamMemberRepository.countConfirmedByUserId(userId);

double averageScore = 0.0;
long doneProjectCount = projectTeamMemberRepository.countDoneConfirmedByUserId(userId);
List<ProjectTeamMember> members = projectTeamMemberRepository
.findActiveConfirmedMembershipsWithTeamAndCourse(userId, ProjectTeamStatus.DONE);

if (totalProjectCount > 0) {
averageScore = (double) doneProjectCount / totalProjectCount * 100;
}
double averageScore = members.stream()
.mapToDouble(m -> m.getProjectTeam().getProgressRate() != null
? m.getProjectTeam().getProgressRate().doubleValue() : 0.0)
.average()
.orElse(0.0);

double averageContribution = peerReviewRepository
.findAverageScoreByRevieweeId(userId)
.doubleValue();

return ProjectHistorySummaryResponseDTO.builder()
.projectCount((int) doneProjectCount) // DONE 프로젝트만 반환
.projectCount(members.size())
.averageScore(averageScore)
.averageContribution(averageContribution)
.build();
Expand Down
Loading