Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Bind and Render methods on request and response objects #47

Merged
merged 12 commits into from
Oct 29, 2021
Merged

Implement Bind and Render methods on request and response objects #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4821928
Add initial render.Renderer implementation to response objects
Oct 28, 2021
6c5818b
Remove New from response constructor function names
Oct 28, 2021
20489c3
Update response-bodies.tmpl
Oct 29, 2021
9c98e2a
Fix StatusNoContent header in petstore example
Oct 29, 2021
0a2b93d
Add basic Bind method to request bodies
Oct 29, 2021
c9c042a
Remove chi folder in petstore example
Oct 29, 2021
94eccb9
Fix package paths in tests
Oct 29, 2021
0d9e84c
Discriminate between bindable and non-bindable types
Oct 29, 2021
a7b50fa
Add newline to end of template file
Oct 29, 2021
bf441af
Update examples to use render for errors
Oct 29, 2021
40bc4f8
Add new codegen tests
Oct 29, 2021
07e0d94
Update tests
Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 146 additions & 31 deletions ...petstore-expanded/chi/api/petstore.gen.go → ...les/petstore-expanded/api/petstore.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 21 additions & 23 deletions ...les/petstore-expanded/chi/api/petstore.go → examples/petstore-expanded/api/petstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
//go:generate go run github.com/discord-gophers/goapi-gen --package=api --generate types,server,spec -o petstore.gen.go ../../petstore-expanded.yaml
//go:generate go run github.com/discord-gophers/goapi-gen --package=api --generate types,server,spec -o petstore.gen.go ../petstore-expanded.yaml

package api

import (
"encoding/json"
"fmt"
"net/http"
"sync"

"github.com/go-chi/render"
)

type PetStore struct {
Expand All @@ -26,16 +27,7 @@ func NewPetStore() *PetStore {
}
}

// This function wraps sending of an error in the Error format, and
// handling the failure to marshal that.
func sendPetstoreError(w http.ResponseWriter, code int, message string) {
petErr := Error{
Code: int32(code),
Message: message,
}
w.WriteHeader(code)
json.NewEncoder(w).Encode(petErr)
}
const petNotFoundMsg = "Could not find pet with ID %d"

// Here, we implement all of the handlers in the ServerInterface
func (p *PetStore) FindPets(w http.ResponseWriter, r *http.Request, params FindPetsParams) {
Expand Down Expand Up @@ -66,15 +58,17 @@ func (p *PetStore) FindPets(w http.ResponseWriter, r *http.Request, params FindP
}
}

w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(result)
render.Render(w, r, FindPetsJSON200Response(result))
}

func (p *PetStore) AddPet(w http.ResponseWriter, r *http.Request) {
// We expect a NewPet object in the request body.
var newPet NewPet
if err := json.NewDecoder(r.Body).Decode(&newPet); err != nil {
sendPetstoreError(w, http.StatusBadRequest, "Invalid format for NewPet")
var newPet AddPetJSONRequestBody
if err := render.Bind(r, &newPet); err != nil {
render.Render(
w, r,
AddPetJSONDefaultResponse(Error{"Invalid format for NewPet"}).Status(http.StatusBadRequest),
)
return
}

Expand All @@ -95,8 +89,7 @@ func (p *PetStore) AddPet(w http.ResponseWriter, r *http.Request) {
p.Pets[pet.ID] = pet

// Now, we have to return the NewPet
w.WriteHeader(http.StatusCreated)
json.NewEncoder(w).Encode(pet)
render.Render(w, r, AddPetJSON201Response(pet))
}

func (p *PetStore) FindPetByID(w http.ResponseWriter, r *http.Request, id int64) {
Expand All @@ -105,12 +98,14 @@ func (p *PetStore) FindPetByID(w http.ResponseWriter, r *http.Request, id int64)

pet, found := p.Pets[id]
if !found {
sendPetstoreError(w, http.StatusNotFound, fmt.Sprintf("Could not find pet with ID %d", id))
render.Render(
w, r,
FindPetByIDJSONDefaultResponse(Error{fmt.Sprintf(petNotFoundMsg, id)}).Status(http.StatusNotFound),
)
return
}

w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(pet)
render.Render(w, r, FindPetByIDJSON200Response(pet))
}

func (p *PetStore) DeletePet(w http.ResponseWriter, r *http.Request, id int64) {
Expand All @@ -119,7 +114,10 @@ func (p *PetStore) DeletePet(w http.ResponseWriter, r *http.Request, id int64) {

_, found := p.Pets[id]
if !found {
sendPetstoreError(w, http.StatusNotFound, fmt.Sprintf("Could not find pet with ID %d", id))
render.Render(
w, r,
DeletePetJSONDefaultResponse(Error{fmt.Sprintf(petNotFoundMsg, id)}).Status(http.StatusNotFound),
)
return
}
delete(p.Pets, id)
Expand Down
Loading