annika/isl-api
1
0
Fork 0
mirror of https://forgejo.merr.is/annika/isl-api.git synced 2025-12-13 12:35:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made Changes To Use a pgx Connection Pool

Browse source
This commit is contained in:
Annika Merris 2024-02-05 17:05:02 -05:00
parent c327b571f6
commit c1231d487a
5 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Controllers/PowerItemController.go
View file

@ -11,6 +11,14 @@ import (
"github.com/julienschmidt/httprouter"
)
// TODO: Figure out a better place to put this.
func MiddleCORS(next httprouter.Handle) httprouter.Handle {
return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
w.Header().Set("Access-Control-Allow-Origin", "*")
next(w, r, ps)
}
}
type PowerItemController struct {
powerItemService *Services.PowerItemService
}
@ -24,15 +32,15 @@ func NewPowerItemController(router *httprouter.Router, powerItemService *Service
}
func (p *PowerItemController) setPowerItemEndpoints(router *httprouter.Router, prefix string) {
router.HandlerFunc("GET", fmt.Sprintf("%v", prefix), p.getAll)
router.HandlerFunc("GET", fmt.Sprintf("%v/asMap", prefix), p.getAllAsMap)
router.HandlerFunc("GET", fmt.Sprintf("%v/byType/:type", prefix), p.getAllByType)
router.HandlerFunc("GET", fmt.Sprintf("%v/byType/:type/asMap", prefix), p.getAllByTypeAsMap)
router.HandlerFunc("POST", fmt.Sprintf("%v", prefix), p.add)
router.HandlerFunc("POST", fmt.Sprintf("%v/multiple", prefix), p.addMultiple)
router.GET(fmt.Sprintf("%v", prefix), MiddleCORS(p.getAll))
router.GET(fmt.Sprintf("%v/asMap", prefix), MiddleCORS(p.getAllAsMap))
router.GET(fmt.Sprintf("%v/byType/:type", prefix), MiddleCORS(p.getAllByType))
router.GET(fmt.Sprintf("%v/byType/:type/asMap", prefix), MiddleCORS(p.getAllByTypeAsMap))
router.POST(fmt.Sprintf("%v", prefix), MiddleCORS(p.add))
router.POST(fmt.Sprintf("%v/multiple", prefix), MiddleCORS(p.addMultiple))
}
func (p *PowerItemController) add(w http.ResponseWriter, r *http.Request) {
func (p *PowerItemController) add(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
var newItem Types.PowerItem
err := json.NewDecoder(r.Body).Decode(&newItem)
if err != nil {
@ -56,7 +64,7 @@ func (p *PowerItemController) add(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, string(returnValue))
}
func (p *PowerItemController) addMultiple(w http.ResponseWriter, r *http.Request) {
func (p *PowerItemController) addMultiple(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
var itemType int32 = 3
var newItems map[string]Types.PowerItem
err := json.NewDecoder(r.Body).Decode(&newItems)
@ -84,7 +92,7 @@ func (p *PowerItemController) addMultiple(w http.ResponseWriter, r *http.Request
fmt.Fprint(w, string(returnValue))
}
func (p *PowerItemController) getAll(w http.ResponseWriter, r *http.Request) {
func (p *PowerItemController) getAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
result, err := p.powerItemService.GetAll()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -101,7 +109,7 @@ func (p *PowerItemController) getAll(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, string(data))
}
func (p *PowerItemController) getAllAsMap(w http.ResponseWriter, r *http.Request) {
func (p *PowerItemController) getAllAsMap(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
items, err := p.powerItemService.GetAll()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -124,9 +132,8 @@ func (p *PowerItemController) getAllAsMap(w http.ResponseWriter, r *http.Request
fmt.Fprint(w, string(data))
}
func (p *PowerItemController) getAllByType(w http.ResponseWriter, r *http.Request) {
params := httprouter.ParamsFromContext(r.Context())
typeCode, err := strconv.Atoi(params.ByName("type"))
func (p *PowerItemController) getAllByType(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
typeCode, err := strconv.Atoi(ps.ByName("type"))
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
@ -148,9 +155,8 @@ func (p *PowerItemController) getAllByType(w http.ResponseWriter, r *http.Reques
fmt.Fprint(w, string(data))
}
func (p *PowerItemController) getAllByTypeAsMap(w http.ResponseWriter, r *http.Request) {
params := httprouter.ParamsFromContext(r.Context())
typeCode, err := strconv.Atoi(params.ByName("type"))
func (p *PowerItemController) getAllByTypeAsMap(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
typeCode, err := strconv.Atoi(ps.ByName("type"))
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return