Pārlūkot izejas kodu

changed controllers names

dagarcos 1 mēnesi atpakaļ
vecāks
revīzija
37c70973af

+ 1 - 1
src/main/java/es/uv/dagarcos/master/controller/EventDashboardController.java → src/main/java/es/uv/dagarcos/master/controller/DashboardEventController.java

@@ -15,7 +15,7 @@ import es.uv.dagarcos.master.service.EventDashboardService;
 @RestController
 @RequestMapping("/master/events")
 @CrossOrigin
-public class EventDashboardController {
+public class DashboardEventController {
 
     @Autowired
     private EventDashboardService eventService;

+ 1 - 1
src/main/java/es/uv/dagarcos/master/controller/PlayerDashboardController.java → src/main/java/es/uv/dagarcos/master/controller/DashboardPlayerController.java

@@ -11,7 +11,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/master/players")
 @CrossOrigin
-public class PlayerDashboardController {
+public class DashboardPlayerController {
 
     @Autowired
     private PlayerDashboardService service;

+ 1 - 1
src/main/java/es/uv/dagarcos/master/controller/RankingDashboardController.java → src/main/java/es/uv/dagarcos/master/controller/DashboardRankingController.java

@@ -15,7 +15,7 @@ import es.uv.dagarcos.master.service.RankingDashboardService;
 @RestController
 @RequestMapping("/master/rankings")
 @CrossOrigin
-public class RankingDashboardController {
+public class DashboardRankingController {
 
     @Autowired
     private RankingDashboardService rankingService;

+ 1 - 1
src/main/java/es/uv/dagarcos/master/controller/DashboardController.java → src/main/java/es/uv/dagarcos/master/controller/DashboardShardsController.java

@@ -17,7 +17,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/master")
 @CrossOrigin // importante para abrir la GUI desde file://
-public class DashboardController {
+public class DashboardShardsController {
 
     @Autowired
     private ShardDashboardService dashboardService;

+ 15 - 0
src/main/java/es/uv/dagarcos/master/repository/ShardPlayerStatsRepository.java

@@ -33,6 +33,7 @@ public interface ShardPlayerStatsRepository extends JpaRepository<ShardPlayerSta
     """)
     List<ShardPlayerStats> findByShardOrdered(@Param("shardId") String shardId);
 
+    /*
     @Query("""
         SELECT 
             sps.player.externalPlayerId,
@@ -42,6 +43,20 @@ public interface ShardPlayerStatsRepository extends JpaRepository<ShardPlayerSta
         FROM ShardPlayerStats sps
         GROUP BY sps.player.id
     """)
+    */
+    @Query(
+        value = """
+            SELECT
+                p.external_player_id,
+                COUNT(s.shard_id),
+                SUM(s.total_actions),
+                SUM(s.score)
+            FROM shard_player_stats s
+            JOIN players_global p ON s.player_id = p.id
+            GROUP BY p.external_player_id
+        """,
+        nativeQuery = true
+    )
     List<Object[]> aggregateGlobalPlayerStats();
 
     @Query("""

+ 0 - 1
src/main/java/es/uv/dagarcos/master/service/ShardDashboardService.java

@@ -3,7 +3,6 @@ package es.uv.dagarcos.master.service;
 import es.uv.dagarcos.master.dto.DashboardSummaryDto;
 import es.uv.dagarcos.master.dto.ShardEventTimeSeriesDto;
 import es.uv.dagarcos.master.dto.ShardOverviewDto;
-import es.uv.dagarcos.master.domain.Shard;
 import es.uv.dagarcos.master.repository.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;