bugs: multiple bugs related to tournaments and recent features (#144)

5stackgg/5stack-panel#341 5stackgg/5stack-panel#348 5stackgg/5stack-panel#355 5stackgg/5stack-panel#364 5stackgg/5stack-panel#350 5stackgg/5stack-panel#368

Author: lukepolo

generated/schema.graphql

@@ -487,6 +487,7 @@ select_permissions:
         - organizer_steam_id
         - region
         - scheduled_at
+        - server_error
         - server_id
         - started_at
         - status
@@ -539,6 +540,7 @@ select_permissions:
         - organizer_steam_id
         - region
         - scheduled_at
+        - server_error
         - server_id
         - started_at
         - status

generated/schema.ts

@@ -0,0 +1 @@
+alter table "public"."matches" drop column "server_error";

generated/types.ts

@@ -0,0 +1 @@
+alter table "public"."matches" add column if not exists "server_error" text null;

hasura/metadata/databases/default/tables/public_matches.yaml

@@ -194,4 +194,23 @@ END;
 $$;
 
 DROP TRIGGER IF EXISTS tad_match_options ON public.match_options;
-CREATE TRIGGER tad_match_options AFTER DELETE ON public.match_options FOR EACH ROW EXECUTE FUNCTION public.tad_match_options();
+CREATE TRIGGER tad_match_options AFTER DELETE ON public.match_options FOR EACH ROW EXECUTE FUNCTION public.tad_match_options();
+
+CREATE OR REPLACE FUNCTION public.cleanup_orphaned_match_options(target_id uuid)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    IF target_id IS NULL THEN
+        RETURN;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM public.matches             WHERE match_options_id = target_id)
+       AND NOT EXISTS (SELECT 1 FROM public.tournaments         WHERE match_options_id = target_id)
+       AND NOT EXISTS (SELECT 1 FROM public.tournament_stages   WHERE match_options_id = target_id)
+       AND NOT EXISTS (SELECT 1 FROM public.tournament_brackets WHERE match_options_id = target_id)
+    THEN
+        DELETE FROM public.match_options WHERE id = target_id;
+    END IF;
+END;
+$$;

hasura/migrations/default/1776384375251_alter_table_public_matches_add_column_server_error/down.sql

@@ -2,7 +2,6 @@ CREATE OR REPLACE FUNCTION public.tbi_match() RETURNS TRIGGER
     LANGUAGE plpgsql
     AS $$
 DECLARE
-    lan_match BOOLEAN;
     _lineup_1_id UUID;
     _lineup_2_id UUID;
     _regions text[];
@@ -39,17 +38,24 @@ BEGIN
     SELECT regions INTO _regions FROM match_options WHERE id = NEW.match_options_id;
 
     IF array_length(_regions, 1) != 0 THEN
-        SELECT array_agg(sr.value) INTO available_regions 
+        SELECT array_agg(sr.value) INTO available_regions
         FROM server_regions sr
         WHERE sr.value = ANY(_regions)
-        AND total_region_server_count(sr) > 0;
+        AND region_status(sr) != 'Disabled';
     ELSE
-        SELECT array_agg(sr.value) INTO available_regions 
+        SELECT array_agg(sr.value) INTO available_regions
         FROM server_regions sr
-        WHERE total_region_server_count(sr) > 0
+        WHERE region_status(sr) != 'Disabled'
         and sr.is_lan = false;
     END IF;
 
+    -- Fallback: if nothing matched above (e.g. LAN-only)
+    IF available_regions IS NULL OR array_length(available_regions, 1) = 0 THEN
+        SELECT array_agg(sr.value) INTO available_regions
+        FROM server_regions sr
+        WHERE region_status(sr) != 'Disabled';
+    END IF;
+
     IF array_length(available_regions, 1) = 1 THEN
         NEW.region = available_regions[1];
     END IF;
@@ -377,15 +383,7 @@ CREATE OR REPLACE FUNCTION public.tad_matches() RETURNS TRIGGER
     LANGUAGE plpgsql
     AS $$
 BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM tournaments
-        WHERE match_options_id = OLD.match_options_id
-    )
-    THEN
-        DELETE FROM match_options
-        WHERE id = OLD.match_options_id;
-    END IF;
+    PERFORM cleanup_orphaned_match_options(OLD.match_options_id);
 
     update servers set reserved_by_match_id = null where reserved_by_match_id = OLD.id;
 

hasura/migrations/default/1776384375251_alter_table_public_matches_add_column_server_error/up.sql

@@ -17,4 +17,20 @@ END;
 $$;
 
 DROP TRIGGER IF EXISTS tai_player_assists ON public.player_assists;
-CREATE TRIGGER tai_player_assists AFTER INSERT ON public.player_assists FOR EACH ROW EXECUTE FUNCTION public.tai_player_assists();
+CREATE TRIGGER tai_player_assists AFTER INSERT ON public.player_assists FOR EACH ROW EXECUTE FUNCTION public.tai_player_assists();
+
+CREATE OR REPLACE FUNCTION public.tad_player_assists()
+RETURNS trigger
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    UPDATE player_stats
+       SET assists = GREATEST(assists - 1, 0)
+     WHERE player_steam_id = OLD.attacker_steam_id;
+
+    RETURN OLD;
+END;
+$$;
+
+DROP TRIGGER IF EXISTS tad_player_assists ON public.player_assists;
+CREATE TRIGGER tad_player_assists AFTER DELETE ON public.player_assists FOR EACH ROW EXECUTE FUNCTION public.tad_player_assists();

hasura/triggers/match_options.sql

@@ -37,4 +37,41 @@ END;
 $$;
 
 DROP TRIGGER IF EXISTS tai_player_kills ON public.player_kills;
-CREATE TRIGGER tai_player_kills AFTER INSERT ON public.player_kills FOR EACH ROW EXECUTE FUNCTION public.tai_player_kills();
+CREATE TRIGGER tai_player_kills AFTER INSERT ON public.player_kills FOR EACH ROW EXECUTE FUNCTION public.tai_player_kills();
+
+CREATE OR REPLACE FUNCTION public.tad_player_kills()
+RETURNS trigger
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    UPDATE player_kills_by_weapon
+       SET kill_count = kill_count - 1
+     WHERE player_steam_id = OLD.attacker_steam_id AND "with" = OLD."with";
+
+    DELETE FROM player_kills_by_weapon
+     WHERE player_steam_id = OLD.attacker_steam_id
+       AND "with" = OLD."with"
+       AND kill_count <= 0;
+
+    -- attacker: kills + headshots
+    UPDATE player_stats
+       SET kills = GREATEST(kills - 1, 0),
+           headshots = GREATEST(headshots - CASE WHEN OLD.headshot THEN 1 ELSE 0 END, 0),
+           headshot_percentage = CASE
+             WHEN GREATEST(kills - 1, 0) = 0 THEN 0
+             ELSE GREATEST(headshots - CASE WHEN OLD.headshot THEN 1 ELSE 0 END, 0)::float
+                  / GREATEST(kills - 1, 0)
+           END
+     WHERE player_steam_id = OLD.attacker_steam_id;
+
+    -- victim: deaths
+    UPDATE player_stats
+       SET deaths = GREATEST(deaths - 1, 0)
+     WHERE player_steam_id = OLD.attacked_steam_id;
+
+    RETURN OLD;
+END;
+$$;
+
+DROP TRIGGER IF EXISTS tad_player_kills ON public.player_kills;
+CREATE TRIGGER tad_player_kills AFTER DELETE ON public.player_kills FOR EACH ROW EXECUTE FUNCTION public.tad_player_kills();