bebe/bamort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

type corrected

Browse Source
This commit is contained in:
Frank
2025-01-01 21:58:39 +01:00
parent bd4971b2a2
commit 2012edf324
3 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/gsmaster/model.go
+11 -11
View File
@@ -22,7 +22,7 @@ type Skill struct {
Improvable bool `json:"improvable"`
}
type WaeponSkill struct {
type WeaponSkill struct {
Skill
}
@@ -41,7 +41,7 @@ type Equipment struct {
Wert float64 `json:"wert"`
}
type Waepon struct {
type Weapon struct {
Equipment
SkillRequired string `json:"skill_required"`
Damage string `json:"damage"`
@@ -147,13 +147,13 @@ func (object *Skill) Save() error {
return nil
}
func (stamm *WaeponSkill) Create() error {
func (stamm *WeaponSkill) Create() error {
gameSystem := "midgard"
stamm.System = gameSystem
err := database.DB.Transaction(func(tx *gorm.DB) error {
// Save the main character record
if err := tx.Create(&stamm).Error; err != nil {
return fmt.Errorf("failed to save LookupWaeponSkill: %w", err)
return fmt.Errorf("failed to save LookupWeaponSkill: %w", err)
}
return nil
})
@@ -161,7 +161,7 @@ func (stamm *WaeponSkill) Create() error {
return err
}
func (stamm *WaeponSkill) First(name string) error {
func (stamm *WeaponSkill) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
if err != nil {
@@ -171,7 +171,7 @@ func (stamm *WaeponSkill) First(name string) error {
return nil
}
func (object *WaeponSkill) FirstId(value uint) error {
func (object *WeaponSkill) FirstId(value uint) error {
gameSystem := "midgard"
err := database.DB.First(&object, "system=? AND id = ?", gameSystem, value).Error
if err != nil {
@@ -181,7 +181,7 @@ func (object *WaeponSkill) FirstId(value uint) error {
return nil
}
func (object *WaeponSkill) Save() error {
func (object *WeaponSkill) Save() error {
err := database.DB.Save(&object).Error
if err != nil {
// zauber found
@@ -276,7 +276,7 @@ func (object *Equipment) Save() error {
return nil
}
func (stamm *Waepon) Create() error {
func (stamm *Weapon) Create() error {
gameSystem := "midgard"
stamm.System = gameSystem
err := database.DB.Transaction(func(tx *gorm.DB) error {
@@ -290,7 +290,7 @@ func (stamm *Waepon) Create() error {
return err
}
func (stamm *Waepon) First(name string) error {
func (stamm *Weapon) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
if err != nil {
@@ -300,7 +300,7 @@ func (stamm *Waepon) First(name string) error {
return nil
}
func (object *Waepon) FirstId(value uint) error {
func (object *Weapon) FirstId(value uint) error {
gameSystem := "midgard"
err := database.DB.First(&object, "system=? AND id = ?", gameSystem, value).Error
if err != nil {
@@ -310,7 +310,7 @@ func (object *Waepon) FirstId(value uint) error {
return nil
}
func (object *Waepon) Save() error {
func (object *Weapon) Save() error {
err := database.DB.Save(&object).Error
if err != nil {
// zauber found
backend/tests/importJSON2ImportStruct_test.go
+43 -4
View File
@@ -105,7 +105,7 @@ func testSkill(t *testing.T, objects []importer.Fertigkeit) {
}
func testWaeponSkill(t *testing.T, objects []importer.Waffenfertigkeit) {
func testWeaponSkill(t *testing.T, objects []importer.Waffenfertigkeit) {
assert.Equal(t, 8, len(objects))
i := 0
assert.Equal(t, "moam-ability-759916", objects[i].ID)
@@ -136,7 +136,7 @@ func testSpell(t *testing.T, objects []importer.Zauber) {
assert.Equal(t, "ARK5 63", objects[i].Quelle)
}
func testWaepon(t *testing.T, objects []importer.Waffe) {
func testWeapon(t *testing.T, objects []importer.Waffe) {
assert.Equal(t, 1, len(objects))
i := 0
assert.Equal(t, "moam-weapon-126819", objects[i].ID)
@@ -212,10 +212,10 @@ func TestImportVTTStructure(t *testing.T) {
assert.NoError(t, err, "Expected no error when Unmarshal filecontent")
testChar(t, character)
testSkill(t, character.Fertigkeiten)
testWaeponSkill(t, character.Waffenfertigkeiten)
testWeaponSkill(t, character.Waffenfertigkeiten)
testSpell(t, character.Zauber)
testEquipment(t, character.Ausruestung)
testWaepon(t, character.Waffen)
testWeapon(t, character.Waffen)
testContainer(t, character.Behaeltnisse)
testTransportation(t, character.Transportmittel)
//fmt.Println(character)
@@ -260,6 +260,45 @@ func TestImportSkill2GSMaster(t *testing.T) {
assert.Equal(t, skill2.System, skill3.System)
}
func TestImportWeaponSkill2GSMaster(t *testing.T) {
testDB := initTestDB4Import()
database.DB = testDB // Assign test DB to global DB
fileName := fmt.Sprintf("../testdata/%s", "VTT_Import1.json")
character, err := readImportChar(fileName)
assert.NoError(t, err, "Expected no error when Unmarshal filecontent")
//for i := range character.Fertigkeiten {
skill, erro := importer.TransformImportFertigkeit2GSDMaster(&character.Fertigkeiten[0])
assert.NoError(t, erro, "Expected no error when Unmarshal filecontent")
assert.GreaterOrEqual(t, int(skill.ID), 1)
assert.Equal(t, "Hören", skill.Name)
assert.Equal(t, "", skill.Beschreibung)
assert.Equal(t, 6, skill.Initialkeitswert)
assert.Equal(t, "check", skill.Bonuseigenschaft)
assert.Equal(t, "KOD5 99", skill.Quelle)
assert.Equal(t, false, skill.Improvable)
assert.Equal(t, "midgard", skill.System)
//}
skill2 := gsmaster.Skill{}
erro = skill2.First("Hören")
assert.NoError(t, erro, "Expected no error when finding Record by name")
assert.Equal(t, 1, int(skill.ID))
skill3 := gsmaster.Skill{}
erro = skill3.FirstId(1)
assert.NoError(t, erro, "Expected no error when finding Record by ID")
assert.Equal(t, "Hören", skill3.Name)
assert.Equal(t, skill2.ID, skill3.ID)
assert.Equal(t, skill2.Name, skill3.Name)
assert.Equal(t, skill2.Beschreibung, skill3.Beschreibung)
assert.Equal(t, skill2.Initialkeitswert, skill3.Initialkeitswert)
assert.Equal(t, skill2.Bonuseigenschaft, skill3.Bonuseigenschaft)
assert.Equal(t, skill2.Quelle, skill3.Quelle)
assert.Equal(t, skill2.Improvable, skill3.Improvable)
assert.Equal(t, skill2.System, skill3.System)
}
/*
func TestImportFertigkeitenStammdatenSingle(t *testing.T) {
// Setup test database
backend/tests/stammdaten_test.go
+6 -6
View File
@@ -14,7 +14,7 @@ func initTestDB4Lookup() *gorm.DB {
db.AutoMigrate(
&gsmaster.Skill{}, //needed for stammdaten.CheckFertigkeit
&gsmaster.Spell{}, //needed for stammdaten.CheckZauber
&gsmaster.WaeponSkill{}, //needed for stammdaten.CheckWaffenFertigkeit
&gsmaster.WeaponSkill{}, //needed for stammdaten.CheckWaffenFertigkeit
&gsmaster.Equipment{}, //needed for stammdaten.Check...
&gsmaster.Container{}, //needed for stammdaten.Check...
&gsmaster.Transportation{}, //needed for stammdaten.Check...
@@ -52,11 +52,11 @@ func TestFindLookupSkill(t *testing.T) {
assert.Equal(t, "In", stamm.Bonuseigenschaft)
}
func TestCreateLookupWaeponSkill(t *testing.T) {
func TestCreateLookupWeaponSkill(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := gsmaster.WaeponSkill{}
stamm := gsmaster.WeaponSkill{}
stamm.System = "Midgard"
stamm.Name = "Stichwaffen"
stamm.Beschreibung = "Für Dolche und Ochsenzungen"
@@ -69,10 +69,10 @@ func TestCreateLookupWaeponSkill(t *testing.T) {
assert.Equal(t, "midgard", stamm.System)
}
func TestFindLookupWaeponSkill(t *testing.T) {
func TestFindLookupWeaponSkill(t *testing.T) {
// Setup test database
TestCreateLookupWaeponSkill(t)
stamm := gsmaster.WaeponSkill{}
TestCreateLookupWeaponSkill(t)
stamm := gsmaster.WeaponSkill{}
stamm.Name = "Lesen"
err := stamm.First("Stichwaffen")