From 3e4b90a1bd54f1e174e07d87c67cc35c51519a38 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Thu, 3 Nov 2022 03:39:22 +0100
Subject: [PATCH] some formatting fixes

---
 main.go        | 36 ++++++++++++++++++++++++++++--------
 utils/utils.go |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/main.go b/main.go
index 7506ce5..063b447 100644
--- a/main.go
+++ b/main.go
@@ -37,7 +37,6 @@ import (
 	"time"
 )
 
-//goland:noinspection ALL
 var (
 	conf           = utils.Conf{}
 	demoLoader     = &csgo.DemoMatchLoader{}
@@ -91,20 +90,34 @@ func housekeeping() {
 		}
 
 		// mark matches as vac/gameban
-		bPlayers, err := db.Player.Query().Select(player.FieldID, player.FieldGameBanDate, player.FieldVacDate).Where(player.Or(player.GameBanDateNotNil(), player.VacDateNotNil())).All(context.Background())
+		bPlayers, err := db.Player.Query().
+			Select(player.FieldID, player.FieldGameBanDate, player.FieldVacDate).
+			Where(player.Or(player.GameBanDateNotNil(), player.VacDateNotNil())).
+			All(context.Background())
 		if err != nil {
 			log.Warningf("[HK] Unable to query for banned players: %v", err)
 		}
 
 		for _, bp := range bPlayers {
 			if !bp.GameBanDate.IsZero() {
-				err := db.Match.Update().Where(match.And(match.HasPlayersWith(player.ID(bp.ID)), match.DateLTE(bp.GameBanDate.AddDate(0, 0, 30)))).SetGamebanPresent(true).Exec(context.Background())
+				err := db.Match.Update().
+					Where(
+						match.And(
+							match.HasPlayersWith(player.ID(bp.ID)),
+							match.DateLTE(bp.GameBanDate.AddDate(0, 0, 30)),
+						)).
+					SetGamebanPresent(true).Exec(context.Background())
 				if err != nil {
 					log.Warningf("[HK] Unable to set gameban/vac for match: %v", err)
 				}
 			}
 			if !bp.VacDate.IsZero() {
-				err := db.Match.Update().Where(match.And(match.HasPlayersWith(player.ID(bp.ID)), match.DateLTE(bp.VacDate.AddDate(0, 0, 30)))).SetVacPresent(true).Exec(context.Background())
+				err := db.Match.Update().
+					Where(
+						match.And(
+							match.HasPlayersWith(player.ID(bp.ID)),
+							match.DateLTE(bp.VacDate.AddDate(0, 0, 30)),
+						)).SetVacPresent(true).Exec(context.Background())
 				if err != nil {
 					log.Warningf("[HK] Unable to set gameban/vac for match: %v", err)
 				}
@@ -112,7 +125,12 @@ func housekeeping() {
 		}
 
 		// try parsing demos not parsed
-		tMatches, err := db.Match.Query().Where(match.And(match.DateGT(time.Now().UTC().AddDate(0, 0, -1*conf.Csgowtfd.DemosExpire)), match.DemoParsed(false))).All(context.Background())
+		tMatches, err := db.Match.Query().
+			Where(
+				match.And(
+					match.DateGT(time.Now().UTC().AddDate(0, 0, -1*conf.Csgowtfd.DemosExpire)),
+					match.DemoParsed(false))).
+			All(context.Background())
 		if err != nil {
 			log.Warningf("[HK] Failure getting matches to retry parsing: %v", err)
 			continue
@@ -133,20 +151,22 @@ func housekeeping() {
 
 		// check for inconsistent matches
 		tMatchIDs, err := db.Match.Query().IDs(context.Background())
-
 		for _, mid := range tMatchIDs {
 			var v []struct {
 				ID    int `json:"match_stats"`
 				Count int `json:"count"`
 			}
 
-			err = db.MatchPlayer.Query().Where(matchplayer.MatchStats(mid)).GroupBy(matchplayer.FieldMatchStats).Aggregate(ent.Count()).Scan(context.Background(), &v)
+			err = db.MatchPlayer.Query().
+				Where(matchplayer.MatchStats(mid)).
+				GroupBy(matchplayer.FieldMatchStats).
+				Aggregate(ent.Count()).
+				Scan(context.Background(), &v)
 			if err != nil {
 				log.Warningf("[HK] Unable to query for matchplayers for match %d: %v", mid, err)
 				continue
 			}
 
-			log.Debugf("%+v", v)
 			if v[0].Count < 10 {
 				log.Warningf("[HK] Found match without all players, try to reload it.")
 				tMatch, err := db.Match.Get(context.Background(), mid)
diff --git a/utils/utils.go b/utils/utils.go
index cccba82..f2885e5 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -278,7 +278,7 @@ func GetMetaStats(dbPlayer *ent.Player) (*MetaStatsResponse, error) {
 		pMatches, err := s.QueryMatches().
 			Select(match.FieldID, match.FieldMatchResult, match.FieldMap).
 			Where(match.IDIn(matchIDs...)).
-			WithStats().
+			WithStats(). // TODO: limit fields returned
 			Where(match.HasStatsWith(matchplayer.Or(matchplayer.PlayerStats(dbPlayer.ID), matchplayer.PlayerStats(s.ID)))).
 			All(context.Background())
 		if err != nil {