fix: summary caching (resolve #211)

main.go

@@ -115,6 +115,7 @@ func main() {
 	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger})
 	if config.Db.Dialect == "sqlite3" {
 		db.Raw("PRAGMA foreign_keys = ON;")
+		db.DisableForeignKeyConstraintWhenMigrating = true
 	}
 
 	if config.IsDev() {

models/project_label.go

@@ -3,7 +3,7 @@ package models
 type ProjectLabel struct {
 	ID         uint   `json:"id" gorm:"primary_key"`
 	User       *User  `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
-	UserID     string `json:"-" gorm:"not null; index:idx_language_mapping_user; index:idx_project_label_user"`
+	UserID     string `json:"-" gorm:"not null; index:idx_project_label_user"`
 	ProjectKey string `json:"project"`
 	Label      string `json:"label" gorm:"type:varchar(64)"`
 }

routes/compat/wakatime/v1/summaries.go

@@ -121,17 +121,16 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	end = utils.EndOfDay(end).Add(-1 * time.Second)
 
 	overallParams := &models.SummaryParams{
-		From:      start,
+		From: start,
-		To:        end,
+		To:   end,
-		User:      user,
+		User: user,
-		Recompute: false,
 	}
 
 	intervals := utils.SplitRangeByDays(overallParams.From, overallParams.To)
 	summaries := make([]*models.Summary, len(intervals))
 
 	for i, interval := range intervals {
-		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, false)
+		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, end.After(time.Now()))
 		if err != nil {
 			return nil, err, http.StatusInternalServerError
 		}

services/summary.go

@@ -73,12 +73,6 @@ func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f Summ
 }
 
 func (srv *SummaryService) Retrieve(from, to time.Time, user *models.User) (*models.Summary, error) {
-	// Check cache
-	cacheKey := srv.getHash(from.String(), to.String(), user.ID)
-	if cacheResult, ok := srv.cache.Get(cacheKey); ok {
-		return cacheResult.(*models.Summary), nil
-	}
-
 	// Get all already existing, pre-generated summaries that fall into the requested interval
 	summaries, err := srv.repository.GetByUserWithin(user, from, to)
 	if err != nil {
@@ -101,8 +95,6 @@ func (srv *SummaryService) Retrieve(from, to time.Time, user *models.User) (*mod
 		return nil, err
 	}
 
-	// Cache 'em
-	srv.cache.SetDefault(cacheKey, summary)
 	return summary.Sorted(), nil
 }
 

version.txt

@@ -1 +1 @@
-1.28.0
+1.28.2