Merge pull request #108 from Team-Wable/fix/#102

[FIX] calculate preinCommuiryMember percent logic

Author: Hong0329

WableServer/src/main/java/com/wable/www/WableServer/api/community/domain/Community.java

@@ -24,11 +24,4 @@ public class Community {
 	public void increaseCommunityNumber() {
 		this.communityNumber++;
 	}
-
-	public double calculatePercent() {
-		int communityNumber = this.communityNumber;
-		final int TOTAL = 50;
-		if (communityNumber == 0) return 0.0;
-		return Math.round(((double) communityNumber / TOTAL * 100.0) * 10) / 10.0;
-	}
 }

WableServer/src/main/java/com/wable/www/WableServer/api/community/service/CommunityCommandService.java

@@ -6,6 +6,7 @@
 import com.wable.www.WableServer.api.community.repository.CommunityRepository;
 import com.wable.www.WableServer.api.member.domain.Member;
 import com.wable.www.WableServer.api.member.repository.MemberRepository;
+import com.wable.www.WableServer.common.util.CommunityUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,6 @@ public PreinCommunityResponseDto preinCommunityVer2(Long memberId, CommunityPrei
 		Community community = communityRepository.getCommunityByCommunityName(communityPreinRequestDto.communityName());
 		community.increaseCommunityNumber();
 
-		return PreinCommunityResponseDto.of(community.calculatePercent());
+		return PreinCommunityResponseDto.of(CommunityUtil.calculatePercent(community.getCommunityName(), community.getCommunityNumber()));
 	}
 }

WableServer/src/main/java/com/wable/www/WableServer/api/community/service/CommunityQueryService.java

@@ -5,11 +5,13 @@
 import com.wable.www.WableServer.api.community.dto.response.GetMemberCommunityResponseDto;
 import com.wable.www.WableServer.api.community.repository.CommunityRepository;
 import com.wable.www.WableServer.api.member.repository.MemberRepository;
+import com.wable.www.WableServer.common.util.CommunityUtil;
 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;
 
 @Service
@@ -19,6 +21,19 @@ public class CommunityQueryService {
 	private final MemberRepository memberRepository;
 	private final CommunityRepository communityRepository;
 
+	private static final Map<String, Integer> TOTAL_MAP = Map.of(
+			"T1", 80,
+			"DK", 18,
+			"GEN", 20,
+			"KT", 10,
+			"HLE", 22,
+			"BFX", 8,
+			"DNF", 8,
+			"NS", 8,
+			"DRX", 18,
+			"BRO", 8
+	);
+
 	public GetMemberCommunityResponseDto getMemberCommunity(Long memberId) {
 		String memberCommunity = memberRepository.findMemberByIdOrThrow(memberId).getMemberCommunity();
 		return GetMemberCommunityResponseDto.of(memberCommunity);
@@ -27,7 +42,10 @@ public GetMemberCommunityResponseDto getMemberCommunity(Long memberId) {
 	public List<GetCommunityListResponseDto> getCommunityList() {
 		List<Community> communities = communityRepository.findAll();
 		return communities.stream()
-				.map(community -> GetCommunityListResponseDto.of(community.getCommunityName(), community.calculatePercent()))
+				.map(community -> {
+					double percent = CommunityUtil.calculatePercent(community.getCommunityName(), community.getCommunityNumber());
+					return GetCommunityListResponseDto.of(community.getCommunityName(), percent);
+				})
 				.collect(Collectors.toList());
 	}
 }

WableServer/src/main/java/com/wable/www/WableServer/common/util/CommunityUtil.java

@@ -0,0 +1,28 @@
+package com.wable.www.WableServer.common.util;
+
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+@RequiredArgsConstructor
+public class CommunityUtil {
+	private static final Map<String, Integer> TOTAL_MAP = Map.of(
+			"T1", 80,
+			"DK", 18,
+			"GEN", 20,
+			"KT", 10,
+			"HLE", 22,
+			"BFX", 8,
+			"DNF", 8,
+			"NS", 8,
+			"DRX", 18,
+			"BRO", 8
+	);
+
+	public static double calculatePercent(String communityName, int communityNumber) {
+		int total = TOTAL_MAP.getOrDefault(communityName, 50);
+		if (total == 0 || communityNumber == 0) return 0.0;
+		if (communityNumber >= total) return 100.0;
+		return Math.round(((double) communityNumber / total * 100.0) * 10) / 10.0;
+	}
+}