Merge pull request #50 from PaulKreft/small-fixes

fix average time stat display (again)
PaulKreft · Feb 26, 2024 · 250d406 · 250d406
2 parents 98d3457 + a6fa797
commit 250d406
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...end/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java b/...end/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java
@@ -64,8 +64,8 @@ private ScoreMap getAverageDurations(List<Game> easyGames, List<Game> mediumGame
         List<Double> hardDurations = hardGames.stream().map(game -> Double.valueOf(game.duration())).filter(d -> d != 0).toList();
 
         Double averageDurationEasy = !easyDurations.isEmpty() ? easyDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null;
-        Double averageDurationMedium = !mediumDurations.isEmpty() ? mediumDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null;
-        Double averageDurationHard = !hardDurations.isEmpty() ? hardDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null;
+        Double averageDurationMedium = !mediumDurations.isEmpty() ? mediumDurations.stream().mapToDouble(v -> v).sum() / mediumDurations.size() : null;
+        Double averageDurationHard = !hardDurations.isEmpty() ? hardDurations.stream().mapToDouble(v -> v).sum() / hardDurations.size() : null;
 
         return new ScoreMap(averageDurationEasy, averageDurationMedium, averageDurationHard);
     }

diff --git a/...src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java b/...src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java
@@ -58,7 +58,7 @@ void getUserClassicStatisticsTest_whenAllStatisticsCalculable_returnCorrectValue
                 new ScoreMap(12.0, 3.0, 6.0),
                 new ScoreMap(7.0, 2.0, 1.0),
                 new ScoreMap(3632.0, 8578.0, 15833.0),
-                new ScoreMap(6866.285714285715, 3611.0, 2261.8571428571427)
+                new ScoreMap(6866.285714285715, 12638.5, 15833.0)
         );
 
         // When

diff --git a/frontend/src/components/Profile.tsx b/frontend/src/components/Profile.tsx
@@ -3,6 +3,7 @@ import { User } from "../types/User.ts";
 import axios from "axios";
 import { Statistics } from "../types/Statistics.ts";
 import { Statistic } from "./Statistic.tsx";
+import { Spinner } from "./Spinner.tsx";
 
 type PlayProps = {
   user: User;
@@ -36,7 +37,11 @@ export const Profile: React.FC<PlayProps> = ({ user }) => {
   }, [user]);
 
   if (user == null || !statistics) {
-    return <div>loading</div>;
+    return (
+      <div className="flex h-screen w-screen items-center justify-center">
+        <Spinner />
+      </div>
+    );
   }
 
   return (