checkin: simplify call to get checkin hits since time

Author: jannispl

types/checkins/database_hits.go

@@ -26,6 +26,11 @@ func (h CheckinHitters) Count() int {
 	return count
 }
 
+func (h CheckinHitters) Since(t time.Time) CheckinHitters {
+	timestamp := db.FormatTime(t)
+	return CheckinHitters{h.db.Where("checkin_hits.created_at > ?", timestamp)}
+}
+
 func (c *Checkin) LastHit() *CheckinHit {
 	var hit CheckinHit
 	dbHits.Where("checkin = ?", c.Id).Last(&hit)
@@ -57,8 +62,3 @@ func (c *CheckinHit) Delete() error {
 func AllCheckinHits(serviceId int64) CheckinHitters {
 	return CheckinHitters{dbHits.Joins("JOIN checkins ON checkins.id = checkin").Where("checkins.service = ?", serviceId).Order("checkin_hits.id DESC")}
 }
-
-func CheckinHitsSince(serviceId int64, t time.Time) CheckinHitters {
-	timestamp := db.FormatTime(t)
-	return CheckinHitters{AllCheckinHits(serviceId).db.Where("checkin_hits.created_at > ?", timestamp)}
-}

types/services/hits.go

@@ -34,7 +34,3 @@ func (s *Service) FirstCheckinHit() *checkins.CheckinHit {
 func (s *Service) HitsSince(t time.Time) hits.Hitters {
 	return hits.Since(t, s)
 }
-
-func (s *Service) CheckinHitsSince(t time.Time) checkins.CheckinHitters {
-	return checkins.CheckinHitsSince(s.Id, t)
-}

types/services/methods.go

@@ -278,7 +278,7 @@ func (s Service) OnlineDaysPercent(days int) float32 {
 func (s *Service) OnlineSince(ago time.Time) float32 {
 	failsCount := s.FailuresSince(ago).Count()
 	hitsCount := s.HitsSince(ago).Count()
-	checkinHitsCount := s.CheckinHitsSince(ago).Count()
+	checkinHitsCount := s.AllCheckinHits().Since(ago).Count()
 
 	if failsCount == 0 {
 		s.Online24Hours = 100.00