Skip to content

Commit

Permalink
Set status code before returning when no data
Browse files Browse the repository at this point in the history
  • Loading branch information
EwenQuim committed Dec 18, 2024
1 parent 5150da1 commit cbb96f4
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 4 deletions.
8 changes: 4 additions & 4 deletions serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ func HTTPHandler[ReturnType, Body any, Contextable ctx[Body]](s *Server, control
}
w.Header().Add("Server-Timing", Timing{"controller", time.Since(timeController), ""}.String())

if reflect.TypeOf(ans) == nil {
return
}

if route.DefaultStatusCode != 0 {
w.WriteHeader(route.DefaultStatusCode)
}

if reflect.TypeOf(ans) == nil {
return
}

// TRANSFORM OUT
timeTransformOut := time.Now()
ans, err = transformOut(r.Context(), ans)
Expand Down
36 changes: 36 additions & 0 deletions serve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -607,3 +607,39 @@ func newTLSTestHelper() (*tlsTestHelper, error) {
keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: privateKeyBytes})
return &tlsTestHelper{cert: certPEM, key: keyPEM}, nil
}

func TestReturn204WhenNoData(t *testing.T) {
t.Run("can return 204 when no data is being sent", func(t *testing.T) {
s := NewServer()

Get(s, "/", func(_ ContextNoBody) (any, error) {
return nil, nil
},
OptionDefaultStatusCode(204),
)

r := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()

s.Mux.ServeHTTP(w, r)

require.Equal(t, 204, w.Code)
})

t.Run("must return 500 when an error is being sent, even with no body", func(t *testing.T) {
s := NewServer()

Get(s, "/", func(_ ContextNoBody) (any, error) {
return nil, errors.New("error")
},
OptionDefaultStatusCode(204),
)

r := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()

s.Mux.ServeHTTP(w, r)

require.Equal(t, 500, w.Code)
})
}

0 comments on commit cbb96f4

Please sign in to comment.