feat: temp deploy version

tukcom2023CD · Oct 21, 2024 · c55ae6c · c55ae6c
1 parent ce20d83
commit c55ae6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/backend/src/main/java/com/dragonguard/backend/domain/member/entity/Member.java b/backend/src/main/java/com/dragonguard/backend/domain/member/entity/Member.java
@@ -120,10 +120,6 @@ public class Member implements Auditable {
     @Formula("(SELECT COALESCE(sum(cr.amount), 0) FROM code_review cr WHERE cr.member_id = id)")
     private Integer sumOfCodeReviews;
 
-    @Formula(
-            "(SELECT COALESCE(sum(h.amount), 0) FROM member m left join blockchain b on b.member_id = m.id left join history h on h.blockchain_id = b.id where m.id = id)")
-    private Long sumOfTokens;
-
     @Builder
     public Member(
             final String name,
@@ -141,6 +137,11 @@ public Member(
         addRoleIfAdmin(role);
     }
 
+    public Long getSumOfTokens() {
+        return Integer.valueOf(sumOfCommits + sumOfIssues + sumOfPullRequests + sumOfCodeReviews)
+                .longValue();
+    }
+
     private void addRoleIfAdmin(final Role role) {
         if (role != null && role.equals(Role.ROLE_ADMIN)) {
             this.role.add(role);

diff --git a/...end/src/main/java/com/dragonguard/backend/domain/member/repository/MemberQDtoFactory.java b/...end/src/main/java/com/dragonguard/backend/domain/member/repository/MemberQDtoFactory.java
@@ -1,11 +1,12 @@
 package com.dragonguard.backend.domain.member.repository;
 
+import static com.dragonguard.backend.domain.member.entity.QMember.member;
+
 import com.dragonguard.backend.domain.member.dto.response.QMemberRankResponse;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import static com.dragonguard.backend.domain.member.entity.QMember.member;
-
 /**
  * @author 김승진
  * @description 멤버 프로젝션 적용을 위한 클래스
@@ -19,7 +20,11 @@ public QMemberRankResponse qMemberRankResponse() {
                 member.id,
                 member.name,
                 member.githubId,
-                member.sumOfTokens,
+                member.sumOfCommits
+                        .add(member.sumOfCodeReviews)
+                        .add(member.sumOfIssues)
+                        .add(member.sumOfPullRequests)
+                        .longValue(),
                 member.tier,
                 member.profileImage);
     }