experiment using json marshal / unmarshal for hashid

Author: stereosteve

api/dbv1/full_developer_apps.go

@@ -18,7 +18,7 @@ func (as *ApiServer) v1DeveloperApps(c *fiber.Ctx) error {
 		address = "0x" + address
 	}
 
-	developerApps, err := as.queries.FullDeveloperApps(c.Context(), dbv1.GetDeveloperAppsParams{
+	developerApps, err := as.queries.GetDeveloperApps(c.Context(), dbv1.GetDeveloperAppsParams{
 		Address: address,
 	})
 	if err != nil {
@@ -29,12 +29,6 @@ func (as *ApiServer) v1DeveloperApps(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusNotFound, "Developer app not found")
 	}
 
-	if !c.Locals("isFull").(bool) {
-		return c.JSON(fiber.Map{
-			"data": dbv1.ToMinDeveloperApps(developerApps)[0],
-		})
-	}
-
 	return c.JSON(fiber.Map{
 		"data": developerApps[0],
 	})

api/dbv1/get_developer_apps.sql.go

@@ -5,16 +5,12 @@ import (
 	"testing"
 
 	"bridgerton.audius.co/api/dbv1"
-	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestGetDeveloperAppsQueries(t *testing.T) {
 	developerApps, err := app.queries.GetDeveloperApps(t.Context(), dbv1.GetDeveloperAppsParams{
-		UserID: pgtype.Int4{
-			Int32: 1,
-			Valid: true,
-		},
+		UserID: 1,
 	})
 	assert.NoError(t, err)
 	assert.Len(t, developerApps, 1)
@@ -23,7 +19,7 @@ func TestGetDeveloperAppsQueries(t *testing.T) {
 
 func TestGetDeveloperApp(t *testing.T) {
 	var resp struct {
-		Data dbv1.FullDeveloperApp
+		Data dbv1.GetDeveloperAppsRow
 	}
 	status, body := testGet(t, "/v1/developer_apps/0x7d7b6b7a97d1deefe3a1ccc5a13c48e8f055e0b6", &resp)
 	assert.Equal(t, 200, status)

api/dbv1/models.go

@@ -37,6 +37,11 @@ sql:
               import: "encoding/json"
               type: "RawMessage"
 
+          - column: "developer_apps.user_id"
+            go_type:
+              import: "bridgerton.audius.co/trashid"
+              type: "TrashId"
+
           - column: "tracks.copyright_line"
             go_type:
               import: "encoding/json"

api/v1_developer_apps.go

@@ -3,6 +3,7 @@ package trashid
 import (
 	"errors"
 	"strconv"
+	"strings"
 
 	"github.com/speps/go-hashids/v2"
 )
@@ -50,3 +51,20 @@ func MustEncodeHashID(id int) string {
 	}
 	return enc
 }
+
+type TrashId int
+
+func (num TrashId) MarshalJSON() ([]byte, error) {
+	hid, err := EncodeHashId(int(num))
+	return []byte(`"` + hid + `"`), err
+}
+
+func (num *TrashId) UnmarshalJSON(data []byte) error {
+	idStr := strings.Trim(string(data), `"`)
+	id, err := DecodeHashId(idStr)
+	if err != nil {
+		return err
+	}
+	*num = TrashId(id)
+	return nil
+}