Merge pull request 'dev' (#30) from dev into main

Reviewed-on: https://codeberg.org/RhemaWave-Technologies/RhemaWave/pulls/30
Resolves: https://codeberg.org/RhemaWave-Technologies/RhemaWave/issues/29

go.sum

@@ -1,5 +1,3 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 github.com/go-gl/mathgl v1.2.0 h1:v2eOj/y1B2afDxF6URV1qCYmo1KW08lAMtTbOn3KXCY=
@@ -14,11 +12,6 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/mutecomm/go-sqlcipher/v4 v4.4.2 h1:eM10bFtI4UvibIsKr10/QT7Yfz+NADfjZYh0GKrXUNc=
-github.com/mutecomm/go-sqlcipher/v4 v4.4.2/go.mod h1:mF2UmIpBnzFeBdu/ypTDb/LdbS0nk0dfSN1WUsWTjMA=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/veandco/go-sdl2 v0.4.40 h1:fZv6wC3zz1Xt167P09gazawnpa0KY5LM7JAvKpX9d/U=
 github.com/veandco/go-sdl2 v0.4.40/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=

internal/db/newDb.go

@@ -17,6 +17,7 @@ func Connect(dbpath string) (*gorm.DB, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	// Set pragmas
 	sqlDB, err := db.DB()
 	if err != nil {

internal/logger/logger.go

@@ -25,9 +25,10 @@ func (l Level) String() string {
 }
 
 var (
-	DB      *gorm.DB
+	DB       *gorm.DB
-	file    *os.File
+	file     *os.File
-	console = log.New(os.Stderr, "", 0)
+	console        = log.New(os.Stderr, "", 0)
+	SetLevel Level = LevelInfo
 )
 
 // AddFile attaches or replaces the file backend
@@ -36,7 +37,7 @@ func AddFile(path string) error {
 		file.Close()
 	}
 
-	_, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	_, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return err
 	}
@@ -61,6 +62,9 @@ func Close() error {
 }
 
 func logMsg(level Level, format string, args ...any) {
+	if level == LevelDebug && SetLevel != LevelDebug {
+		return
+	}
 	message := fmt.Sprintf(format, args...)
 	now := time.Now()
 	timestamp := now.Format("2006-01-02 15:04:05.000")

internal/sync/sync.go

@@ -4,6 +4,7 @@ import (
 	"regexp"
 
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"rhemawavetech.com/rhemawave/internal/db"
 	"rhemawavetech.com/rhemawave/internal/logger"
 	"rhemawavetech.com/rhemawave/internal/netreq"
@@ -43,20 +44,38 @@ func SyncProclamations(database *gorm.DB) ([]db.Proclamation, error) {
 	}
 
 	err = database.Transaction(func(tx *gorm.DB) error {
-		// Clear the database
+		ids := make([]string, len(proclamations))
-		// Where "1 = 1" because batch Delete() requires a condition
+		for i, p := range proclamations {
-		// 'Where "1 = 1"' is like saying "while true be true" and tricks GORM into deleting everything
+			ids[i] = p.ID
-		if err := tx.Where("1 = 1").Delete(db.Proclamation{}).Error; err != nil {
+		}
+
+		if len(ids) == 0 {
+			// API returned nothing → DB should be empty
+			if err := tx.Where("1 = 1").Delete(&db.Proclamation{}).Error; err != nil {
+				return err
+			}
+		} else {
+			// Remove anything not in API
+			if err := tx.Where("id NOT IN ?", ids).Delete(&db.Proclamation{}).Error; err != nil {
+				return err
+			}
+		}
+
+		// Upsert (preserve Selected automatically)
+		if err := tx.Clauses(clause.OnConflict{
+			Columns: []clause.Column{{Name: "id"}},
+			DoUpdates: clause.AssignmentColumns([]string{
+				"name",
+				"content",
+				"solfeggio_frequency_id",
+				"category_id",
+				"available",
+				"price",
+			}),
+		}).Create(&proclamations).Error; err != nil {
 			return err
 		}
-		// Then re-populate the database
+
-		if err := tx.Save(&proclamations).Error; err != nil {
-			return err
-		}
-		// Old sync code
-		// if err := tx.Omit("selected").Save(&proclamations).Error; err != nil {
-		// 	return err
-		// }
 		return nil
 	})