chore: retry summary insertion in case of duplicate key errors (see #877)

muety · muety · commit fa5c4cfe2777 · 2025-12-12T17:31:57.000+01:00
diff --git a/coverage/coverage.out b/coverage/coverage.out
diff --git a/main.go b/main.go
@@ -141,7 +141,11 @@ func main() {
 	// Connect to database
 	var err error
 	slog.Info("starting with database", "dialect", config.Db.Dialect)
-	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger}, conf.GetWakapiDBOpts(&config.Db))
+	db, err = gorm.Open(
+		config.Db.GetDialector(),
+		&gorm.Config{Logger: gormLogger, TranslateError: true},
+		conf.GetWakapiDBOpts(&config.Db),
+	)
 	if err != nil {
 		conf.Log().Fatal("could not connect to database", "error", err)
 	}
diff --git a/mocks/summary_repository.go b/mocks/summary_repository.go
@@ -1,9 +1,10 @@
 package mocks
 
 import (
+	"time"
+
 	"github.com/muety/wakapi/models"
 	"github.com/stretchr/testify/mock"
-	"time"
 )
 
 type SummaryRepositoryMock struct {
@@ -16,6 +17,11 @@ func (m *SummaryRepositoryMock) Insert(s *models.Summary) error {
 	return args.Error(0)
 }
 
+func (m *SummaryRepositoryMock) InsertWithRetry(s *models.Summary) error {
+	args := m.Called(s)
+	return args.Error(0)
+}
+
 func (m *SummaryRepositoryMock) GetAll() ([]*models.Summary, error) {
 	args := m.Called()
 	return args.Get(0).([]*models.Summary), args.Error(1)
diff --git a/repositories/repositories.go b/repositories/repositories.go
@@ -106,6 +106,7 @@ type IProjectLabelRepository interface {
 type ISummaryRepository interface {
 	IBaseRepository
 	Insert(*models.Summary) error
+	InsertWithRetry(*models.Summary) error
 	GetAll() ([]*models.Summary, error)
 	GetByUserWithin(*models.User, time.Time, time.Time) ([]*models.Summary, error)
 	GetLastByUser() ([]*models.TimeByUser, error)
diff --git a/repositories/summary.go b/repositories/summary.go
@@ -1,6 +1,8 @@
 package repositories
 
 import (
+	"errors"
+	"log/slog"
 	"time"
 
 	"github.com/duke-git/lancet/v2/slice"
@@ -34,8 +36,21 @@ func (r *SummaryRepository) GetAll() ([]*models.Summary, error) {
 	return summaries, nil
 }
 
-func (r *SummaryRepository) Insert(summary *models.Summary) error {
+func (r *SummaryRepository) InsertWithRetry(summary *models.Summary) (err error) {
+	// in case of duplicate key error, retry inserting up to three times
+	// https://github.com/muety/wakapi/issues/877
+	for i := 0; i < 3; i++ {
+		err = r.Insert(summary)
+		if err == nil || !errors.Is(err, gorm.ErrDuplicatedKey) {
+			return err
+		}
+		slog.Warn("retrying to insert summary", "userId", summary.UserID, "fromTime", summary.FromTime.T(), "toTime", summary.ToTime.T(), "error", err)
+		time.Sleep(1 * time.Second)
+	}
+	return err
+}
 
+func (r *SummaryRepository) Insert(summary *models.Summary) error {
 	if err := r.db.Transaction(func(tx *gorm.DB) error {
 		if err := tx.Create(summary).Error; err != nil {
 			return err
diff --git a/services/aggregation.go b/services/aggregation.go
@@ -2,13 +2,14 @@ package services
 
 import (
 	"errors"
-	datastructure "github.com/duke-git/lancet/v2/datastructure/set"
-	"github.com/muety/artifex/v2"
-	"github.com/muety/wakapi/config"
 	"log/slog"
 	"sync"
 	"time"
 
+	datastructure "github.com/duke-git/lancet/v2/datastructure/set"
+	"github.com/muety/artifex/v2"
+	"github.com/muety/wakapi/config"
+
 	"github.com/muety/wakapi/models"
 )
 
@@ -192,7 +193,7 @@ func (srv *AggregationService) process(job AggregationJob) {
 	} else {
 		slog.Info("successfully generated summary", "from", job.From, "to", job.To, "userID", job.User.ID)
 		if err := srv.summaryService.Insert(summary); err != nil {
-			config.Log().Error("failed to save summary", "userID", summary.UserID, "fromTime", summary.FromTime, "toTime", summary.ToTime, "error", err)
+			config.Log().Error("failed to save summary", "userID", summary.UserID, "fromTime", summary.FromTime.T(), "toTime", summary.ToTime.T(), "error", err)
 		}
 	}
 }
diff --git a/services/summary.go b/services/summary.go
@@ -255,7 +255,7 @@ func (srv *SummaryService) DeleteByUserBefore(userId string, t time.Time) error
 
 func (srv *SummaryService) Insert(summary *models.Summary) error {
 	srv.invalidateUserCache(summary.UserID)
-	return srv.repository.Insert(summary)
+	return srv.repository.InsertWithRetry(summary)
 }
 
 // Private summary generation and utility methods

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,14 @@ package services`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`		`- datastructure "github.com/duke-git/lancet/v2/datastructure/set"`
`6`		`- "github.com/muety/artifex/v2"`
`7`		`- "github.com/muety/wakapi/config"`
`8`	`5`	`"log/slog"`
`9`	`6`	`"sync"`
`10`	`7`	`"time"`
`11`	`8`
	`9`	`+ datastructure "github.com/duke-git/lancet/v2/datastructure/set"`
	`10`	`+ "github.com/muety/artifex/v2"`
	`11`	`+ "github.com/muety/wakapi/config"`
	`12`	`+`
`12`	`13`	`"github.com/muety/wakapi/models"`
`13`	`14`	`)`
`14`	`15`
`@@ -192,7 +193,7 @@ func (srv *AggregationService) process(job AggregationJob) {`
`192`	`193`	`} else {`
`193`	`194`	`slog.Info("successfully generated summary", "from", job.From, "to", job.To, "userID", job.User.ID)`
`194`	`195`	`if err := srv.summaryService.Insert(summary); err != nil {`
`195`		`- config.Log().Error("failed to save summary", "userID", summary.UserID, "fromTime", summary.FromTime, "toTime", summary.ToTime, "error", err)`
	`196`	`+ config.Log().Error("failed to save summary", "userID", summary.UserID, "fromTime", summary.FromTime.T(), "toTime", summary.ToTime.T(), "error", err)`
`196`	`197`	`}`
`197`	`198`	`}`
`198`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ func (srv *SummaryService) DeleteByUserBefore(userId string, t time.Time) error`
`255`	`255`
`256`	`256`	`func (srv SummaryService) Insert(summary models.Summary) error {`
`257`	`257`	`srv.invalidateUserCache(summary.UserID)`
`258`		`- return srv.repository.Insert(summary)`
	`258`	`+ return srv.repository.InsertWithRetry(summary)`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`// Private summary generation and utility methods`