Skip to content

Commit 68a7d4b

Browse files
joewagnerjoewagner
authored
Merge pull request #500 from tablelandnetwork/joe/hotfix
Replace old table external_url
2 parents 6d3408f + 86233ea commit 68a7d4b

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎internal/gateway/gateway.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (g *GatewayService) GetTableMetadata(ctx context.Context, id tables.TableID
8989
chainID, store, err := g.getStore(ctx)
9090
if err != nil {
9191
return sqlstore.TableMetadata{
92-
ExternalURL: fmt.Sprintf("%s/chain/%d/tables/%s", g.extURLPrefix, chainID, id),
92+
ExternalURL: fmt.Sprintf("%s/api/v1/tables/%d/%s", g.extURLPrefix, chainID, id),
9393
Image: g.emptyMetadataImage(),
9494
Message: "Chain isn't supported",
9595
}, nil
@@ -99,14 +99,14 @@ func (g *GatewayService) GetTableMetadata(ctx context.Context, id tables.TableID
9999
if !errors.Is(err, sql.ErrNoRows) {
100100
log.Error().Err(err).Msg("error fetching the table")
101101
return sqlstore.TableMetadata{
102-
ExternalURL: fmt.Sprintf("%s/chain/%d/tables/%s", g.extURLPrefix, chainID, id),
102+
ExternalURL: fmt.Sprintf("%s/api/v1/tables/%d/%s", g.extURLPrefix, chainID, id),
103103
Image: g.emptyMetadataImage(),
104104
Message: "Failed to fetch the table",
105105
}, nil
106106
}
107107

108108
return sqlstore.TableMetadata{
109-
ExternalURL: fmt.Sprintf("%s/chain/%d/tables/%s", g.extURLPrefix, chainID, id),
109+
ExternalURL: fmt.Sprintf("%s/api/v1/tables/%d/%s", g.extURLPrefix, chainID, id),
110110
Image: g.emptyMetadataImage(),
111111
Message: "Table not found",
112112
}, ErrTableNotFound
@@ -119,7 +119,7 @@ func (g *GatewayService) GetTableMetadata(ctx context.Context, id tables.TableID
119119

120120
return sqlstore.TableMetadata{
121121
Name: tableName,
122-
ExternalURL: fmt.Sprintf("%s/chain/%d/tables/%s", g.extURLPrefix, table.ChainID, table.ID),
122+
ExternalURL: fmt.Sprintf("%s/api/v1/tables/%d/%s", g.extURLPrefix, table.ChainID, table.ID),
123123
Image: g.getMetadataImage(table.ChainID, table.ID),
124124
AnimationURL: g.getAnimationURL(table.ChainID, table.ID),
125125
Attributes: []sqlstore.TableMetadataAttribute{

‎internal/gateway/gateway_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ func TestGatewayInitialization(t *testing.T) {
3939
t.Run("invalid metadata uri", func(t *testing.T) {
4040
t.Parallel()
4141

42-
_, err := NewGateway(nil, nil, "https://tableland.network/tables", "invalid uri", "")
42+
_, err := NewGateway(nil, nil, "https://tableland.network", "invalid uri", "")
4343
require.Error(t, err)
4444
require.ErrorContains(t, err, "metadata renderer uri could not be parsed")
4545
})
4646

4747
t.Run("invalid animation uri", func(t *testing.T) {
4848
t.Parallel()
4949

50-
_, err := NewGateway(nil, nil, "https://tableland.network/tables", "https://render.tableland.xyz", "invalid uri")
50+
_, err := NewGateway(nil, nil, "https://tableland.network", "https://render.tableland.xyz", "invalid uri")
5151
require.Error(t, err)
5252
require.ErrorContains(t, err, "animation renderer uri could not be parsed")
5353
})
@@ -97,13 +97,13 @@ func TestGateway(t *testing.T) {
9797
require.NoError(t, err)
9898

9999
stack := map[tableland.ChainID]sqlstore.SystemStore{1337: store}
100-
svc, err := NewGateway(parser, stack, "https://tableland.network/tables", "https://render.tableland.xyz", "")
100+
svc, err := NewGateway(parser, stack, "https://tableland.network", "https://render.tableland.xyz", "")
101101
require.NoError(t, err)
102102
metadata, err := svc.GetTableMetadata(ctx, id)
103103
require.NoError(t, err)
104104

105105
require.Equal(t, "foo_1337_42", metadata.Name)
106-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
106+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
107107
require.Equal(t, "https://render.tableland.xyz/1337/42", metadata.Image) //nolint
108108
require.Equal(t, "date", metadata.Attributes[0].DisplayType)
109109
require.Equal(t, "created", metadata.Attributes[0].TraitType)
@@ -161,14 +161,14 @@ func TestGetMetadata(t *testing.T) {
161161
parser, err := parserimpl.New([]string{"system_", "registry", "sqlite_"})
162162
require.NoError(t, err)
163163

164-
svc, err := NewGateway(parser, stack, "https://tableland.network/tables", "", "")
164+
svc, err := NewGateway(parser, stack, "https://tableland.network", "", "")
165165
require.NoError(t, err)
166166

167167
metadata, err := svc.GetTableMetadata(ctx, id)
168168
require.NoError(t, err)
169169

170170
require.Equal(t, "foo_1337_42", metadata.Name)
171-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
171+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
172172
require.Equal(t, DefaultMetadataImage, metadata.Image)
173173
require.Equal(t, "date", metadata.Attributes[0].DisplayType)
174174
require.Equal(t, "created", metadata.Attributes[0].TraitType)
@@ -180,14 +180,14 @@ func TestGetMetadata(t *testing.T) {
180180
parser, err := parserimpl.New([]string{"system_", "registry", "sqlite_"})
181181
require.NoError(t, err)
182182

183-
svc, err := NewGateway(parser, stack, "https://tableland.network/tables", "https://render.tableland.xyz", "")
183+
svc, err := NewGateway(parser, stack, "https://tableland.network", "https://render.tableland.xyz", "")
184184
require.NoError(t, err)
185185

186186
metadata, err := svc.GetTableMetadata(ctx, id)
187187
require.NoError(t, err)
188188

189189
require.Equal(t, "foo_1337_42", metadata.Name)
190-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
190+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
191191
require.Equal(t, "https://render.tableland.xyz/1337/42", metadata.Image)
192192
require.Equal(t, "date", metadata.Attributes[0].DisplayType)
193193
require.Equal(t, "created", metadata.Attributes[0].TraitType)
@@ -199,14 +199,14 @@ func TestGetMetadata(t *testing.T) {
199199
parser, err := parserimpl.New([]string{"system_", "registry", "sqlite_"})
200200
require.NoError(t, err)
201201

202-
svc, err := NewGateway(parser, stack, "https://tableland.network/tables", "https://render.tableland.xyz/", "")
202+
svc, err := NewGateway(parser, stack, "https://tableland.network", "https://render.tableland.xyz/", "")
203203
require.NoError(t, err)
204204

205205
metadata, err := svc.GetTableMetadata(ctx, id)
206206
require.NoError(t, err)
207207

208208
require.Equal(t, "foo_1337_42", metadata.Name)
209-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
209+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
210210
require.Equal(t, "https://render.tableland.xyz/1337/42", metadata.Image)
211211
require.Equal(t, "date", metadata.Attributes[0].DisplayType)
212212
require.Equal(t, "created", metadata.Attributes[0].TraitType)
@@ -218,7 +218,7 @@ func TestGetMetadata(t *testing.T) {
218218
parser, err := parserimpl.New([]string{"system_", "registry", "sqlite_"})
219219
require.NoError(t, err)
220220

221-
_, err = NewGateway(parser, stack, "https://tableland.network/tables", "foo", "")
221+
_, err = NewGateway(parser, stack, "https://tableland.network", "foo", "")
222222
require.Error(t, err)
223223
require.ErrorContains(t, err, "metadata renderer uri could not be parsed")
224224
})
@@ -229,15 +229,15 @@ func TestGetMetadata(t *testing.T) {
229229
parser, err := parserimpl.New([]string{"system_", "registry", "sqlite_"})
230230
require.NoError(t, err)
231231

232-
svc, err := NewGateway(parser, stack, "https://tableland.network/tables", "https://render.tableland.xyz", "")
232+
svc, err := NewGateway(parser, stack, "https://tableland.network", "https://render.tableland.xyz", "")
233233
require.NoError(t, err)
234234

235235
id, _ := tables.NewTableID("43")
236236
require.NoError(t, err)
237237

238238
metadata, err := svc.GetTableMetadata(ctx, id)
239239
require.ErrorIs(t, err, ErrTableNotFound)
240-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
240+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
241241
require.Equal(t, "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nNTEyJyBoZWlnaHQ9JzUxMicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJz48cmVjdCB3aWR0aD0nNTEyJyBoZWlnaHQ9JzUxMicgZmlsbD0nIzAwMCcvPjwvc3ZnPg==", metadata.Image) // nolint
242242
require.Equal(t, "Table not found", metadata.Message)
243243
})
@@ -251,7 +251,7 @@ func TestGetMetadata(t *testing.T) {
251251
svc, err := NewGateway(
252252
parser,
253253
stack,
254-
"https://tableland.network/tables",
254+
"https://tableland.network",
255255
"https://render.tableland.xyz",
256256
"https://render.tableland.xyz/anim",
257257
)
@@ -261,7 +261,7 @@ func TestGetMetadata(t *testing.T) {
261261
require.NoError(t, err)
262262

263263
require.Equal(t, "foo_1337_42", metadata.Name)
264-
require.Equal(t, fmt.Sprintf("https://tableland.network/tables/chain/%d/tables/%s", 1337, id), metadata.ExternalURL)
264+
require.Equal(t, fmt.Sprintf("https://tableland.network/api/v1/tables/%d/%s", 1337, id), metadata.ExternalURL)
265265
require.Equal(t, "https://render.tableland.xyz/1337/42", metadata.Image)
266266
require.Equal(t, "https://render.tableland.xyz/anim/?chain=1337&id=42", metadata.AnimationURL)
267267
require.Equal(t, "date", metadata.Attributes[0].DisplayType)
@@ -292,7 +292,7 @@ func TestQueryConstraints(t *testing.T) {
292292
gateway, err := NewGateway(
293293
parser,
294294
stack,
295-
"https://tableland.network/tables",
295+
"https://tableland.network",
296296
"https://render.tableland.xyz",
297297
"https://render.tableland.xyz/anim",
298298
)

‎internal/router/controllers/controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ func TestGetTablesByMocked(t *testing.T) {
167167

168168
t.Run("get table metadata", func(t *testing.T) {
169169
t.Parallel()
170-
req, err := http.NewRequest("GET", "/chain/1337/tables/100", nil)
170+
req, err := http.NewRequest("GET", "/api/v1/tables/1337/100", nil)
171171
require.NoError(t, err)
172172

173173
router := mux.NewRouter()
174-
router.HandleFunc("/chain/{chainID}/tables/{tableId}", ctrl.GetTable)
174+
router.HandleFunc("/api/v1/tables/{chainID}/{tableId}", ctrl.GetTable)
175175

176176
rr := httptest.NewRecorder()
177177
router.ServeHTTP(rr, req)

‎pkg/client/v1/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestGetTableByID(t *testing.T) {
9797

9898
table := calls.getTableByID(id)
9999
require.NotEmpty(t, fullName, table.Name)
100-
require.Equal(t, "https://testnets.tableland.network/chain/1337/tables/1", table.ExternalUrl)
100+
require.Equal(t, "https://testnets.tableland.network/api/v1/tables/1337/1", table.ExternalUrl)
101101
require.Equal(t, "https://render.tableland.xyz/anim/?chain=1337&id=1", table.AnimationUrl)
102102
require.Equal(t, "https://render.tableland.xyz/1337/1", table.Image)
103103

0 commit comments

Comments
 (0)