feat : evaluationScore

Giggle-projects · Aug 13, 2023 · d76f8fe · d76f8fe
1 parent 213c65f
commit d76f8fe
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/src/main/java/se/ton/t210/domain/EvaluationScoreSection.java b/src/main/java/se/ton/t210/domain/EvaluationScoreSection.java
@@ -13,24 +13,21 @@ public class EvaluationScoreSection {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
     private Long id;
-
     private Long evaluationItemId;
-
     private int sectionBaseScore;
-
-    private int score;
+    private int evaluationScore;
 
     public EvaluationScoreSection() {
     }
 
-    public EvaluationScoreSection(Long id, Long evaluationItemId, int sectionBaseScore, int score) {
+    public EvaluationScoreSection(Long id, Long evaluationItemId, int sectionBaseScore, int evaluationScore) {
         this.id = id;
         this.evaluationItemId = evaluationItemId;
         this.sectionBaseScore = sectionBaseScore;
-        this.score = score;
+        this.evaluationScore = evaluationScore;
     }
 
-    public EvaluationScoreSection(Long evaluationItemId, int sectionBaseScore, int score) {
-        this(null, evaluationItemId, sectionBaseScore, score);
+    public EvaluationScoreSection(Long evaluationItemId, int sectionBaseScore, int evaluationScore) {
+        this(null, evaluationItemId, sectionBaseScore, evaluationScore);
     }
 }
diff --git a/src/main/java/se/ton/t210/service/EvaluationItemService.java b/src/main/java/se/ton/t210/service/EvaluationItemService.java
@@ -48,7 +48,7 @@ public List<List<EvaluationSectionInfo>> sectionInfos(ApplicationType applicatio
                         evaluationItem.getName(),
                         prevItemBaseScore,
                         section.getSectionBaseScore(),
-                        section.getScore()
+                        section.getEvaluationScore()
                 );
                 evaluationSectionInfos.add(sectionInfo);
                 prevItemBaseScore = section.getSectionBaseScore() - 1;

diff --git a/src/main/java/se/ton/t210/service/ScoreService.java b/src/main/java/se/ton/t210/service/ScoreService.java
@@ -72,10 +72,10 @@ private void updateMonthlyScore(Member member, int evaluationScoreSum, LocalDate
 
     public int evaluationScore(Long evaluationItemId, int score) {
         return evaluationScoreSectionRepository.findAllByEvaluationItemId(evaluationItemId).stream()
-            .filter(it -> it.getSectionBaseScore() < score)
-            .max(Comparator.comparingInt(EvaluationScoreSection::getScore))
-            .map(EvaluationScoreSection::getScore)
-            .orElse(0);
+            .filter(it -> it.getSectionBaseScore() <= score)
+            .max(Comparator.comparingInt(EvaluationScoreSection::getEvaluationScore))
+            .map(EvaluationScoreSection::getEvaluationScore)
+            .orElseThrow(() -> new IllegalArgumentException("Invalid evaluationItemId or score"));
     }
 
     public List<RankResponse> rank(ApplicationType applicationType, int rankCnt, LocalDate date) {
@@ -87,10 +87,10 @@ public List<RankResponse> rank(ApplicationType applicationType, int rankCnt, Loc
         int sameStack = 0;
         for (var score : rankScores) {
             final Member member = memberRepository.findById(score.getMemberId()).orElseThrow();
-            if(prevScore == score.getScore()) {
+            if (prevScore == score.getScore()) {
                 sameStack++;
             } else {
-                rank = rank + sameStack +1;
+                rank = rank + sameStack + 1;
                 sameStack = 0;
             }
             prevScore = score.getScore();

diff --git a/src/main/java/se/ton/t210/utils/data/DummyData.java b/src/main/java/se/ton/t210/utils/data/DummyData.java
@@ -97,11 +97,11 @@ public List<EvaluationItem> createDummyEvaluationItem(ApplicationType applicatio
                 new EvaluationScoreSection(item.getId(), 43, 3),
                 new EvaluationScoreSection(item.getId(), 46, 4),
                 new EvaluationScoreSection(item.getId(), 49, 5),
-                new EvaluationScoreSection(item.getId(), 52, 5),
-                new EvaluationScoreSection(item.getId(), 55, 5),
-                new EvaluationScoreSection(item.getId(), 61, 5),
-                new EvaluationScoreSection(item.getId(), 64, 5),
-                new EvaluationScoreSection(item.getId(), 68, 5)
+                new EvaluationScoreSection(item.getId(), 52, 6),
+                new EvaluationScoreSection(item.getId(), 55, 7),
+                new EvaluationScoreSection(item.getId(), 61, 8),
+                new EvaluationScoreSection(item.getId(), 64, 9),
+                new EvaluationScoreSection(item.getId(), 68, 10)
             ));
         }
         return evaluationItems;