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

Switched From httprouter to chi

Browse source 
I believe all functionality works properly
This commit is contained in:
Annika Merris 2024-02-07 19:15:25 -05:00
parent c1231d487a
commit d4b2d5fefb
9 changed files with 77 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Controllers/PowerItemController.go
View file

@ -6,42 +6,24 @@ import (
"net/http"
"strconv"
"forgejo.merr.is/annika/isl-api/Entities"
"forgejo.merr.is/annika/isl-api/Services"
"forgejo.merr.is/annika/isl-api/Types"
"github.com/julienschmidt/httprouter"
"github.com/go-chi/chi/v5"
)
// 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
}
func NewPowerItemController(router *httprouter.Router, powerItemService *Services.PowerItemService) *PowerItemController {
func NewPowerItemController(powerItemService *Services.PowerItemService) *PowerItemController {
controller := &PowerItemController{
powerItemService: powerItemService,
}
controller.setPowerItemEndpoints(router, "/powerItem")
return controller
}
func (p *PowerItemController) setPowerItemEndpoints(router *httprouter.Router, prefix string) {
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, ps httprouter.Params) {
var newItem Types.PowerItem
func (p *PowerItemController) Add(w http.ResponseWriter, r *http.Request) {
var newItem Entities.PowerItem
err := json.NewDecoder(r.Body).Decode(&newItem)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
@ -64,9 +46,9 @@ func (p *PowerItemController) add(w http.ResponseWriter, r *http.Request, ps htt
fmt.Fprint(w, string(returnValue))
}
func (p *PowerItemController) addMultiple(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
func (p *PowerItemController) AddMultiple(w http.ResponseWriter, r *http.Request) {
var itemType int32 = 3
var newItems map[string]Types.PowerItem
var newItems map[string]Entities.PowerItem
err := json.NewDecoder(r.Body).Decode(&newItems)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
@ -92,7 +74,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, ps httprouter.Params) {
func (p *PowerItemController) GetAll(w http.ResponseWriter, r *http.Request) {
result, err := p.powerItemService.GetAll()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -109,14 +91,14 @@ func (p *PowerItemController) getAll(w http.ResponseWriter, r *http.Request, ps
fmt.Fprint(w, string(data))
}
func (p *PowerItemController) getAllAsMap(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
func (p *PowerItemController) GetAllAsMap(w http.ResponseWriter, r *http.Request) {
items, err := p.powerItemService.GetAll()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
resultMap := make(map[string]Types.PowerItem)
resultMap := make(map[string]Entities.PowerItem)
for _, curItem := range items {
uuid := fmt.Sprintf("%x-%x-%x-%x-%x", curItem.ID.Bytes[0:4], curItem.ID.Bytes[4:6], curItem.ID.Bytes[6:8], curItem.ID.Bytes[8:10], curItem.ID.Bytes[10:16])
resultMap[uuid] = curItem
@ -132,8 +114,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, ps httprouter.Params) {
typeCode, err := strconv.Atoi(ps.ByName("type"))
func (p *PowerItemController) GetAllByType(w http.ResponseWriter, r *http.Request) {
typeCode, err := strconv.Atoi(chi.URLParam(r, "type"))
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
@ -155,8 +137,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, ps httprouter.Params) {
typeCode, err := strconv.Atoi(ps.ByName("type"))
func (p *PowerItemController) GetAllByTypeAsMap(w http.ResponseWriter, r *http.Request) {
typeCode, err := strconv.Atoi(chi.URLParam(r, "type"))
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
@ -168,7 +150,7 @@ func (p *PowerItemController) getAllByTypeAsMap(w http.ResponseWriter, r *http.R
return
}
resultMap := make(map[string]Types.PowerItem)
resultMap := make(map[string]Entities.PowerItem)
for _, curItem := range items {
uuid := fmt.Sprintf("%x-%x-%x-%x-%x", curItem.ID.Bytes[0:4], curItem.ID.Bytes[4:6], curItem.ID.Bytes[6:8], curItem.ID.Bytes[8:10], curItem.ID.Bytes[10:16])
resultMap[uuid] = curItem