Merge pull request #342 from ErikKalkoken/feat-remove-set-slice

ErikKalkoken · web-flow · commit 84fe5788fec3 · 2025-12-22T12:38:03.000+01:00
feat: replace Set:Slice() usage
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	fyne.io/fyne/v2 v2.7.1
 	github.com/ErikKalkoken/eveauth v0.1.0
 	github.com/ErikKalkoken/fyne-kx v0.6.4
-	github.com/ErikKalkoken/go-set v0.1.0
+	github.com/ErikKalkoken/go-set v0.2.0
 	github.com/JohannesKaufmann/html-to-markdown v1.6.0
 	github.com/PuerkitoBio/goquery v1.11.0
 	github.com/anthonynsimon/bild v0.14.0
diff --git a/go.sum b/go.sum
@@ -47,6 +47,8 @@ github.com/ErikKalkoken/go-set v0.0.0-20251218130435-a0521ce135e4 h1:sylpjAZjPyb
 github.com/ErikKalkoken/go-set v0.0.0-20251218130435-a0521ce135e4/go.mod h1:8hyYMuo2dqGaCGf32C/CILHMTVRJ9CV2vlcIPGOBe5I=
 github.com/ErikKalkoken/go-set v0.1.0 h1:oPQH/4oOMFMFyGRGHloo+Ey5/jepYIfFsnhK2W7Smb0=
 github.com/ErikKalkoken/go-set v0.1.0/go.mod h1:8hyYMuo2dqGaCGf32C/CILHMTVRJ9CV2vlcIPGOBe5I=
+github.com/ErikKalkoken/go-set v0.2.0 h1:qbeuoupUMuwnbHzGwXTeFXXC9m/WLAPeoDakyP6rLnw=
+github.com/ErikKalkoken/go-set v0.2.0/go.mod h1:8hyYMuo2dqGaCGf32C/CILHMTVRJ9CV2vlcIPGOBe5I=
 github.com/JohannesKaufmann/html-to-markdown v1.6.0 h1:04VXMiE50YYfCfLboJCLcgqF5x+rHJnb1ssNmqpLH/k=
 github.com/JohannesKaufmann/html-to-markdown v1.6.0/go.mod h1:NUI78lGg/a7vpEJTz/0uOcYMaibytE4BUOQS8k78yPQ=
 github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
