fix bug with 0 best rank

This commit is contained in:
Dawid Wysokiński 2020-07-25 12:32:12 +02:00 committed by Kichiyaki
parent 73eb7114c7
commit df1c27e277
2 changed files with 6 additions and 6 deletions

View File

@ -36,7 +36,7 @@ func Attach(c *cron.Cron, db *pg.DB) error {
if _, err := c.AddFunc("0 * * * *", h.updateServersData); err != nil {
return err
}
if _, err := c.AddFunc("30 0 * * *", h.updateServersHistory); err != nil {
if _, err := c.AddFunc("30 0 * * *", h.updateServerHistories); err != nil {
return err
}
if _, err := c.AddFunc("30 1 * * *", h.vacuumDatabase); err != nil {
@ -48,7 +48,7 @@ func Attach(c *cron.Cron, db *pg.DB) error {
go func() {
h.updateServersData()
h.vacuumDatabase()
h.updateServersHistory()
h.updateServerHistories()
h.updateStats()
}()
@ -232,7 +232,7 @@ func (h *handler) updateServersData() {
}
}
func (h *handler) updateServersHistory() {
func (h *handler) updateServerHistories() {
servers := []*models.Server{}
now := time.Now()
t1 := time.Date(now.Year(), now.Month(), now.Day(), 0, 30, 0, 0, time.UTC)
@ -241,7 +241,7 @@ func (h *handler) updateServersHistory() {
Where("status = ? AND (history_updated_at < ? OR history_updated_at IS NULL)", models.ServerStatusOpen, t1).
Select()
if err != nil {
log.Println(errors.Wrap(err, "updateServersHistory"))
log.Println(errors.Wrap(err, "updateServerHistories"))
return
}

View File

@ -125,7 +125,7 @@ const (
NEW.most_villages = NEW.total_villages;
NEW.most_villages_at = now();
END IF;
IF NEW.best_rank IS null OR NEW.rank < NEW.best_rank THEN
IF NEW.best_rank IS null OR NEW.rank < NEW.best_rank OR NEW.best_rank = 0 THEN
NEW.best_rank = NEW.rank;
NEW.best_rank_at = now();
END IF;
@ -147,7 +147,7 @@ const (
NEW.most_villages = NEW.total_villages;
NEW.most_villages_at = now();
END IF;
IF NEW.best_rank IS null OR NEW.rank < OLD.best_rank THEN
IF NEW.best_rank IS null OR NEW.rank < OLD.best_rank OR OLD.best_rank = 0 THEN
NEW.best_rank = NEW.rank;
NEW.best_rank_at = now();
END IF;