chore(storage): common sorting for all servers

internal/provider/ivpn/updater/servers.go

@@ -5,6 +5,7 @@ package ivpn
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
 	"github.com/qdm12/gluetun/internal/models"
@@ -72,7 +73,7 @@ func (u *Updater) GetServers(ctx context.Context, minServers int) (
 		servers = append(servers, server)
 	}
 
-	sortServers(servers)
+	sort.Sort(models.SortableServers(servers))
 
 	return servers, nil
 }

internal/provider/ivpn/updater/sort.go

@@ -1,22 +0,0 @@
-package ivpn
-
-import (
-	"sort"
-
-	"github.com/qdm12/gluetun/internal/models"
-)
-
-func sortServers(servers []models.Server) {
-	sort.Slice(servers, func(i, j int) bool {
-		if servers[i].Country == servers[j].Country {
-			if servers[i].City == servers[j].City {
-				if servers[i].Hostname == servers[j].Hostname {
-					return servers[i].VPN < servers[j].VPN
-				}
-				return servers[i].Hostname < servers[j].Hostname
-			}
-			return servers[i].City < servers[j].City
-		}
-		return servers[i].Country < servers[j].Country
-	})
-}

internal/provider/ivpn/updater/sort_test.go

@@ -1,40 +0,0 @@
-package ivpn
-
-import (
-	"testing"
-
-	"github.com/qdm12/gluetun/internal/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_sortServers(t *testing.T) {
-	t.Parallel()
-	testCases := map[string]struct {
-		initialServers []models.Server
-		sortedServers  []models.Server
-	}{
-		"no server": {},
-		"sorted servers": {
-			initialServers: []models.Server{
-				{Country: "B", City: "A", Hostname: "A"},
-				{Country: "A", City: "A", Hostname: "B"},
-				{Country: "A", City: "A", Hostname: "A"},
-				{Country: "A", City: "B", Hostname: "A"},
-			},
-			sortedServers: []models.Server{
-				{Country: "A", City: "A", Hostname: "A"},
-				{Country: "A", City: "A", Hostname: "B"},
-				{Country: "A", City: "B", Hostname: "A"},
-				{Country: "B", City: "A", Hostname: "A"},
-			},
-		},
-	}
-	for name, testCase := range testCases {
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			sortServers(testCase.initialServers)
-			assert.Equal(t, testCase.sortedServers, testCase.initialServers)
-		})
-	}
-}