From 4f4f35f97e6a3ac3b0e2cb51873cc1e756e9a5e8 Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Wed, 21 Feb 2024 19:28:47 +0300
Subject: [PATCH] extra more

---
 .../java/app/controllers/user/ProfileController.java     | 9 +++++----
 src/main/java/app/services/ProfileService.java           | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/app/controllers/user/ProfileController.java b/src/main/java/app/controllers/user/ProfileController.java
index 30a1f67..bfa43df 100644
--- a/src/main/java/app/controllers/user/ProfileController.java
+++ b/src/main/java/app/controllers/user/ProfileController.java
@@ -1,6 +1,7 @@
 package app.controllers.user;
 
 import app.annotations.enums.AuthMethod;
+import app.annotations.enums.CollectStages;
 import app.annotations.interfaces.*;
 import app.entities.SocialAuth;
 import app.services.ProfileService;
@@ -40,7 +41,7 @@ public class ProfileController {
     @BurstUpdatePlayers
     @WaitAfterNext(order = "currentuser")
     @ShowClientIP
-    @CollectStatistic
+    @CollectStatistic(stage = CollectStages.COMBINED)
     public ResponseEntity GetCurrentUser(HttpServletRequest request,
                                          @CookieValue(value = "steam64", defaultValue = "") String steam64,
                                          @RequestParam(value = "requests", defaultValue = "") String requests
@@ -55,7 +56,7 @@ public class ProfileController {
     @PostMapping("/freevip")
     @CheckWebAccess
     @WaitAfterNext(order = "freevip")
-    @CollectStatistic
+    @CollectStatistic(stage = CollectStages.COMBINED)
     public ResponseEntity GetFreeVIP(HttpServletRequest request,
                                      @CookieValue(value = "steam64", defaultValue = "") String steam64,
                                      @RequestBody(required = false) SocialAuth socialAuth,
@@ -71,7 +72,7 @@ public class ProfileController {
     @CheckWebAccess
     @BurstUpdatePlayers
     @WaitAfterNext(order = "report")
-    @CollectStatistic
+    @CollectStatistic(stage = CollectStages.COMBINED)
     public ResponseEntity<Long> ReportUser(HttpServletRequest request,
                                               @CookieValue(value = "steam64", defaultValue = "") String steam64,
                                               @RequestParam(value = "steam64", defaultValue = "") String reported_steam64,
@@ -87,7 +88,7 @@ public class ProfileController {
     }
 
     @GetMapping("/buyvip")
-    @CollectStatistic
+    @CollectStatistic(stage = CollectStages.COMBINED)
     public ResponseEntity BuyVIP(HttpServletRequest request,
                                     @RequestParam(value = "steam64", defaultValue = "") String steam64,
                                     @RequestParam String buy_type,
diff --git a/src/main/java/app/services/ProfileService.java b/src/main/java/app/services/ProfileService.java
index 5012ca1..961c9fd 100644
--- a/src/main/java/app/services/ProfileService.java
+++ b/src/main/java/app/services/ProfileService.java
@@ -69,7 +69,7 @@ public class ProfileService {
     }
 
     public PlayerProfile GetProfile(String steam64, List<String> requests) {
-        final int requests_pool = 16;
+        final int requests_pool = 4;
         ExecutorService executor = Executors.newFixedThreadPool(requests_pool);
         Set<Callable<Supplier>> callables = new HashSet<>(requests_pool);
 
@@ -77,7 +77,6 @@ public class ProfileService {
         profile.setResponse_time(new HashMap<>());
         SteamID steamID = SteamIDConverter.getSteamID(steam64);
         profile.setSteamids(steamID);
-        Long start_time_total = Instant.now().toEpochMilli();
 
 
         callables.add(() -> {
@@ -192,7 +191,9 @@ public class ProfileService {
                 return null;
             });
         //}
+        long start_time_total = 0;
         try {
+            start_time_total = Instant.now().toEpochMilli();
             executor.invokeAll(callables);
         } catch (InterruptedException ie) {}
         finally {