Merge branch 'master' of github.com:muety/wakapi

muety · muety · commit 674296ce2357 · 2025-02-05T21:32:21.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ pkged.go
 package-lock.json
 node_modules
 .DS_Store
+.venv
+venv
diff --git a/coverage/coverage.out b/coverage/coverage.out
diff --git a/main.go b/main.go
@@ -175,14 +175,14 @@ func main() {
 	// Services
 	mailService = mail.NewMailService()
 	aliasService = services.NewAliasService(aliasRepository)
-	userService = services.NewUserService(mailService, userRepository)
+	keyValueService = services.NewKeyValueService(keyValueRepository)
+	userService = services.NewUserService(keyValueService, mailService, userRepository)
 	languageMappingService = services.NewLanguageMappingService(languageMappingRepository)
 	projectLabelService = services.NewProjectLabelService(projectLabelRepository)
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
 	durationService = services.NewDurationService(heartbeatService)
 	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, durationService, aliasService, projectLabelService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
-	keyValueService = services.NewKeyValueService(keyValueRepository)
 	reportService = services.NewReportService(summaryService, userService, mailService)
 	activityService = services.NewActivityService(summaryService)
 	diagnosticsService = services.NewDiagnosticsService(diagnosticsRepository)
diff --git a/mocks/alias_repository.go b/mocks/alias_repository.go
@@ -6,6 +6,7 @@ import (
 )
 
 type AliasRepositoryMock struct {
+	BaseRepositoryMock
 	mock.Mock
 }
 
diff --git a/mocks/base_repository.go b/mocks/base_repository.go
@@ -0,0 +1,24 @@
+package mocks
+
+import (
+	"github.com/stretchr/testify/mock"
+)
+
+type BaseRepositoryMock struct {
+	mock.Mock
+}
+
+func (m *BaseRepositoryMock) GetDialector() string {
+	args := m.Called()
+	return args.Get(0).(string)
+}
+
+func (m *BaseRepositoryMock) GetTableDDLMysql(s string) (string, error) {
+	args := m.Called(s)
+	return args.Get(0).(string), args.Error(1)
+}
+
+func (m *BaseRepositoryMock) GetTableDDLSqlite(s string) (string, error) {
+	args := m.Called(s)
+	return args.Get(0).(string), args.Error(1)
+}
diff --git a/mocks/key_value_service.go b/mocks/key_value_service.go
@@ -33,3 +33,8 @@ func (m *KeyValueServiceMock) DeleteString(s string) error {
 	args := m.Called(s)
 	return args.Error(0)
 }
+
+func (m *KeyValueServiceMock) ReplaceKeySuffix(s1, s2 string) error {
+	args := m.Called(s1, s2)
+	return args.Error(0)
+}
diff --git a/mocks/summary_repository.go b/mocks/summary_repository.go
@@ -7,6 +7,7 @@ import (
 )
 
 type SummaryRepositoryMock struct {
+	BaseRepositoryMock
 	mock.Mock
 }
 
diff --git a/mocks/user_service.go b/mocks/user_service.go
@@ -109,6 +109,11 @@ func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, e
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
+func (m *UserServiceMock) ChangeUserId(user *models.User, s1 string) (*models.User, error) {
+	args := m.Called(user, s1)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) FlushCache() {
 	m.Called()
 }
diff --git a/repositories/alias.go b/repositories/alias.go
@@ -7,11 +7,11 @@ import (
 )
 
 type AliasRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewAliasRepository(db *gorm.DB) *AliasRepository {
-	return &AliasRepository{db: db}
+	return &AliasRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *AliasRepository) GetAll() ([]*models.Alias, error) {
diff --git a/repositories/base.go b/repositories/base.go
@@ -0,0 +1,40 @@
+package repositories
+
+import (
+	"errors"
+	"gorm.io/gorm"
+)
+
+type BaseRepository struct {
+	db *gorm.DB
+}
+
+func NewBaseRepository(db *gorm.DB) BaseRepository {
+	return BaseRepository{db: db}
+}
+
+func (r *BaseRepository) GetDialector() string {
+	return r.db.Dialector.Name()
+}
+
+func (r *BaseRepository) GetTableDDLMysql(tableName string) (result string, err error) {
+	if dialector := r.GetDialector(); dialector == "sqlite" || dialector == "sqlite3" {
+		err = r.db.Raw("show create table ?", tableName).Scan(&result).Error
+	} else {
+		err = errors.New("not a mysql database")
+	}
+	return result, err
+}
+
+func (r *BaseRepository) GetTableDDLSqlite(tableName string) (result string, err error) {
+	if dialector := r.GetDialector(); dialector == "sqlite" || dialector == "sqlite3" {
+		err = r.db.Table("sqlite_master").
+			Select("sql").
+			Where("type = ?", "table").
+			Where("name = ?", tableName).
+			Take(&result).Error
+	} else {
+		err = errors.New("not an sqlite database")
+	}
+	return result, err
+}
diff --git a/repositories/diagnostics.go b/repositories/diagnostics.go
@@ -6,11 +6,11 @@ import (
 )
 
 type DiagnosticsRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewDiagnosticsRepository(db *gorm.DB) *DiagnosticsRepository {
-	return &DiagnosticsRepository{db: db}
+	return &DiagnosticsRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *DiagnosticsRepository) Insert(diagnostics *models.Diagnostics) (*models.Diagnostics, error) {
diff --git a/repositories/heartbeat.go b/repositories/heartbeat.go
@@ -15,12 +15,12 @@ import (
 )
 
 type HeartbeatRepository struct {
-	db     *gorm.DB
+	BaseRepository
 	config *conf.Config
 }
 
 func NewHeartbeatRepository(db *gorm.DB) *HeartbeatRepository {
-	return &HeartbeatRepository{config: conf.Get(), db: db}
+	return &HeartbeatRepository{BaseRepository: NewBaseRepository(db), config: conf.Get()}
 }
 
 // Use with caution!!
diff --git a/repositories/key_value.go b/repositories/key_value.go
@@ -2,6 +2,7 @@ package repositories
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/utils"
@@ -10,11 +11,11 @@ import (
 )
 
 type KeyValueRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewKeyValueRepository(db *gorm.DB) *KeyValueRepository {
-	return &KeyValueRepository{db: db}
+	return &KeyValueRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *KeyValueRepository) GetAll() ([]*models.KeyStringValue, error) {
@@ -77,3 +78,27 @@ func (r *KeyValueRepository) DeleteString(key string) error {
 
 	return nil
 }
+
+// ReplaceKeySuffix will search for key-value pairs whose key ends with suffixOld and replace it with suffixNew instead.
+func (r *KeyValueRepository) ReplaceKeySuffix(suffixOld, suffixNew string) error {
+	if dialector := r.db.Dialector.Name(); dialector == "mysql" || dialector == "postgres" {
+		patternOld := fmt.Sprintf("(.+)%s$", suffixOld)
+		patternNew := fmt.Sprintf("$1%s", suffixNew) // mysql group replace style
+		if dialector == "postgres" {
+			patternNew = fmt.Sprintf("\\1%s", suffixNew) // postgres group replace style
+		}
+
+		return r.db.Model(&models.KeyStringValue{}).
+			Where(utils.QuoteSql(r.db, "%s like ?", "key"), "%"+suffixOld).
+			Update("key", gorm.Expr(
+				utils.QuoteSql(r.db, "regexp_replace(%s, ?, ?)", "key"),
+				patternOld,
+				patternNew,
+			)).Error
+	} else {
+		// a bit less safe, because not only replacing suffixes
+		return r.db.Model(&models.KeyStringValue{}).
+			Where("key like ?", "%"+suffixOld).
+			Update("key", gorm.Expr("replace(key, ?, ?)", suffixOld, suffixNew)).Error
+	}
+}
diff --git a/repositories/language_mapping.go b/repositories/language_mapping.go
@@ -8,12 +8,12 @@ import (
 )
 
 type LanguageMappingRepository struct {
+	BaseRepository
 	config *config.Config
-	db     *gorm.DB
 }
 
 func NewLanguageMappingRepository(db *gorm.DB) *LanguageMappingRepository {
-	return &LanguageMappingRepository{config: config.Get(), db: db}
+	return &LanguageMappingRepository{BaseRepository: NewBaseRepository(db), config: config.Get()}
 }
 
 func (r *LanguageMappingRepository) GetAll() ([]*models.LanguageMapping, error) {
diff --git a/repositories/leaderboard.go b/repositories/leaderboard.go
@@ -8,11 +8,11 @@ import (
 )
 
 type LeaderboardRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewLeaderboardRepository(db *gorm.DB) *LeaderboardRepository {
-	return &LeaderboardRepository{db: db}
+	return &LeaderboardRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *LeaderboardRepository) InsertBatch(items []*models.LeaderboardItem) error {
diff --git a/repositories/metrics.go b/repositories/metrics.go
@@ -6,8 +6,8 @@ import (
 )
 
 type MetricsRepository struct {
+	BaseRepository
 	config *config.Config
-	db     *gorm.DB
 }
 
 const sizeTplMysql = `
@@ -23,7 +23,7 @@ SELECT page_count * page_size as size
 FROM pragma_page_count(), pragma_page_size();`
 
 func NewMetricsRepository(db *gorm.DB) *MetricsRepository {
-	return &MetricsRepository{config: config.Get(), db: db}
+	return &MetricsRepository{BaseRepository: NewBaseRepository(db), config: config.Get()}
 }
 
 func (srv *MetricsRepository) GetDatabaseSize() (size int64, err error) {
diff --git a/repositories/project_label.go b/repositories/project_label.go
@@ -8,12 +8,12 @@ import (
 )
 
 type ProjectLabelRepository struct {
+	BaseRepository
 	config *config.Config
-	db     *gorm.DB
 }
 
 func NewProjectLabelRepository(db *gorm.DB) *ProjectLabelRepository {
-	return &ProjectLabelRepository{config: config.Get(), db: db}
+	return &ProjectLabelRepository{BaseRepository: NewBaseRepository(db), config: config.Get()}
 }
 
 func (r *ProjectLabelRepository) GetAll() ([]*models.ProjectLabel, error) {
diff --git a/repositories/repositories.go b/repositories/repositories.go
@@ -5,7 +5,14 @@ import (
 	"time"
 )
 
+type IBaseRepository interface {
+	GetDialector() string
+	GetTableDDLMysql(string) (string, error)
+	GetTableDDLSqlite(string) (string, error)
+}
+
 type IAliasRepository interface {
+	IBaseRepository
 	Insert(*models.Alias) (*models.Alias, error)
 	Delete(uint) error
 	DeleteBatch([]uint) error
@@ -17,6 +24,7 @@ type IAliasRepository interface {
 }
 
 type IHeartbeatRepository interface {
+	IBaseRepository
 	InsertBatch([]*models.Heartbeat) error
 	GetAll() ([]*models.Heartbeat, error)
 	GetAllWithin(time.Time, time.Time, *models.User) ([]*models.Heartbeat, error)
@@ -37,18 +45,22 @@ type IHeartbeatRepository interface {
 }
 
 type IDiagnosticsRepository interface {
+	IBaseRepository
 	Insert(diagnostics *models.Diagnostics) (*models.Diagnostics, error)
 }
 
 type IKeyValueRepository interface {
+	IBaseRepository
 	GetAll() ([]*models.KeyStringValue, error)
 	GetString(string) (*models.KeyStringValue, error)
 	PutString(*models.KeyStringValue) error
 	DeleteString(string) error
 	Search(string) ([]*models.KeyStringValue, error)
+	ReplaceKeySuffix(string, string) error
 }
 
 type ILanguageMappingRepository interface {
+	IBaseRepository
 	GetAll() ([]*models.LanguageMapping, error)
 	GetById(uint) (*models.LanguageMapping, error)
 	GetByUser(string) ([]*models.LanguageMapping, error)
@@ -57,6 +69,7 @@ type ILanguageMappingRepository interface {
 }
 
 type IProjectLabelRepository interface {
+	IBaseRepository
 	GetAll() ([]*models.ProjectLabel, error)
 	GetById(uint) (*models.ProjectLabel, error)
 	GetByUser(string) ([]*models.ProjectLabel, error)
@@ -65,6 +78,7 @@ type IProjectLabelRepository interface {
 }
 
 type ISummaryRepository interface {
+	IBaseRepository
 	Insert(*models.Summary) error
 	GetAll() ([]*models.Summary, error)
 	GetByUserWithin(*models.User, time.Time, time.Time) ([]*models.Summary, error)
@@ -74,6 +88,7 @@ type ISummaryRepository interface {
 }
 
 type IUserRepository interface {
+	IBaseRepository
 	FindOne(user models.User) (*models.User, error)
 	GetByIds([]string) ([]*models.User, error)
 	GetAll() ([]*models.User, error)
@@ -91,6 +106,7 @@ type IUserRepository interface {
 }
 
 type ILeaderboardRepository interface {
+	IBaseRepository
 	InsertBatch([]*models.LeaderboardItem) error
 	CountAllByUser(string) (int64, error)
 	CountUsers(bool) (int64, error)
diff --git a/repositories/summary.go b/repositories/summary.go
@@ -11,11 +11,11 @@ import (
 )
 
 type SummaryRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewSummaryRepository(db *gorm.DB) *SummaryRepository {
-	return &SummaryRepository{db: db}
+	return &SummaryRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *SummaryRepository) GetAll() ([]*models.Summary, error) {
diff --git a/repositories/user.go b/repositories/user.go
@@ -12,11 +12,11 @@ import (
 )
 
 type UserRepository struct {
-	db *gorm.DB
+	BaseRepository
 }
 
 func NewUserRepository(db *gorm.DB) *UserRepository {
-	return &UserRepository{db: db}
+	return &UserRepository{BaseRepository: NewBaseRepository(db)}
 }
 
 func (r *UserRepository) FindOne(attributes models.User) (*models.User, error) {
diff --git a/routes/settings.go b/routes/settings.go
diff --git a/services/key_value.go b/services/key_value.go
diff --git a/services/services.go b/services/services.go
diff --git a/services/user.go b/services/user.go
diff --git a/static/assets/js/components/settings.js b/static/assets/js/components/settings.js
diff --git a/views/settings.tpl.html b/views/settings.tpl.html

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type AliasRepositoryMock struct {`
	`9`	`+ BaseRepositoryMock`
`9`	`10`	`mock.Mock`
`10`	`11`	`}`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,8 @@ func (m *KeyValueServiceMock) DeleteString(s string) error {`
`33`	`33`	`args := m.Called(s)`
`34`	`34`	`return args.Error(0)`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+func (m *KeyValueServiceMock) ReplaceKeySuffix(s1, s2 string) error {`
	`38`	`+ args := m.Called(s1, s2)`
	`39`	`+ return args.Error(0)`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type SummaryRepositoryMock struct {`
	`10`	`+ BaseRepositoryMock`
`10`	`11`	`mock.Mock`
`11`	`12`	`}`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@ func (m UserServiceMock) GenerateResetToken(user models.User) (*models.User, e`
`109`	`109`	`return args.Get(0).(*models.User), args.Error(1)`
`110`	`110`	`}`
`111`	`111`
	`112`	`+func (m UserServiceMock) ChangeUserId(user models.User, s1 string) (*models.User, error) {`
	`113`	`+ args := m.Called(user, s1)`
	`114`	`+ return args.Get(0).(*models.User), args.Error(1)`
	`115`	`+}`
	`116`	`+`
`112`	`117`	`func (m *UserServiceMock) FlushCache() {`
`113`	`118`	`m.Called()`
`114`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type AliasRepository struct {`
`10`		`- db *gorm.DB`
	`10`	`+ BaseRepository`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`func NewAliasRepository(db gorm.DB) AliasRepository {`
`14`		`- return &AliasRepository{db: db}`
	`14`	`+ return &AliasRepository{BaseRepository: NewBaseRepository(db)}`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func (r AliasRepository) GetAll() ([]models.Alias, error) {`