Lernkosten multi level scheinen zu funktionieren

backend/character/lerncost_handler_test.go

@@ -598,7 +598,7 @@ func TestGetSkillAllLevelCostsEndpoint(t *testing.T) {
 // Test GetLernCost endpoint specifically with gsmaster.LernCostRequest structure
 func TestGetLernCostEndpoint(t *testing.T) {
 	// Setup test database
-	database.SetupTestDB()
+	database.SetupTestDB(true, true)
 	defer database.ResetTestDB()
 
 	// Migrate the schema
@@ -612,32 +612,32 @@ func TestGetLernCostEndpoint(t *testing.T) {
 	assert.NoError(t, err)
 	err = gsmaster.MigrateStructure()
 	assert.NoError(t, err)
+	/*
+		// Create test skill data
+		err = createTestSkillData()
+		assert.NoError(t, err)
+		defer cleanupTestSkillData()
+		// Create test character with ID 20 and class "Krieger"
+		testChar := createChar()
+		testChar.ID = 20
+		testChar.Typ = "Krieger" // Set character class to "Krieger"
 
-	// Create test skill data
-	err = createTestSkillData()
-	assert.NoError(t, err)
-	defer cleanupTestSkillData()
-
-	// Create test character with ID 20 and class "Krieger"
-	testChar := createChar()
-	testChar.ID = 20
-	testChar.Typ = "Krieger" // Set character class to "Krieger"
-
-	// Add Athletik skill at level 9
-	skillName := "Athletik"
-	skill := skills.Fertigkeit{
-		BamortCharTrait: models.BamortCharTrait{
-			BamortBase: models.BamortBase{
-				Name: skillName,
+		// Add Athletik skill at level 9
+		skillName := "Athletik"
+		skill := skills.Fertigkeit{
+			BamortCharTrait: models.BamortCharTrait{
+				BamortBase: models.BamortBase{
+					Name: skillName,
+				},
+				CharacterID: 20,
 			},
-			CharacterID: 20,
-		},
-		Fertigkeitswert: 9,
-	}
-	testChar.Fertigkeiten = append(testChar.Fertigkeiten, skill)
+			Fertigkeitswert: 9,
+		}
+		testChar.Fertigkeiten = append(testChar.Fertigkeiten, skill)
 
-	err = testChar.Create()
-	assert.NoError(t, err)
+		err = testChar.Create()
+		assert.NoError(t, err)
+	*/
 
 	// Setup Gin in test mode
 	gin.SetMode(gin.TestMode)

backend/database/testhelper.go

@@ -1,6 +1,7 @@
 package database
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -47,6 +48,25 @@ func copyFile(src, dst string) error {
 	return err
 }
 
+// LoadCopyOfPredefinedTestData loads predefined test data from a specific file into the provided database
+func LoadCopyOfPredefinedTestData(targetDB *gorm.DB, dataFile string) error {
+	// Check if file exists
+	if _, err := os.Stat(dataFile); os.IsNotExist(err) {
+		return fmt.Errorf("predefined test data file not found: %s", dataFile)
+	}
+	testpath := filepath.Join(filepath.Dir(dataFile), "tmp_test_data.db")
+	if _, err := os.Stat(testpath); os.IsExist(err) {
+		os.Remove(testpath) // delete existing test data file
+	}
+	copyFile(dataFile, testpath)
+	targetDB, err := gorm.Open(sqlite.Open(testpath), &gorm.Config{})
+	if err != nil {
+		return fmt.Errorf("failed to open temporary test database: %w", err)
+	}
+	DB = targetDB
+	return nil
+}
+
 // SetupTestDB creates an in-memory SQLite database for testing
 // Parameters:
 // - opts[0]: isTestDb (bool) - whether to use in-memory SQLite (true) or persistent MariaDB (false)
@@ -134,6 +154,12 @@ func SetupTestDB(opts ...bool) {
 			if err != nil {
 				panic("failed to load test data: " + err.Error())
 			}
+		} else if isTestDb {
+			// If no test data loader is set, we can still use the default test data loading
+			err := LoadCopyOfPredefinedTestData(DB, "../testdata/prepared_test_data.db")
+			if err != nil {
+				panic("failed to load predefined test data: " + err.Error())
+			}
 		}
 		migrationDone = true
 	}

backend/gsmaster/lernkosten_maps.go

@@ -715,6 +715,10 @@ func CalcSkillImproveCost(costResult *SkillCostResultNew, currentLevel int, rewa
 	//classKey := getClassAbbreviation(costResult.CharacterClass)
 	classKey := costResult.CharacterClass
 
+	if costResult.TargetLevel > 0 {
+		currentLevel = costResult.TargetLevel - 1 // Wenn ein Ziellevel angegeben ist, verwende dieses
+	}
+
 	// Wenn Kategorie und Schwierigkeit noch nicht gesetzt sind, finde die beste Option
 	if costResult.Category == "" || costResult.Difficulty == "" {
 		bestCategory, bestDifficulty, err := findBestCategoryForSkillImprovement(costResult.SkillName, classKey, currentLevel+1)