summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/web/server.go4
-rw-r--r--pkg/web/server_test.go2
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/web/server.go b/pkg/web/server.go
index e553920..c87873c 100644
--- a/pkg/web/server.go
+++ b/pkg/web/server.go
@@ -3,7 +3,6 @@ package web
import (
"net/http"
- "github.com/google/jsonapi"
"github.com/xlgmokha/x/pkg/serde"
"gitlab.com/mokhax/sparkled/pkg/db"
)
@@ -28,8 +27,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
case "/sparkles.json":
switch r.Method {
case "GET":
- w.Header().Set("Content-Type", jsonapi.MediaType)
- serde.ToJSONAPI(w, s.db.All())
+ serde.ToHTTP(w, r, s.db.All())
}
default:
s.fileserver.ServeHTTP(w, r)
diff --git a/pkg/web/server_test.go b/pkg/web/server_test.go
index a8a0e19..684cc7f 100644
--- a/pkg/web/server_test.go
+++ b/pkg/web/server_test.go
@@ -27,7 +27,7 @@ func TestServer(t *testing.T) {
assert.Equal(t, http.StatusOK, response.Code)
- items, err := serde.FromJSONAPI[[]*domain.Sparkle](response.Body)
+ items, err := serde.FromJSON[[]*domain.Sparkle](response.Body)
require.NoError(t, err)
assert.Equal(t, 1, len(items))