Update system to query builder

This commit is contained in:
2025-02-25 21:36:42 +01:00
parent 27b81ef433
commit 7d05c8aacc

View File

@@ -49,7 +49,12 @@ func (db *database) EnsureJWTSecret() (string, error) {
// GetSystemSetting retrieves a system setting by key // GetSystemSetting retrieves a system setting by key
func (db *database) GetSystemSetting(key string) (string, error) { func (db *database) GetSystemSetting(key string) (string, error) {
var value string var value string
err := db.QueryRow("SELECT value FROM system_settings WHERE key = ?", key).Scan(&value) query := NewQuery(db.dbType).
Select("value").
From("system_settings").
Where("key = ").
Placeholder(key)
err := db.QueryRow(query.String(), query.args...).Scan(&value)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -59,11 +64,14 @@ func (db *database) GetSystemSetting(key string) (string, error) {
// SetSystemSetting stores or updates a system setting // SetSystemSetting stores or updates a system setting
func (db *database) SetSystemSetting(key, value string) error { func (db *database) SetSystemSetting(key, value string) error {
_, err := db.Exec(` query := NewQuery(db.dbType).
INSERT INTO system_settings (key, value) Insert("system_settings", "key", "value").
VALUES (?, ?) Values(2).
ON CONFLICT(key) DO UPDATE SET value = ?`, AddArgs(key, value).
key, value, value) Write("ON CONFLICT(key) DO UPDATE SET value = ").
Placeholder(value)
_, err := db.Exec(query.String(), query.args...)
if err != nil { if err != nil {
return fmt.Errorf("failed to store system setting: %w", err) return fmt.Errorf("failed to store system setting: %w", err)
@@ -92,22 +100,29 @@ func (db *database) GetSystemStats() (*UserStats, error) {
stats := &UserStats{} stats := &UserStats{}
// Get total users // Get total users
err := db.QueryRow("SELECT COUNT(*) FROM users").Scan(&stats.TotalUsers) query := NewQuery(db.dbType).
Select("COUNT(*)").
From("users")
err := db.QueryRow(query.String()).Scan(&stats.TotalUsers)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get total users count: %w", err) return nil, fmt.Errorf("failed to get total users count: %w", err)
} }
// Get total workspaces // Get total workspaces
err = db.QueryRow("SELECT COUNT(*) FROM workspaces").Scan(&stats.TotalWorkspaces) query = NewQuery(db.dbType).
Select("COUNT(*)").
From("workspaces")
err = db.QueryRow(query.String()).Scan(&stats.TotalWorkspaces)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get total workspaces count: %w", err) return nil, fmt.Errorf("failed to get total workspaces count: %w", err)
} }
// Get active users (users with activity in last 30 days) // Get active users (users with activity in last 30 days)
err = db.QueryRow(` query = NewQuery(db.dbType).
SELECT COUNT(DISTINCT user_id) Select("COUNT(DISTINCT user_id)").
FROM sessions From("sessions").
WHERE created_at > datetime('now', '-30 days')`). Where("created_at > datetime('now', '-30 days')")
err = db.QueryRow(query.String()).
Scan(&stats.ActiveUsers) Scan(&stats.ActiveUsers)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get active users count: %w", err) return nil, fmt.Errorf("failed to get active users count: %w", err)