refactor db list options (#901)

* refactor db list options

* Update internal/turso/databases.go

Co-authored-by: Athos <athos@turso.tech>

* Update internal/turso/databases.go

Co-authored-by: Athos <athos@turso.tech>

* move client up

---------

Co-authored-by: Athos <athos@turso.tech>

Author: notrab

internal/cmd/auth.go

@@ -17,6 +17,7 @@ import (
 	"github.com/tursodatabase/turso-cli/internal"
 	"github.com/tursodatabase/turso-cli/internal/flags"
 	"github.com/tursodatabase/turso-cli/internal/settings"
+	"github.com/tursodatabase/turso-cli/internal/turso"
 )
 
 //go:embed login.html
@@ -275,7 +276,7 @@ func signupHint(config *settings.Settings) {
 		return
 	}
 
-	dbs, err := client.Databases.List(nil)
+	dbs, err := client.Databases.List(turso.DatabaseListOptions{})
 	if err != nil || len(dbs) != 0 {
 		return
 	}

internal/cmd/db.go

@@ -59,7 +59,7 @@ func getDatabases(client *turso.Client, fresh ...bool) ([]turso.Database, error)
 	if cachedNames := getDatabasesCache(); !skipCache && cachedNames != nil {
 		return cachedNames, nil
 	}
-	databases, err := client.Databases.List(nil)
+	databases, err := client.Databases.List(turso.DatabaseListOptions{})
 	if err != nil {
 		return nil, err
 	}

internal/cmd/db_list.go

@@ -29,14 +29,10 @@ var listCmd = &cobra.Command{
 			return err
 		}
 
-		options := make(map[string]string)
-		if groupFilter != "" {
-			options["group"] = groupFilter
+		options := turso.DatabaseListOptions{
+			Group:  groupFilter,
+			Schema: schemaFilter,
 		}
-		if schemaFilter != "" {
-			options["schema"] = schemaFilter
-		}
-
 		databases, err := client.Databases.List(options)
 		if err != nil {
 			return err

internal/turso/databases.go

@@ -27,18 +27,27 @@ type Database struct {
 
 type DatabasesClient client
 
-func (d *DatabasesClient) List(options map[string]string) ([]Database, error) {
-	path := d.URL("")
+type DatabaseListOptions struct {
+	Group  string
+	Schema string
+}
 
+func (o DatabaseListOptions) Encode() string {
 	query := url.Values{}
-	for key, value := range options {
-		if value != "" {
-			query.Add(key, value)
-		}
+	if o.Group != "" {
+		query.Set("group", o.Group)
+	}
+	if o.Schema != "" {
+		query.Set("schema", o.Schema)
 	}
+	return query.Encode()
+}
+
+func (d *DatabasesClient) List(options DatabaseListOptions) ([]Database, error) {
+	path := d.URL("")
 
-	if len(query) > 0 {
-		path += "?" + query.Encode()
+	if options := options.Encode(); options != "" {
+		path += "?" + options
 	}
 
 	r, err := d.client.Get(path, nil)