From 237f870abcee554eb6e50ddf006dbe4bf80ba1ab Mon Sep 17 00:00:00 2001
From: Kichiyaki <xyztojajestem@gmail.com>
Date: Wed, 15 Jul 2020 10:19:11 +0200
Subject: [PATCH] fix typo, add a new constant - serverPGDefaulValues

---
 cron/handler.go                       |  9 +++++++++
 cron/sql_statements.go                | 12 ++++++++++++
 cron/update_server_history_handler.go |  3 +++
 cron/vacuum_server_db_handler.go      | 12 ++++++------
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/cron/handler.go b/cron/handler.go
index 5ceb09a..7d1a227 100644
--- a/cron/handler.go
+++ b/cron/handler.go
@@ -79,6 +79,14 @@ func (h *handler) init() error {
 		}
 	}
 
+	for _, statement := range []string{
+		pgDefaultValues,
+	} {
+		if _, err := tx.Exec(statement); err != nil {
+			return err
+		}
+	}
+
 	return tx.Commit()
 }
 
@@ -118,6 +126,7 @@ func (h *handler) createSchema(server *models.Server) error {
 	for _, statement := range []string{
 		serverPGFunctions,
 		serverPGTriggers,
+		serverPGDefaultValues,
 	} {
 		if _, err := tx.Exec(statement, pg.Safe(server.Key), server.LangVersionTag); err != nil {
 			return err
diff --git a/cron/sql_statements.go b/cron/sql_statements.go
index e0858d6..2309393 100644
--- a/cron/sql_statements.go
+++ b/cron/sql_statements.go
@@ -241,4 +241,16 @@ const (
 			FOR EACH ROW
 			EXECUTE PROCEDURE check_most_points_most_villages_best_rank_values();
 	`
+
+	serverPGDefaultValues = `
+		ALTER TABLE ?0.daily_player_stats ALTER COLUMN create_date set default CURRENT_DATE;
+		ALTER TABLE ?0.daily_tribe_stats ALTER COLUMN create_date set default CURRENT_DATE;
+		ALTER TABLE ?0.player_history ALTER COLUMN create_date set default CURRENT_DATE;
+		ALTER TABLE ?0.tribe_history ALTER COLUMN create_date set default CURRENT_DATE;
+		ALTER TABLE ?0.stats ALTER COLUMN create_date set default CURRENT_DATE;
+	`
+
+	pgDefaultValues = `
+		ALTER TABLE player_name_changes ALTER COLUMN change_date set default CURRENT_DATE;
+	`
 )
diff --git a/cron/update_server_history_handler.go b/cron/update_server_history_handler.go
index 20f51f0..073ec79 100644
--- a/cron/update_server_history_handler.go
+++ b/cron/update_server_history_handler.go
@@ -19,6 +19,7 @@ func (h *updateServerHistoryHandler) update() error {
 		return errors.Wrap(err, "cannot load players")
 	}
 
+	createDate := time.Now()
 	ph := []*models.PlayerHistory{}
 	for _, player := range players {
 		ph = append(ph, &models.PlayerHistory{
@@ -28,6 +29,7 @@ func (h *updateServerHistoryHandler) update() error {
 			Points:            player.Points,
 			Rank:              player.Rank,
 			TribeID:           player.TribeID,
+			CreateDate:        createDate,
 		})
 	}
 
@@ -46,6 +48,7 @@ func (h *updateServerHistoryHandler) update() error {
 			AllPoints:         tribe.AllPoints,
 			Rank:              tribe.Rank,
 			Dominance:         tribe.Dominance,
+			CreateDate:        createDate,
 		})
 	}
 
diff --git a/cron/vacuum_server_db_handler.go b/cron/vacuum_server_db_handler.go
index 9b7172d..2cc8a41 100644
--- a/cron/vacuum_server_db_handler.go
+++ b/cron/vacuum_server_db_handler.go
@@ -19,11 +19,11 @@ func (h *vacuumServerDBHandler) vacuum() error {
 	}
 	defer tx.Close()
 
-	withNotExitedPlayers := h.db.Model(&models.Player{}).Where("exists = false")
-	withNotExitedTribes := h.db.Model(&models.Tribe{}).Where("exists = false")
+	withNotExistedPlayers := h.db.Model(&models.Player{}).Where("exists = false")
+	withNotExistedTribes := h.db.Model(&models.Tribe{}).Where("exists = false")
 
 	_, err = tx.Model(&models.PlayerHistory{}).
-		With("players", withNotExitedPlayers).
+		With("players", withNotExistedPlayers).
 		Where("player_id IN (Select id FROM players) OR player_history.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
 		Delete()
 	if err != nil {
@@ -31,7 +31,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
 	}
 
 	_, err = tx.Model(&models.TribeHistory{}).
-		With("tribes", withNotExitedTribes).
+		With("tribes", withNotExistedTribes).
 		Where("tribe_id IN (Select id FROM tribes) OR tribe_history.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
 		Delete()
 	if err != nil {
@@ -39,7 +39,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
 	}
 
 	_, err = tx.Model(&models.DailyPlayerStats{}).
-		With("players", withNotExitedPlayers).
+		With("players", withNotExistedPlayers).
 		Where("player_id IN (Select id FROM players) OR daily_player_stats.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
 		Delete()
 	if err != nil {
@@ -47,7 +47,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
 	}
 
 	_, err = tx.Model(&models.DailyTribeStats{}).
-		With("tribes", withNotExitedTribes).
+		With("tribes", withNotExistedTribes).
 		Where("tribe_id IN (Select id FROM tribes) OR daily_tribe_stats.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
 		Delete()
 	if err != nil {