Merge pull request #360 from 6QuizOnTheBlock/be/feat/#359-isolation_rank

Be/feat/#359 isolation rank
6QuizOnTheBlock · May 18, 2024 · 81e3282 · 81e3282
2 parents ca3f803 + 0f9c8fb
commit 81e3282
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/...rc/main/java/com/quiz/ourclass/domain/organization/dto/response/MemberDetailResponse.java b/...rc/main/java/com/quiz/ourclass/domain/organization/dto/response/MemberDetailResponse.java
@@ -10,8 +10,10 @@ public record MemberDetailResponse(
     String name,
     @Schema(description = "멤버 프로필 사진")
     String photo,
-    @Schema(description = "멤버 인싸력")
+    @Schema(description = "멤버 인싸력 점수")
     double isolationPoint,
+    @Schema(description = "멤버 인싸력 등수")
+    int isolationRank,
     @Schema(description = "멤버 포인트")
     int exp,
     @Schema(description = "함께달리기 참여 횟수")

diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/organization/entity/MemberOrganization.java b/backEnd/src/main/java/com/quiz/ourclass/domain/organization/entity/MemberOrganization.java
@@ -28,6 +28,7 @@ public class MemberOrganization {
     @ManyToOne(fetch = FetchType.LAZY)
     Member member;
     double isolationPoint;
+    int isolationRank;
     int exp;
     int challengeCount;
     int relayCount;
@@ -48,4 +49,8 @@ public void updateRelayCount() {
     public void updateIsolationPoint(double isolationPoint) {
         this.isolationPoint = isolationPoint;
     }
+
+    public void updateIsolationRank(int isolationRank) {
+        this.isolationRank = isolationRank;
+    }
 }
diff --git a/...End/src/main/java/com/quiz/ourclass/domain/organization/service/MemberOrgServiceImpl.java b/...End/src/main/java/com/quiz/ourclass/domain/organization/service/MemberOrgServiceImpl.java
@@ -105,6 +105,7 @@ public MemberDetailResponse getMemberDetail(long id, long memberId) {
             .name(member.getName())
             .photo(member.getProfileImage())
             .isolationPoint(memberOrganization.getIsolationPoint())
+            .isolationRank(memberOrganization.getIsolationRank())
             .exp(memberOrganization.getExp())
             .challengeCount(challengeCount)
             .relayCount(relayCount)

diff --git a/backEnd/src/main/java/com/quiz/ourclass/global/util/scheduler/SchedulingService.java b/backEnd/src/main/java/com/quiz/ourclass/global/util/scheduler/SchedulingService.java
@@ -12,6 +12,7 @@
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 import lombok.RequiredArgsConstructor;
@@ -62,7 +63,7 @@ protected void relationShipScore() {
     }
 
     @Transactional
-    @Scheduled(cron = "0 30 3 * * *")
+    @Scheduled(cron = "0 15 3 * * *")
     protected void isolationScore() {
         List<Organization> organizations = organizationRepository.findAll();
 
@@ -109,6 +110,40 @@ protected void isolationScore() {
         }
     }
 
+    @Transactional
+    @Scheduled(cron = "0 30 3 * * *")
+    public void isolationRank() {
+        List<Organization> organizations = organizationRepository.findAll();
+
+        for (Organization organization : organizations) {
+            // isolationPoint 기준으로 내림차순 정렬
+            List<MemberOrganization> memberOrganizations = memberOrganizationRepository
+                .findAllByOrganizationOrderByMemberId(organization)
+                .stream()
+                .sorted(
+                    Comparator.comparingDouble(MemberOrganization::getIsolationPoint).reversed()
+                )
+                .toList();
+
+            // 순위 계산 및 업데이트
+            int rank = 1; // 현재 순위
+            int actualRank = 1; // 다음에 적용될 실제 순위
+            double lastPoint = Double.MAX_VALUE; // 이전 isolationPoint
+            for (MemberOrganization memberOrg : memberOrganizations) {
+                // 점수가 변경되면 순위 업데이트
+                if (memberOrg.getIsolationPoint() != lastPoint) {
+                    lastPoint = memberOrg.getIsolationPoint();
+                    rank = actualRank;
+                }
+                memberOrg.updateIsolationRank(rank);
+                memberOrganizationRepository.save(memberOrg);
+
+                // 실제 사용될 다음 순위 업데이트 (동 순위 고려)
+                actualRank++;
+            }
+        }
+    }
+
     private List<Double> retrieveScores(
         MemberOrganization member, List<MemberOrganization> memberOrganizations,
         Organization organization