feat : 기여도 api 작성

tukcomCD2024 · May 29, 2024 · 5e54a35 · 5e54a35
1 parent efb57f9
commit 5e54a35
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...src/main/java/com/Backend/shareNote/domain/Oraganization/service/ContributionService.java b/...src/main/java/com/Backend/shareNote/domain/Oraganization/service/ContributionService.java
@@ -8,9 +8,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
@@ -30,13 +28,23 @@ public ResponseEntity<?> getContribution(String organizationId) {
             List<ContributionResultDTO> resultlist = new ArrayList<>();
 
             HashMap<String, Integer> quizMap = new HashMap<>();
+            HashMap<String, Integer> likeMap = new HashMap<>();
+
             // quizMap 초기화
             organization.getMembers().forEach(member -> {
                 quizMap.put(member, 0);
             });
 
             // 노트 조회 하면서 퀴즈의 맞춘 목록을 뒤지면서 quizMap 완성하기
             organization.getNotes().forEach(note -> {
+                //note의 like 정보를 갖고 있는 맵
+                Map<String, Set<Organization.BlockLike>> userLikes = note.getLikesInfo().getUserLikes();
+
+                for (String uuid :note.getLikesInfo().getUserLikes().keySet()) {
+                    likeMap.put(uuid, likeMap.getOrDefault(uuid,0) + userLikes.get(uuid).size() );
+                }
+
+
                 note.getQuiz().forEach(quiz -> {
                     for (String key : quiz.getCorrectUser()) {
                         quizMap.put(key, quizMap.get(key) + 1);
@@ -60,7 +68,7 @@ public ResponseEntity<?> getContribution(String organizationId) {
                 contributionResultDTO.setQuizScore(quizMap.get(member));
 
                 // like 점수 추가 (추후에 추가 예정)
-                contributionResultDTO.setLikeScore(0);
+                contributionResultDTO.setLikeScore(likeMap.getOrDefault(member,0));
 
                 resultlist.add(contributionResultDTO);
             });

diff --git a/frontend/src/Component/Page/utils/editor/plugin/generateBlockIdPlugin.js b/frontend/src/Component/Page/utils/editor/plugin/generateBlockIdPlugin.js
@@ -1,3 +1,4 @@
+import { localStorageCache } from "prosemirror-image-plugin";
 import { Plugin } from "prosemirror-state";
 import { v4 as uuidv4 } from "uuid";
 
@@ -22,7 +23,7 @@ export const generateBlockIdPlugin = (guidGenerator = uuidv4) => {
                   newGuid = guidGenerator();
                 } while (generatedIds.has(newGuid));
                 generatedIds.add(newGuid);
-                tr.setNodeMarkup(pos, undefined, {...node.attrs, 'data-guid': newGuid});
+                tr.setNodeMarkup(pos, undefined, {...node.attrs, 'data-guid': newGuid, 'data-writer': localStorage.getItem('userId')});
                 modified = true;
               } else {
                 generatedIds.add(currentGuid);
@@ -41,7 +42,7 @@ export const generateBlockIdPlugin = (guidGenerator = uuidv4) => {
                       newGuid = guidGenerator();
                     } while (generatedIds.has(newGuid));
                     generatedIds.add(newGuid);
-                    tr.setNodeMarkup(pos, undefined, {...node.attrs, guid: newGuid});
+                    tr.setNodeMarkup(pos, undefined, {...node.attrs, guid: newGuid, writer: localStorage.getItem('userId')});
                     modified = true;
                   }
                 } else {
@@ -53,7 +54,7 @@ export const generateBlockIdPlugin = (guidGenerator = uuidv4) => {
                       newGuid = guidGenerator();
                     } while (generatedIds.has(newGuid));
                     generatedIds.add(newGuid);
-                    tr.setNodeMarkup(pos, undefined, {...node.attrs, guid: newGuid});
+                    tr.setNodeMarkup(pos, undefined, {...node.attrs, guid: newGuid, writer: localStorage.getItem('userId')});
                     modified = true;
                   } else {
                     generatedIds.add(currentGuid);