Merge branch 'feature/ui-overhaul'

Flegma · Flegma · commit 228f503423b9 · 2026-02-19T15:00:40.000+01:00
# Conflicts:
#	hasura/fixtures/fixtures.sql
#	src/app.module.ts
#	src/fixtures/fixtures.controller.ts
#	src/fixtures/fixtures.module.ts
diff --git a/hasura/fixtures/fixtures.sql b/hasura/fixtures/fixtures.sql
diff --git a/hasura/functions/tournaments/schedule_tournament_match.sql b/hasura/functions/tournaments/schedule_tournament_match.sql
@@ -44,11 +44,11 @@ CREATE OR REPLACE FUNCTION public.schedule_tournament_match(bracket public.tourn
      INNER JOIN tournaments t ON t.id = ts.tournament_id
      WHERE tb.id = bracket.id;
 
-     -- Check if stage has match_options_id first, otherwise use tournament match_options_id
-     IF stage.match_options_id IS NOT NULL THEN
-         _match_options_id := stage.match_options_id;
-     ELSIF bracket.match_options_id IS NOT NULL THEN
+     -- Check bracket first (decider overrides), then stage, then tournament
+     IF bracket.match_options_id IS NOT NULL THEN
          _match_options_id := bracket.match_options_id;
+     ELSIF stage.match_options_id IS NOT NULL THEN
+         _match_options_id := stage.match_options_id;
      ELSE
          _match_options_id := tournament.match_options_id;
      END IF;
diff --git a/hasura/functions/tournaments/update_match_options_best_of.sql b/hasura/functions/tournaments/update_match_options_best_of.sql
@@ -6,6 +6,8 @@ DECLARE
     original_match_options_id uuid;
     match_options_record match_options%ROWTYPE;
     final_match_options_id uuid;
+    _decider_best_of int;
+    _effective_best_of int;
 BEGIN
     -- Get match_options_id from stage first, then tournament if stage doesn't have one
     SELECT COALESCE(
@@ -15,44 +17,59 @@ BEGIN
     FROM tournament_stages ts
     INNER JOIN tournaments t ON t.id = ts.tournament_id
     WHERE ts.id = _stage_id;
-    
+
     -- If no match_options_id found, return NULL
     IF original_match_options_id IS NULL THEN
         RETURN NULL;
     END IF;
-    
-    -- Get match_options record and check if best_of needs to be changed
+
+    -- Get match_options record
     SELECT * INTO match_options_record
     FROM match_options
     WHERE id = original_match_options_id;
-    
-    -- If best_of is 1, create a new match_options with best_of = 3
-    IF match_options_record.best_of = 1 THEN
-        match_options_record.best_of := 3;
-        -- Insert the modified record (id will be auto-generated)
-        INSERT INTO match_options (
-            overtime, knife_round, mr, best_of, coaches, number_of_substitutes,
-            map_veto, timeout_setting, tech_timeout_setting, map_pool_id, type,
-            regions, prefer_dedicated_server, invite_code, lobby_access,
-            region_veto, ready_setting, check_in_setting, default_models, tv_delay
-        ) VALUES (
-            match_options_record.overtime, match_options_record.knife_round, 
-            match_options_record.mr, match_options_record.best_of, 
-            match_options_record.coaches, match_options_record.number_of_substitutes,
-            match_options_record.map_veto, match_options_record.timeout_setting, 
-            match_options_record.tech_timeout_setting, match_options_record.map_pool_id, 
-            match_options_record.type, match_options_record.regions, 
-            match_options_record.prefer_dedicated_server, match_options_record.invite_code, 
-            match_options_record.lobby_access, match_options_record.region_veto, 
-            match_options_record.ready_setting, match_options_record.check_in_setting, 
-            match_options_record.default_models, match_options_record.tv_delay
-        )
-        RETURNING id INTO final_match_options_id;
+
+    -- Read decider_best_of from the stage
+    SELECT ts.decider_best_of INTO _decider_best_of
+    FROM tournament_stages ts WHERE ts.id = _stage_id;
+
+    -- Determine effective best_of for decider matches
+    IF _decider_best_of IS NOT NULL THEN
+        _effective_best_of := _decider_best_of;
     ELSE
-        final_match_options_id := original_match_options_id;
+        -- Legacy behavior: only BO1 -> BO3, others unchanged
+        IF match_options_record.best_of = 1 THEN
+            _effective_best_of := 3;
+        ELSE
+            RETURN original_match_options_id;
+        END IF;
     END IF;
-    
+
+    -- If target BO equals current BO, no clone needed
+    IF _effective_best_of = match_options_record.best_of THEN
+        RETURN original_match_options_id;
+    END IF;
+
+    -- Clone match_options with the new best_of
+    match_options_record.best_of := _effective_best_of;
+    INSERT INTO match_options (
+        overtime, knife_round, mr, best_of, coaches, number_of_substitutes,
+        map_veto, timeout_setting, tech_timeout_setting, map_pool_id, type,
+        regions, prefer_dedicated_server, invite_code, lobby_access,
+        region_veto, ready_setting, check_in_setting, default_models, tv_delay
+    ) VALUES (
+        match_options_record.overtime, match_options_record.knife_round,
+        match_options_record.mr, match_options_record.best_of,
+        match_options_record.coaches, match_options_record.number_of_substitutes,
+        match_options_record.map_veto, match_options_record.timeout_setting,
+        match_options_record.tech_timeout_setting, match_options_record.map_pool_id,
+        match_options_record.type, match_options_record.regions,
+        match_options_record.prefer_dedicated_server, match_options_record.invite_code,
+        match_options_record.lobby_access, match_options_record.region_veto,
+        match_options_record.ready_setting, match_options_record.check_in_setting,
+        match_options_record.default_models, match_options_record.tv_delay
+    )
+    RETURNING id INTO final_match_options_id;
+
     RETURN final_match_options_id;
 END;
 $$ LANGUAGE plpgsql;
-
diff --git a/hasura/functions/tournaments/update_tournament_stages.sql b/hasura/functions/tournaments/update_tournament_stages.sql
@@ -293,6 +293,62 @@ BEGIN
         ELSE
             RAISE NOTICE '  => Linking matches within stage %', stage."order";
             PERFORM link_tournament_stage_matches(stage.id);
+
+            -- SE decider: apply decider best_of to final and optionally create 3rd place match
+            IF stage.decider_best_of IS NOT NULL THEN
+                DECLARE
+                    _decider_match_options_id uuid;
+                    _final_bracket_id uuid;
+                    _third_place_id uuid;
+                    _semi_record RECORD;
+                BEGIN
+                    _decider_match_options_id := update_match_options_best_of(stage.id);
+
+                    -- Apply decider match_options to the final (last round, match 1)
+                    SELECT id INTO _final_bracket_id
+                    FROM tournament_brackets
+                    WHERE tournament_stage_id = stage.id
+                      AND path = 'WB'
+                      AND round = total_rounds
+                      AND match_number = 1
+                    LIMIT 1;
+
+                    IF _final_bracket_id IS NOT NULL AND _decider_match_options_id IS NOT NULL THEN
+                        UPDATE tournament_brackets
+                        SET match_options_id = _decider_match_options_id
+                        WHERE id = _final_bracket_id;
+
+                        RAISE NOTICE '  => SE decider: applied decider match_options to final bracket %', _final_bracket_id;
+                    END IF;
+
+                    -- Create 3rd place match if there are at least 2 rounds (semifinals exist)
+                    IF total_rounds >= 2 THEN
+                        INSERT INTO tournament_brackets (
+                            round, tournament_stage_id, match_number, "group", path, match_options_id
+                        ) VALUES (
+                            total_rounds, stage.id, 2, 1, 'WB', _decider_match_options_id
+                        )
+                        RETURNING id INTO _third_place_id;
+
+                        RAISE NOTICE '  => SE decider: created 3rd place bracket % in round %', _third_place_id, total_rounds;
+
+                        -- Set loser_parent_bracket_id on semifinal brackets to route losers to 3rd place match
+                        FOR _semi_record IN
+                            SELECT id FROM tournament_brackets
+                            WHERE tournament_stage_id = stage.id
+                              AND path = 'WB'
+                              AND round = total_rounds - 1
+                            ORDER BY match_number ASC
+                        LOOP
+                            UPDATE tournament_brackets
+                            SET loser_parent_bracket_id = _third_place_id
+                            WHERE id = _semi_record.id;
+
+                            RAISE NOTICE '  => SE decider: set semifinal % loser -> 3rd place %', _semi_record.id, _third_place_id;
+                        END LOOP;
+                    END IF;
+                END;
+            END IF;
         END IF;
     END LOOP;
 
diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
@@ -215,6 +215,10 @@ type Mutation {
   ): SuccessOutput
 }
 
+type Mutation {
+  refreshAllPlayers: SuccessOutput
+}
+
 type Query {
   readServerFile(
     node_id: String!
@@ -330,6 +334,36 @@ type Mutation {
   ): SuccessOutput
 }
 
+type Query {
+  getLeaderboard(
+    category: String!
+    window_days: Int!
+    match_type: String
+    limit: Int
+    offset: Int
+    exclude_tournaments: Boolean
+    sort_by: String
+    sort_dir: String
+  ): LeaderboardResponse!
+}
+
+type LeaderboardResponse {
+  entries: [LeaderboardEntry!]!
+  total: Int!
+}
+
+type LeaderboardEntry {
+  rank: Int!
+  player_steam_id: String!
+  player_name: String!
+  player_avatar_url: String
+  player_country: String
+  value: Float!
+  secondary_value: Float
+  tertiary_value: Float
+  matches_played: Int
+}
+
 input SampleInput {
   username: String!
   password: String!
diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml
@@ -304,6 +304,14 @@ actions:
     permissions:
       - role: administrator
     comment: Read file content from game server
+  - name: refreshAllPlayers
+    definition:
+      kind: synchronous
+      handler: '{{HASURA_GRAPHQL_ACTIONS_HOOK}}'
+      forward_client_headers: true
+    permissions:
+      - role: administrator
+    comment: Refresh all players in Typesense index
   - name: registerName
     definition:
       kind: synchronous
@@ -435,6 +443,14 @@ actions:
     permissions:
       - role: administrator
     comment: Write content to file on game server
+  - name: getLeaderboard
+    definition:
+      kind: ""
+      handler: '{{HASURA_GRAPHQL_ACTIONS_HOOK}}'
+      forward_client_headers: true
+    permissions:
+      - role: guest
+    comment: Get leaderboard rankings by category and time window
 custom_types:
   enums: []
   input_objects:
@@ -488,4 +504,6 @@ custom_types:
     - name: StorageStats
     - name: StorageSummary
     - name: TableSizeInfo
+    - name: LeaderboardResponse
+    - name: LeaderboardEntry
   scalars: []
diff --git a/hasura/metadata/databases/default/tables/public_player_elo.yaml b/hasura/metadata/databases/default/tables/public_player_elo.yaml
@@ -31,6 +31,6 @@ event_triggers:
         columns: '*'
     retry_conf:
       interval_sec: 10
-      num_retries: 0
+      num_retries: 6
       timeout_sec: 60
     webhook: '{{HASURA_GRAPHQL_EVENT_HOOK}}'
diff --git a/hasura/metadata/databases/default/tables/public_player_sanctions.yaml b/hasura/metadata/databases/default/tables/public_player_sanctions.yaml
@@ -64,6 +64,6 @@ event_triggers:
           - type
     retry_conf:
       interval_sec: 10
-      num_retries: 0
+      num_retries: 6
       timeout_sec: 60
     webhook: '{{HASURA_GRAPHQL_EVENT_HOOK}}'
diff --git a/hasura/metadata/databases/default/tables/public_team_roster.yaml b/hasura/metadata/databases/default/tables/public_team_roster.yaml
@@ -78,6 +78,6 @@ event_triggers:
         columns: '*'
     retry_conf:
       interval_sec: 10
-      num_retries: 0
+      num_retries: 6
       timeout_sec: 60
     webhook: '{{HASURA_GRAPHQL_EVENT_HOOK}}'
diff --git a/hasura/metadata/databases/default/tables/public_tournament_stages.yaml b/hasura/metadata/databases/default/tables/public_tournament_stages.yaml
@@ -42,6 +42,7 @@ insert_permissions:
           is_organizer:
             _eq: true
       columns:
+        - decider_best_of
         - groups
         - match_options_id
         - max_teams
@@ -55,6 +56,7 @@ select_permissions:
   - role: guest
     permission:
       columns:
+        - decider_best_of
         - groups
         - id
         - match_options_id
@@ -71,6 +73,7 @@ update_permissions:
   - role: user
     permission:
       columns:
+        - decider_best_of
         - groups
         - match_options_id
         - max_teams
diff --git a/hasura/migrations/default/1770700000000_add_decider_best_of_to_tournament_stages/down.sql b/hasura/migrations/default/1770700000000_add_decider_best_of_to_tournament_stages/down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."tournament_stages"
+DROP COLUMN IF EXISTS "decider_best_of";
diff --git a/hasura/migrations/default/1770700000000_add_decider_best_of_to_tournament_stages/up.sql b/hasura/migrations/default/1770700000000_add_decider_best_of_to_tournament_stages/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."tournament_stages"
+ADD COLUMN IF NOT EXISTS "decider_best_of" integer NULL;
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -43,6 +43,7 @@ import { K8sModule } from "./k8s/k8s.module";
 import { FileManagerModule } from "./file-manager/file-manager.module";
 import { BrandingModule } from "./branding/branding.module";
 import { FixturesModule } from "./fixtures/fixtures.module";
+import { LeaderboardModule } from "./leaderboard/leaderboard.module";
 
 @Module({
   imports: [
@@ -126,6 +127,7 @@ import { FixturesModule } from "./fixtures/fixtures.module";
     FileManagerModule,
     BrandingModule,
     FixturesModule,
+    LeaderboardModule,
   ],
   providers: [loggerFactory()],
   controllers: [AppController, QuickConnectController],
diff --git a/src/fixtures/fixtures.controller.ts b/src/fixtures/fixtures.controller.ts
diff --git a/src/fixtures/fixtures.module.ts b/src/fixtures/fixtures.module.ts
diff --git a/src/leaderboard/leaderboard.controller.ts b/src/leaderboard/leaderboard.controller.ts
diff --git a/src/leaderboard/leaderboard.module.ts b/src/leaderboard/leaderboard.module.ts
diff --git a/src/type-sense/type-sense.controller.ts b/src/type-sense/type-sense.controller.ts
