cmd: delete ship type

pkg/game/cmd_ship_type.go

@@ -17,3 +17,19 @@ func createShipType(r Repo, g game.Game, race, typeName string, d, w, s, c float
 	}
 	return r.SaveState(g)
 }
+
+func DeleteShipType(configure func(*Param), race, typeName string) (err error) {
+	control(configure, func(c *ctrl) {
+		c.execute(func(r Repo, g game.Game) {
+			err = deleteShipType(r, g, race, typeName)
+		})
+	})
+	return
+}
+
+func deleteShipType(r Repo, g game.Game, race, typeName string) error {
+	if err := g.DeleteShipType(race, typeName); err != nil {
+		return err
+	}
+	return r.SaveState(g)
+}

pkg/game/cmd_ship_type_test.go

@@ -12,8 +12,11 @@ import (
 
 func TestCreateShipType(t *testing.T) {
 	race := "race_01"
+	typeName := "Drone"
 	g(t, func(p func(*game.Param), g func() mg.Game) {
-		err := game.CreateShipType(p, race, "  Drone ", 1, 0, 0, 0, 0)
+		err := game.DeleteShipType(p, race, typeName)
+		assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameNotExists))
+		err = game.CreateShipType(p, race, "  "+typeName+" ", 1, 0, 0, 0, 0)
 		assert.NoError(t, err)
 		st, err := g().ShipTypes(race)
 		assert.NoError(t, err)
@@ -24,6 +27,12 @@ func TestCreateShipType(t *testing.T) {
 		assert.Equal(t, st[0].Shields, 0.)
 		assert.Equal(t, st[0].Cargo, 0.)
 		assert.Equal(t, st[0].Armament, uint(0))
+		// TODO: test with existing ship group
+		err = game.DeleteShipType(p, race, typeName)
+		assert.NoError(t, err)
+		st, err = g().ShipTypes(race)
+		assert.NoError(t, err)
+		assert.Len(t, st, 0)
 	})
 }
 
@@ -70,7 +79,7 @@ func TestCreateShipTypeValidation(t *testing.T) {
 				err := game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.w, tc.s, tc.c, tc.a)
 				assert.NoError(t, err)
 				err = game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.w, tc.s, tc.c, tc.a)
-				assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameExists))
+				assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameDuplicate))
 			} else {
 				err := game.CreateShipType(p, race, tc.name, tc.d, tc.w, tc.s, tc.c, tc.a)
 				assert.ErrorContains(t, err, tc.err)

pkg/game/generator.go

@@ -75,7 +75,7 @@ func buildGameOnMap(races []string, m generator.Map) (*game.Game, error) {
 			m.HomePlanets[i].HW.Size, // HW's pop & ind = size
 			m.HomePlanets[i].HW.Size,
 			m.HomePlanets[i].HW.Resources,
-			game.ResearchDrive.AsType(""),
+			game.ResearchDrive.AsType(uuid.Nil),
 		))
 		planetCount++
 		for dw := range m.HomePlanets[i].DW {
@@ -89,7 +89,7 @@ func buildGameOnMap(races []string, m generator.Map) (*game.Game, error) {
 				m.HomePlanets[i].DW[dw].Size, // DW's pop & ind = size
 				m.HomePlanets[i].DW[dw].Size,
 				m.HomePlanets[i].DW[dw].Resources,
-				game.ResearchDrive.AsType(""),
+				game.ResearchDrive.AsType(uuid.Nil),
 			))
 			planetCount++
 		}
@@ -111,7 +111,7 @@ func buildGameOnMap(races []string, m generator.Map) (*game.Game, error) {
 			0,
 			0,
 			m.FreePlanets[i].Resources,
-			game.ProductionNone.AsType(""),
+			game.ProductionNone.AsType(uuid.Nil),
 		))
 		planetCount++
 	}