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

moved Lookup and stammdaten into domain gsmaster

Browse Source
This commit is contained in:
Frank
2024-12-31 09:14:27 +01:00
parent 8cdb635a18
commit c0440f2810
6 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/gsmaster/importer.go
+4 -5
View File
@@ -2,12 +2,11 @@ package gsmaster
import (
"bamort/importer"
"bamort/models"
"fmt"
)
func CheckSkill(fertigkeit *importer.Fertigkeit, autocreate bool) (*models.LookupSkill, error) {
stammF := models.LookupSkill{}
func CheckSkill(fertigkeit *importer.Fertigkeit, autocreate bool) (*LookupSkill, error) {
stammF := LookupSkill{}
//err := database.DB.First(&stammF, "system=? AND name = ?", gameSystem, fertigkeit.Name).Error
err := stammF.First(fertigkeit.Name)
if err == nil {
@@ -46,8 +45,8 @@ func CheckSkill(fertigkeit *importer.Fertigkeit, autocreate bool) (*models.Looku
return &stammF, nil
}
func CheckSpell(zauber *importer.Zauber, autocreate bool) (*models.LookupSpell, error) {
stammF := models.LookupSpell{}
func CheckSpell(zauber *importer.Zauber, autocreate bool) (*LookupSpell, error) {
stammF := LookupSpell{}
//err := database.DB.First(&stammF, "system=? AND name = ?", gameSystem, zauber.Name).Error
err := stammF.First(zauber.Name)
backend/models/stammdaten.go → backend/gsmaster/model.go
+12 -13
View File
@@ -1,4 +1,4 @@
package models
package gsmaster
import (
"bamort/database"
@@ -121,7 +121,6 @@ func (stamm *LookupWaeponSkill) Create() error {
return err
}
func (stamm *LookupSpell) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
@@ -170,16 +169,6 @@ func (stamm *LookupEquipment) Create() error {
return err
}
func (stamm *LookupContainer) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
if err != nil {
// zauber found
return err
}
return nil
}
func (stamm *LookupContainer) Create() error {
gameSystem := "midgard"
stamm.System = gameSystem
@@ -193,7 +182,7 @@ func (stamm *LookupContainer) Create() error {
return err
}
func (stamm *LookupTransportation) First(name string) error {
func (stamm *LookupContainer) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
if err != nil {
@@ -216,3 +205,13 @@ func (stamm *LookupTransportation) Create() error {
return err
}
func (stamm *LookupTransportation) First(name string) error {
gameSystem := "midgard"
err := database.DB.First(&stamm, "system=? AND name = ?", gameSystem, name).Error
if err != nil {
// zauber found
return err
}
return nil
}
backend/models/importer.go
-1
View File
@@ -1 +0,0 @@
package models
backend/models/models.go
-6
View File
@@ -10,12 +10,6 @@ type BamortCharTrait struct {
CharacterID uint `gorm:"index" json:"character_id"`
}
type BamortCharTraitMaxVal struct {
BamortCharTrait
Max int `json:"max"`
Value int `json:"value"`
}
type Magisch struct {
IstMagisch bool `json:"ist_magisch"`
Abw int `json:"abw"`
backend/tests/importJsontoDB_test.go
+2 -3
View File
@@ -4,7 +4,6 @@ import (
"bamort/database"
"bamort/gsmaster"
"bamort/importer"
"bamort/models"
"encoding/json"
"fmt"
"os"
@@ -38,8 +37,8 @@ func initTestDB4Import() *gorm.DB {
&importer.B{},
&importer.CharacterImport{},
*/
&models.LookupSkill{}, //needed for gsmaster.CheckFertigkeit
&models.LookupSpell{}, //needed for gsmaster.CheckZauber
&gsmaster.LookupSkill{}, //needed for gsmaster.CheckFertigkeit
&gsmaster.LookupSpell{}, //needed for gsmaster.CheckZauber
)
return db
}
backend/tests/stammdaten_test.go
+19 -19
View File
@@ -2,7 +2,7 @@ package tests
import (
"bamort/database"
"bamort/models"
"bamort/gsmaster"
"testing"
"github.com/stretchr/testify/assert"
@@ -12,12 +12,12 @@ import (
func initTestDB4Lookup() *gorm.DB {
db := SetupTestDB()
db.AutoMigrate(
&models.LookupSkill{}, //needed for stammdaten.CheckFertigkeit
&models.LookupSpell{}, //needed for stammdaten.CheckZauber
&models.LookupWaeponSkill{}, //needed for stammdaten.CheckWaffenFertigkeit
&models.LookupEquipment{}, //needed for stammdaten.Check...
&models.LookupContainer{}, //needed for stammdaten.Check...
&models.LookupTransportation{}, //needed for stammdaten.Check...
&gsmaster.LookupSkill{}, //needed for stammdaten.CheckFertigkeit
&gsmaster.LookupSpell{}, //needed for stammdaten.CheckZauber
&gsmaster.LookupWaeponSkill{}, //needed for stammdaten.CheckWaffenFertigkeit
&gsmaster.LookupEquipment{}, //needed for stammdaten.Check...
&gsmaster.LookupContainer{}, //needed for stammdaten.Check...
&gsmaster.LookupTransportation{}, //needed for stammdaten.Check...
)
return db
}
@@ -26,7 +26,7 @@ func TestCreateLookupSkill(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupSkill{}
stamm := gsmaster.LookupSkill{}
stamm.System = "Midgard"
stamm.Name = "Lesen"
stamm.Beschreibung = "Lesen und Schreiben"
@@ -42,7 +42,7 @@ func TestCreateLookupSkill(t *testing.T) {
func TestFindLookupSkill(t *testing.T) {
// Setup test database
TestCreateLookupSkill(t)
stamm := models.LookupSkill{}
stamm := gsmaster.LookupSkill{}
stamm.Name = "Lesen"
err := stamm.First("Lesen")
@@ -56,7 +56,7 @@ func TestCreateLookupWaeponSkill(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupWaeponSkill{}
stamm := gsmaster.LookupWaeponSkill{}
stamm.System = "Midgard"
stamm.Name = "Stichwaffen"
stamm.Beschreibung = "Für Dolche und Ochsenzungen"
@@ -72,7 +72,7 @@ func TestCreateLookupWaeponSkill(t *testing.T) {
func TestFindLookupWaeponSkill(t *testing.T) {
// Setup test database
TestCreateLookupWaeponSkill(t)
stamm := models.LookupWaeponSkill{}
stamm := gsmaster.LookupWaeponSkill{}
stamm.Name = "Lesen"
err := stamm.First("Stichwaffen")
@@ -88,7 +88,7 @@ func TestCreateLookupSpell(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupSpell{}
stamm := gsmaster.LookupSpell{}
stamm.System = "Midgard"
stamm.Name = "Unsichtbarkeit"
stamm.Beschreibung = "werde unsichtbar"
@@ -110,7 +110,7 @@ func TestCreateLookupSpell(t *testing.T) {
func TestFindLookupSpell(t *testing.T) {
// Setup test database
TestCreateLookupSpell(t)
stamm := models.LookupSpell{}
stamm := gsmaster.LookupSpell{}
stamm.Name = "lesen"
err := stamm.First("Unsichtbarkeit")
@@ -129,7 +129,7 @@ func TestCreateLookupEquipment(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupEquipment{}
stamm := gsmaster.LookupEquipment{}
stamm.System = "Midgard"
stamm.Name = "Decke"
stamm.Beschreibung = "zum zudecken"
@@ -145,7 +145,7 @@ func TestCreateLookupEquipment(t *testing.T) {
func TestFindLookupEquipment(t *testing.T) {
// Setup test database
TestCreateLookupEquipment(t)
stamm := models.LookupEquipment{}
stamm := gsmaster.LookupEquipment{}
stamm.Name = "Lesen"
err := stamm.First("Decke")
@@ -159,7 +159,7 @@ func TestCreateLookupContainer(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupContainer{}
stamm := gsmaster.LookupContainer{}
stamm.System = "Midgard"
stamm.Name = "Topf"
stamm.Beschreibung = "zum kochen"
@@ -176,7 +176,7 @@ func TestCreateLookupContainer(t *testing.T) {
func TestFindLookupContainer(t *testing.T) {
// Setup test database
TestCreateLookupContainer(t)
stamm := models.LookupContainer{}
stamm := gsmaster.LookupContainer{}
stamm.Name = "Lesen"
err := stamm.First("Topf")
@@ -191,7 +191,7 @@ func TestCreateLookupTransportation(t *testing.T) {
// Setup test database
testDB := initTestDB4Lookup()
database.DB = testDB // Assign test DB to global DB
stamm := models.LookupTransportation{}
stamm := gsmaster.LookupTransportation{}
stamm.System = "Midgard"
stamm.Name = "Topf"
stamm.Beschreibung = "zum kochen"
@@ -208,7 +208,7 @@ func TestCreateLookupTransportation(t *testing.T) {
func TestFindLookupTransportation(t *testing.T) {
// Setup test database
TestCreateLookupTransportation(t)
stamm := models.LookupTransportation{}
stamm := gsmaster.LookupTransportation{}
stamm.Name = "Lesen"
err := stamm.First("Topf")