diff --git a/internal/app/characterservice/assets.go b/internal/app/characterservice/assets.go
@@ -257,7 +257,7 @@ func (s *CharacterService) updateAssetsESI(ctx context.Context, arg app.Characte
 			}
 			slog.Info("Stored character assets", "characterID", characterID, "created", created, "updated", updated)
 			if ids := set.Difference(currentIDs, incomingIDs); ids.Size() > 0 {
-				if err := s.st.DeleteCharacterAssets(ctx, characterID, ids.Slice()); err != nil {
+				if err := s.st.DeleteCharacterAssets(ctx, characterID, ids); err != nil {
 					return err
 				}
 				slog.Info("Deleted obsolete character assets", "characterID", characterID, "count", ids.Size())
diff --git a/internal/app/characterservice/assets_internal_test.go b/internal/app/characterservice/assets_internal_test.go
@@ -9,9 +9,12 @@ import (
 	"github.com/jarcoal/httpmock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/ErikKalkoken/go-set"
+
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage"
 	"github.com/ErikKalkoken/evebuddy/internal/app/testutil"
+	"github.com/ErikKalkoken/evebuddy/internal/xassert"
 )
 
 func TestUpdateCharacterAssetsESI(t *testing.T) {
@@ -156,7 +159,7 @@ func TestUpdateCharacterAssetsESI(t *testing.T) {
 			assert.True(t, changed)
 			ids, err := st.ListCharacterAssetIDs(ctx, c.ID)
 			if assert.NoError(t, err) {
-				assert.ElementsMatch(t, []int64{1000000016835, 1000000016836}, ids.Slice())
+				xassert.EqualSet(t, set.Of[int64](1000000016835, 1000000016836), ids)
 			}
 		}
 	})
diff --git a/internal/app/characterservice/character.go b/internal/app/characterservice/character.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"slices"
 
 	"github.com/ErikKalkoken/go-set"
 	"github.com/antihax/goesi/esi"
@@ -177,7 +178,7 @@ func (s *CharacterService) HasCharacter(ctx context.Context, id int32) (bool, er
 // The provided context is used for the SSO authentication process only and can be canceled.
 // the setInfo callback is used to update info text in a dialog.
 func (s *CharacterService) UpdateOrCreateCharacterFromSSO(ctx context.Context, setInfo func(s string)) (*app.Character, error) {
-	ssoToken, err := s.authClient.Authorize(ctx, app.Scopes().Slice())
+	ssoToken, err := s.authClient.Authorize(ctx, slices.Collect(app.Scopes().All()))
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/app/characterservice/planets.go b/internal/app/characterservice/planets.go
@@ -107,7 +107,7 @@ func (s *CharacterService) updatePlanetsESI(ctx context.Context, arg app.Charact
 			}
 			obsolete := set.Difference(existing, incoming)
 			if obsolete.Size() > 0 {
-				if err := s.st.DeleteCharacterPlanet(ctx, characterID, obsolete.Slice()); err != nil {
+				if err := s.st.DeleteCharacterPlanet(ctx, characterID, obsolete); err != nil {
 					return err
 				}
 				slog.Info("Removed obsolete planets", "characterID", characterID, "count", obsolete.Size())
diff --git a/internal/app/characterservice/search.go b/internal/app/characterservice/search.go
@@ -16,10 +16,11 @@ import (
 
 // AddEveEntitiesFromSearchESI runs a search on ESI and adds the results as new EveEntity objects to the database.
 // This method performs a character specific search and needs a token.
-func (s *CharacterService) AddEveEntitiesFromSearchESI(ctx context.Context, characterID int32, search string) ([]int32, error) {
+func (s *CharacterService) AddEveEntitiesFromSearchESI(ctx context.Context, characterID int32, search string) (set.Set[int32], error) {
+	var z set.Set[int32]
 	token, err := s.GetValidCharacterToken(ctx, characterID)
 	if err != nil {
-		return nil, err
+		return z, err
 	}
 	categories := []string{
 		"corporation",
@@ -30,15 +31,15 @@ func (s *CharacterService) AddEveEntitiesFromSearchESI(ctx context.Context, char
 	ctx = xgoesi.NewContextWithOperationID(ctx, "GetCharactersCharacterIdSearch")
 	r, _, err := s.esiClient.ESI.SearchApi.GetCharactersCharacterIdSearch(ctx, categories, characterID, search, nil)
 	if err != nil {
-		return nil, err
+		return z, err
 	}
 	ids := set.Union(set.Of(r.Alliance...), set.Of(r.Character...), set.Of(r.Corporation...))
 	missingIDs, err := s.eus.AddMissingEntities(ctx, ids)
 	if err != nil {
 		slog.Error("Failed to fetch missing IDs", "error", err)
-		return nil, err
+		return z, err
 	}
-	return missingIDs.Slice(), nil
+	return missingIDs, nil
 }
 
 // SearchESI performs a name search for items on the ESI server
diff --git a/internal/app/characterservice/skill_internal_test.go b/internal/app/characterservice/skill_internal_test.go
@@ -5,11 +5,14 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/ErikKalkoken/go-set"
+	"github.com/jarcoal/httpmock"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage"
 	"github.com/ErikKalkoken/evebuddy/internal/app/testutil"
-	"github.com/jarcoal/httpmock"
-	"github.com/stretchr/testify/assert"
+	"github.com/ErikKalkoken/evebuddy/internal/xassert"
 )
 
 func TestGetAttributes(t *testing.T) {
@@ -188,7 +191,7 @@ func TestUpdateCharacterSkillsESI(t *testing.T) {
 			assert.True(t, changed)
 			ids, err := st.ListCharacterSkillIDs(ctx, c.ID)
 			if assert.NoError(t, err) {
-				assert.ElementsMatch(t, []int32{41}, ids.Slice())
+				xassert.EqualSet(t, set.Of[int32](41), ids)
 			}
 		}
 	})
diff --git a/internal/app/characterservice/skills.go b/internal/app/characterservice/skills.go
@@ -215,7 +215,7 @@ func (s *CharacterService) updateSkillsESI(ctx context.Context, arg app.Characte
 			}
 			slog.Info("Stored updated character skills", "characterID", characterID, "count", len(skills.Skills))
 			if ids := set.Difference(currentSkillIDs, incomingSkillIDs); ids.Size() > 0 {
-				if err := s.st.DeleteCharacterSkills(ctx, characterID, ids.Slice()); err != nil {
+				if err := s.st.DeleteCharacterSkills(ctx, characterID, ids); err != nil {
 					return err
 				}
 				slog.Info("Deleted obsolete character skills", "characterID", characterID, "count", ids.Size())
diff --git a/internal/app/characterservice/token.go b/internal/app/characterservice/token.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"log/slog"
+	"slices"
 	"time"
 
 	"github.com/ErikKalkoken/eveauth"
@@ -120,7 +121,7 @@ func (s *CharacterService) ensureValidCharacterToken(ctx context.Context, token
 		CharacterID:  token.CharacterID,
 		ExpiresAt:    token.ExpiresAt,
 		RefreshToken: token.RefreshToken,
-		Scopes:       token.Scopes.Slice(),
+		Scopes:       slices.Collect(token.Scopes.All()),
 		TokenType:    token.TokenType,
 	}
 	err := s.authClient.RefreshToken(ctx, token2)
diff --git a/internal/app/eveuniverseservice/character.go b/internal/app/eveuniverseservice/character.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
+	"slices"
 
 	"github.com/ErikKalkoken/go-set"
 	"github.com/icrowley/fake"
@@ -141,7 +142,7 @@ func (s *EveUniverseService) UpdateAllCharactersESI(ctx context.Context) (set.Se
 	if ids.Size() == 0 {
 		return changed, nil
 	}
-	ids2 := ids.Slice()
+	ids2 := slices.Collect(ids.All())
 	hasChanged := make([]bool, len(ids2))
 	g := new(errgroup.Group)
 	g.SetLimit(s.concurrencyLimit)
diff --git a/internal/app/eveuniverseservice/entity.go b/internal/app/eveuniverseservice/entity.go
@@ -63,7 +63,7 @@ func (s *EveUniverseService) ToEntities(ctx context.Context, ids set.Set[int32])
 	if _, err := s.AddMissingEntities(ctx, ids2); err != nil {
 		return nil, err
 	}
-	oo, err := s.st.ListEveEntitiesForIDs(ctx, ids2.Slice())
+	oo, err := s.st.ListEveEntitiesForIDs(ctx, slices.Collect(ids2.All()))
 	if err != nil {
 		return nil, err
 	}
@@ -112,7 +112,7 @@ func (s *EveUniverseService) AddMissingEntities(ctx context.Context, ids set.Set
 	if missing.Size() > 0 {
 		slog.Debug("Trying to resolve missing EveEntity IDs from ESI", "ids", missing)
 		var ee []esi.PostUniverseNames200Ok
-		for chunk := range slices.Chunk(missing.Slice(), esiPostUniverseNamesMax) {
+		for chunk := range slices.Chunk(slices.Collect(missing.All()), esiPostUniverseNamesMax) {
 			eeChunk, badChunk, err := s.resolveIDsFromESI(ctx, chunk)
 			if err != nil {
 				return set.Set[int32]{}, wrapErr(err)
diff --git a/internal/app/eveuniverseservice/entity_test.go b/internal/app/eveuniverseservice/entity_test.go
@@ -143,7 +143,7 @@ func TestAddMissingEveEntities(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			assert.ElementsMatch(t, ids, ids2.Slice())
+			xassert.EqualSet(t, set.Of(ids...), ids2)
 		}
 	})
 	t.Run("should store unresolvable IDs accordingly", func(t *testing.T) {
diff --git a/internal/app/eveuniverseservice/location.go b/internal/app/eveuniverseservice/location.go
@@ -176,7 +176,7 @@ func (s *EveUniverseService) AddMissingLocations(ctx context.Context, ids set.Se
 	if missing.Size() == 0 {
 		return nil
 	}
-	entities, err := s.EntityIDsFromLocationsESI(ctx, missing.Slice())
+	entities, err := s.EntityIDsFromLocationsESI(ctx, slices.Collect(missing.All()))
 	if err != nil {
 		return err
 	}
diff --git a/internal/app/eveuniverseservice/organization.go b/internal/app/eveuniverseservice/organization.go
@@ -162,7 +162,7 @@ func (s *EveUniverseService) UpdateAllCorporationsESI(ctx context.Context) (set.
 	if ids.Size() == 0 {
 		return changed, nil
 	}
-	ids2 := ids.Slice()
+	ids2 := slices.Collect(ids.All())
 	hasChanged := make([]bool, len(ids2))
 	g := new(errgroup.Group)
 	g.SetLimit(s.concurrencyLimit)
diff --git a/internal/app/settings/settings.go b/internal/app/settings/settings.go
@@ -272,7 +272,7 @@ func (s Settings) ResetNotificationTypesEnabled() {
 }
 
 func (s Settings) SetNotificationTypesEnabled(v set.Set[string]) {
-	s.p.SetStringList(settingNotificationTypesEnabled, v.Slice())
+	s.p.SetStringList(settingNotificationTypesEnabled, slices.Collect(v.All()))
 }
 
 func (s Settings) NotifyCommunicationsEarliest() time.Time {
diff --git a/internal/app/storage/characterasset.go b/internal/app/storage/characterasset.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"slices"
 
 	"github.com/ErikKalkoken/go-set"
 
@@ -161,10 +162,10 @@ func (st *Storage) CreateCharacterAsset(ctx context.Context, arg CreateCharacter
 	return nil
 }
 
-func (st *Storage) DeleteCharacterAssets(ctx context.Context, characterID int32, itemIDs []int64) error {
+func (st *Storage) DeleteCharacterAssets(ctx context.Context, characterID int32, itemIDs set.Set[int64]) error {
 	arg := queries.DeleteCharacterAssetsParams{
 		CharacterID: int64(characterID),
-		ItemIds:     itemIDs,
+		ItemIds:     slices.Collect(itemIDs.All()),
 	}
 	return st.qRW.DeleteCharacterAssets(ctx, arg)
 }
diff --git a/internal/app/storage/characterasset_test.go b/internal/app/storage/characterasset_test.go
@@ -120,7 +120,7 @@ func TestCharacterAsset(t *testing.T) {
 		x1 := factory.CreateCharacterAsset(storage.CreateCharacterAssetParams{CharacterID: c.ID})
 		x2 := factory.CreateCharacterAsset(storage.CreateCharacterAssetParams{CharacterID: c.ID})
 		// when
-		err := st.DeleteCharacterAssets(ctx, c.ID, []int64{x2.ItemID})
+		err := st.DeleteCharacterAssets(ctx, c.ID, set.Of(x2.ItemID))
 		// then
 		if assert.NoError(t, err) {
 			got, err := st.ListCharacterAssetIDs(ctx, c.ID)
diff --git a/internal/app/storage/characterindustryjob.go b/internal/app/storage/characterindustryjob.go
@@ -45,7 +45,7 @@ func (st *Storage) DeleteCharacterIndustryJobsByID(ctx context.Context, characte
 	}
 	err := st.qRW.DeleteCharacterIndustryJobs(ctx, queries.DeleteCharacterIndustryJobsParams{
 		CharacterID: int64(characterID),
-		JobIds:      convertNumericSlice[int64](jobIDs.Slice()),
+		JobIds:      convertNumericSet[int64](jobIDs),
 	})
 	if err != nil {
 		return wrapErr(err)
@@ -244,7 +244,7 @@ func (st *Storage) UpdateCharacterIndustryJobStatus(ctx context.Context, arg Upd
 	}
 	err := st.qRW.UpdateCharacterIndustryJobStatus(ctx, queries.UpdateCharacterIndustryJobStatusParams{
 		CharacterID: int64(arg.CharacterID),
-		JobIds:      convertNumericSlice[int64](arg.JobIDs.Slice()),
+		JobIds:      convertNumericSet[int64](arg.JobIDs),
 		Status:      jobStatusToDBValue[arg.Status],
 	})
 	if err != nil {
diff --git a/internal/app/storage/charactermarketorder.go b/internal/app/storage/charactermarketorder.go
@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 	"log/slog"
+	"slices"
 	"time"
 
 	"github.com/ErikKalkoken/go-set"
@@ -42,7 +43,7 @@ func (st *Storage) DeleteCharacterMarketOrders(ctx context.Context, characterID
 	}
 	err := st.qRW.DeleteCharacterMarketOrders(ctx, queries.DeleteCharacterMarketOrdersParams{
 		CharacterID: int64(characterID),
-		OrderIds:    orderIDs.Slice(),
+		OrderIds:    slices.Collect(orderIDs.All()),
 	})
 	if err != nil {
 		return wrapErr(err)
@@ -177,7 +178,7 @@ func (st *Storage) UpdateCharacterMarketOrderState(ctx context.Context, arg Upda
 	}
 	err := st.qRW.UpdateCharacterMarketOrderState(ctx, queries.UpdateCharacterMarketOrderStateParams{
 		CharacterID: int64(arg.CharacterID),
-		OrderIds:    arg.OrderIDs.Slice(),
+		OrderIds:    slices.Collect(arg.OrderIDs.All()),
 		State:       orderStatusToDBValue[arg.State],
 	})
 	if err != nil {
diff --git a/internal/app/storage/characterplanet.go b/internal/app/storage/characterplanet.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/ErikKalkoken/go-set"
+
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage/queries"
 	"github.com/ErikKalkoken/evebuddy/internal/optional"
@@ -36,10 +38,10 @@ func (st *Storage) CreateCharacterPlanet(ctx context.Context, arg CreateCharacte
 	return id, nil
 }
 
-func (st *Storage) DeleteCharacterPlanet(ctx context.Context, characterID int32, planetIDs []int32) error {
+func (st *Storage) DeleteCharacterPlanet(ctx context.Context, characterID int32, planetIDs set.Set[int32]) error {
 	arg := queries.DeleteCharacterPlanetsParams{
 		CharacterID:  int64(characterID),
-		EvePlanetIds: convertNumericSlice[int64](planetIDs),
+		EvePlanetIds: convertNumericSet[int64](planetIDs),
 	}
 	if err := st.qRW.DeleteCharacterPlanets(ctx, arg); err != nil {
 		return fmt.Errorf("delete character planets: %+v: %w", arg, err)
diff --git a/internal/app/storage/characterplanet_test.go b/internal/app/storage/characterplanet_test.go
@@ -5,9 +5,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ErikKalkoken/go-set"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage"
 	"github.com/ErikKalkoken/evebuddy/internal/app/testutil"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestPlanet(t *testing.T) {
@@ -100,7 +102,7 @@ func TestPlanet(t *testing.T) {
 		p2 := factory.CreateCharacterPlanet(storage.CreateCharacterPlanetParams{CharacterID: c.ID})
 		p3 := factory.CreateCharacterPlanet(storage.CreateCharacterPlanetParams{CharacterID: c.ID})
 		// when
-		err := st.DeleteCharacterPlanet(ctx, c.ID, []int32{p1.EvePlanet.ID, p2.EvePlanet.ID})
+		err := st.DeleteCharacterPlanet(ctx, c.ID, set.Of(p1.EvePlanet.ID, p2.EvePlanet.ID))
 		// then
 		if assert.NoError(t, err) {
 			oo, err := st.ListCharacterPlanets(ctx, c.ID)
diff --git a/internal/app/storage/characterskill.go b/internal/app/storage/characterskill.go
@@ -10,10 +10,10 @@ import (
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage/queries"
 )
 
-func (st *Storage) DeleteCharacterSkills(ctx context.Context, characterID int32, eveTypeIDs []int32) error {
+func (st *Storage) DeleteCharacterSkills(ctx context.Context, characterID int32, eveTypeIDs set.Set[int32]) error {
 	arg := queries.DeleteCharacterSkillsParams{
 		CharacterID: int64(characterID),
-		EveTypeIds:  convertNumericSlice[int64](eveTypeIDs),
+		EveTypeIds:  convertNumericSet[int64](eveTypeIDs),
 	}
 	err := st.qRW.DeleteCharacterSkills(ctx, arg)
 	if err != nil {
diff --git a/internal/app/storage/characterskill_test.go b/internal/app/storage/characterskill_test.go
@@ -6,9 +6,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/ErikKalkoken/go-set"
+
 	"github.com/ErikKalkoken/evebuddy/internal/app"
 	"github.com/ErikKalkoken/evebuddy/internal/app/storage"
 	"github.com/ErikKalkoken/evebuddy/internal/app/testutil"
+	"github.com/ErikKalkoken/evebuddy/internal/xassert"
 )
 
 func TestCharacterSkill(t *testing.T) {
@@ -83,7 +86,7 @@ func TestCharacterSkill(t *testing.T) {
 		ids, err := st.ListCharacterSkillIDs(ctx, c.ID)
 		// then
 		if assert.NoError(t, err) {
-			assert.ElementsMatch(t, []int32{o1.EveType.ID, o2.EveType.ID}, ids.Slice())
+			xassert.EqualSet(t, set.Of(o1.EveType.ID, o2.EveType.ID), ids)
 		}
 	})
 	t.Run("can delete excluded skills", func(t *testing.T) {
@@ -93,12 +96,12 @@ func TestCharacterSkill(t *testing.T) {
 		x1 := factory.CreateCharacterSkill(storage.UpdateOrCreateCharacterSkillParams{CharacterID: c.ID})
 		x2 := factory.CreateCharacterSkill(storage.UpdateOrCreateCharacterSkillParams{CharacterID: c.ID})
 		// when
-		err := st.DeleteCharacterSkills(ctx, c.ID, []int32{x2.EveType.ID})
+		err := st.DeleteCharacterSkills(ctx, c.ID, set.Of(x2.EveType.ID))
 		// then
 		if assert.NoError(t, err) {
 			ids, err := st.ListCharacterSkillIDs(ctx, c.ID)
 			if assert.NoError(t, err) {
-				assert.ElementsMatch(t, []int32{x1.EveType.ID}, ids.Slice())
+				xassert.EqualSet(t, set.Of(x1.EveType.ID), ids)
 			}
 		}
 	})
diff --git a/internal/app/storage/charactertoken.go b/internal/app/storage/charactertoken.go
diff --git a/internal/app/storage/charactertoken_test.go b/internal/app/storage/charactertoken_test.go
diff --git a/internal/app/storage/corporation.go b/internal/app/storage/corporation.go
diff --git a/internal/app/storage/corporationindustryjob.go b/internal/app/storage/corporationindustryjob.go
diff --git a/internal/app/storage/corporationmember.go b/internal/app/storage/corporationmember.go
diff --git a/internal/app/storage/corporationstructure.go b/internal/app/storage/corporationstructure.go
diff --git a/internal/app/storage/slices.go b/internal/app/storage/slices.go
diff --git a/internal/app/storage/storage.go b/internal/app/storage/storage.go
diff --git a/internal/app/ui/characterflyableships.go b/internal/app/ui/characterflyableships.go
diff --git a/internal/app/ui/charactersendmail.go b/internal/app/ui/charactersendmail.go
diff --git a/internal/app/ui/colonies.go b/internal/app/ui/colonies.go
diff --git a/internal/app/ui/corporationstructures.go b/internal/app/ui/corporationstructures.go

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ func (s *CharacterService) updateAssetsESI(ctx context.Context, arg app.Characte`
`257`	`257`	`}`
`258`	`258`	`slog.Info("Stored character assets", "characterID", characterID, "created", created, "updated", updated)`
`259`	`259`	`if ids := set.Difference(currentIDs, incomingIDs); ids.Size() > 0 {`
`260`		`- if err := s.st.DeleteCharacterAssets(ctx, characterID, ids.Slice()); err != nil {`
	`260`	`+ if err := s.st.DeleteCharacterAssets(ctx, characterID, ids); err != nil {`
`261`	`261`	`return err`
`262`	`262`	`}`
`263`	`263`	`slog.Info("Deleted obsolete character assets", "characterID", characterID, "count", ids.Size())`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,12 @@ import (`
`9`	`9`	`"github.com/jarcoal/httpmock"`
`10`	`10`	`"github.com/stretchr/testify/assert"`
`11`	`11`
	`12`	`+ "github.com/ErikKalkoken/go-set"`
	`13`	`+`
`12`	`14`	`"github.com/ErikKalkoken/evebuddy/internal/app"`
`13`	`15`	`"github.com/ErikKalkoken/evebuddy/internal/app/storage"`
`14`	`16`	`"github.com/ErikKalkoken/evebuddy/internal/app/testutil"`
	`17`	`+ "github.com/ErikKalkoken/evebuddy/internal/xassert"`
`15`	`18`	`)`
`16`	`19`
`17`	`20`	`func TestUpdateCharacterAssetsESI(t *testing.T) {`
`@@ -156,7 +159,7 @@ func TestUpdateCharacterAssetsESI(t *testing.T) {`
`156`	`159`	`assert.True(t, changed)`
`157`	`160`	`ids, err := st.ListCharacterAssetIDs(ctx, c.ID)`
`158`	`161`	`if assert.NoError(t, err) {`
`159`		`- assert.ElementsMatch(t, []int64{1000000016835, 1000000016836}, ids.Slice())`
	`162`	`+ xassert.EqualSet(t, set.Of[int64](1000000016835, 1000000016836), ids)`
`160`	`163`	`}`
`161`	`164`	`}`
`162`	`165`	`})`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (s *CharacterService) updatePlanetsESI(ctx context.Context, arg app.Charact`
`107`	`107`	`}`
`108`	`108`	`obsolete := set.Difference(existing, incoming)`
`109`	`109`	`if obsolete.Size() > 0 {`
`110`		`- if err := s.st.DeleteCharacterPlanet(ctx, characterID, obsolete.Slice()); err != nil {`
	`110`	`+ if err := s.st.DeleteCharacterPlanet(ctx, characterID, obsolete); err != nil {`
`111`	`111`	`return err`
`112`	`112`	`}`
`113`	`113`	`slog.Info("Removed obsolete planets", "characterID", characterID, "count", obsolete.Size())`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (s *CharacterService) updateSkillsESI(ctx context.Context, arg app.Characte`
`215`	`215`	`}`
`216`	`216`	`slog.Info("Stored updated character skills", "characterID", characterID, "count", len(skills.Skills))`
`217`	`217`	`if ids := set.Difference(currentSkillIDs, incomingSkillIDs); ids.Size() > 0 {`
`218`		`- if err := s.st.DeleteCharacterSkills(ctx, characterID, ids.Slice()); err != nil {`
	`218`	`+ if err := s.st.DeleteCharacterSkills(ctx, characterID, ids); err != nil {`
`219`	`219`	`return err`
`220`	`220`	`}`
`221`	`221`	`slog.Info("Deleted obsolete character skills", "characterID", characterID, "count", ids.Size())`