ready to import

backend/gsmaster/import_export.go

@@ -121,7 +121,9 @@ func Import(filePath string) error {
 		}
 	}
 	if len(data.Spells) > 0 {
-		if err := database.DB.Create(&data.Spells).Error; err != nil {
+		if err := database.DB.Clauses(clause.OnConflict{
+			UpdateAll: true, // Update all fields if there's a conflict
+		}).Create(&data.Spells).Error; err != nil {
 			return fmt.Errorf("failed to reimport Spells: %w", err)
 		}
 	}

backend/testdata/gsmaster_exported_gsdata.json

@@ -0,0 +1,309 @@
+{
+  "skills": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Hören",
+      "beschreibung": "",
+      "quelle": "KOD5 99",
+      "initialwert": 6,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 2,
+      "system": "midgard",
+      "name": "Nachtsicht",
+      "beschreibung": "",
+      "quelle": "KOD5 99",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 3,
+      "system": "midgard",
+      "name": "Riechen",
+      "beschreibung": "",
+      "quelle": "KOD5 99",
+      "initialwert": 6,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 4,
+      "system": "midgard",
+      "name": "Sechster Sinn",
+      "beschreibung": "",
+      "quelle": "KOD5 100",
+      "initialwert": 6,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 5,
+      "system": "midgard",
+      "name": "Sehen",
+      "beschreibung": "",
+      "quelle": "KOD5 100",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 6,
+      "system": "midgard",
+      "name": "Wahrnehmung",
+      "beschreibung": "",
+      "quelle": "KOD5 98",
+      "initialwert": 6,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 7,
+      "system": "midgard",
+      "name": "Athletik",
+      "beschreibung": "",
+      "quelle": "KOD5 104",
+      "initialwert": 9,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 8,
+      "system": "midgard",
+      "name": "Erste Hilfe",
+      "beschreibung": "",
+      "quelle": "KOD5 107",
+      "initialwert": 9,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 9,
+      "system": "midgard",
+      "name": "Geländelauf",
+      "beschreibung": "",
+      "quelle": "KOD5 112",
+      "initialwert": 13,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 10,
+      "system": "midgard",
+      "name": "Kampf in Vollrüstung",
+      "beschreibung": "",
+      "quelle": "KOD5 115",
+      "initialwert": 5,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 11,
+      "system": "midgard",
+      "name": "Klettern",
+      "beschreibung": "",
+      "quelle": "KOD5 115",
+      "initialwert": 13,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 12,
+      "system": "midgard",
+      "name": "Landeskunde",
+      "beschreibung": "Dvarska",
+      "quelle": "KOD5 116",
+      "initialwert": 9,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 13,
+      "system": "midgard",
+      "name": "Laufen",
+      "beschreibung": "",
+      "quelle": "KOD5 116",
+      "initialwert": 10,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 14,
+      "system": "midgard",
+      "name": "Robustheit",
+      "beschreibung": "",
+      "quelle": "KOD5 97",
+      "initialwert": 9,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    },
+    {
+      "id": 15,
+      "system": "midgard",
+      "name": "Sprache",
+      "beschreibung": "Albisch",
+      "quelle": "KOD5 127",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": false
+    }
+  ],
+  "weapon_skills": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Armbrüste",
+      "beschreibung": "",
+      "quelle": "KOD5 144",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 2,
+      "system": "midgard",
+      "name": "Einhandschlagwaffen",
+      "beschreibung": "",
+      "quelle": "KOD5 136",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 3,
+      "system": "midgard",
+      "name": "Schilde",
+      "beschreibung": "",
+      "quelle": "KOD5 145",
+      "initialwert": 3,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 4,
+      "system": "midgard",
+      "name": "Spießwaffen",
+      "beschreibung": "",
+      "quelle": "KOD5 137",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 5,
+      "system": "midgard",
+      "name": "Stichwaffen",
+      "beschreibung": "",
+      "quelle": "KOD5 139",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 6,
+      "system": "midgard",
+      "name": "Stielwurfwaffen",
+      "beschreibung": "",
+      "quelle": "KOD5 142",
+      "initialwert": 5,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 7,
+      "system": "midgard",
+      "name": "Waffenloser Kampf",
+      "beschreibung": "",
+      "quelle": "KOD5 141",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    },
+    {
+      "id": 8,
+      "system": "midgard",
+      "name": "Zweihandschlagwaffen",
+      "beschreibung": "",
+      "quelle": "KOD5 140",
+      "initialwert": 8,
+      "bonuseigenschaft": "check",
+      "improvable": true
+    }
+  ],
+  "spells": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Angst",
+      "beschreibung": "",
+      "quelle": "ARK5 63",
+      "bonus": 0,
+      "Stufe": 0,
+      "AP": 0,
+      "Reichweite": 0,
+      "Wirkungsziel": ""
+    }
+  ],
+  "equipments": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Lederrüstung",
+      "beschreibung": "",
+      "quelle": "",
+      "gewicht": 13,
+      "wert": 30
+    }
+  ],
+  "weapons": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Armbrust:schwer",
+      "beschreibung": "",
+      "quelle": "",
+      "gewicht": 5,
+      "wert": 40,
+      "skill_required": "check",
+      "damage": "check"
+    }
+  ],
+  "containers": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Lederrucksack",
+      "beschreibung": "für 25 kg",
+      "quelle": "",
+      "gewicht": 0.5,
+      "wert": 4,
+      "tragkraft": 25,
+      "volumen": 25
+    }
+  ],
+  "transportations": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Karren",
+      "beschreibung": "für 250 kg",
+      "quelle": "",
+      "gewicht": 40,
+      "wert": 14,
+      "tragkraft": 250,
+      "volumen": 0
+    }
+  ],
+  "believes": [
+    {
+      "id": 1,
+      "system": "midgard",
+      "name": "Torkin",
+      "beschreibung": "",
+      "quelle": ""
+    }
+  ]
+}

backend/tests/stammdaten_test.go

@@ -266,6 +266,6 @@ func TestImportGSMasterdata(t *testing.T) {
 	}
 	//testDB := initTestDB4Lookup()
 	//database.DB = testDB // Assign test DB to global DB
-	err := gsmaster.Import(generateFilename("../testdata/gsmaster_", "json"))
+	err := gsmaster.Import("../testdata/gsmaster_exported_gsdata.json")
 	assert.NoError(t, err, "expexted no Error during Export if gsmaster data")
 }