diff --git a/client/src/app/core/services/topping.service.ts b/client/src/app/core/services/topping.service.ts index cdd4b6f..d70d158 100644 --- a/client/src/app/core/services/topping.service.ts +++ b/client/src/app/core/services/topping.service.ts @@ -65,8 +65,12 @@ export class ToppingService { country = getCountryMapSwitcher(asyncCountry); return this._httpClient.get( - `${environment.api}/toppings/groups/${country}/${filename}`, + `${environment.api}/toppings/groups`, { + params: { + country: country, + filename: filename, + }, withCredentials: true, } ); @@ -81,8 +85,12 @@ export class ToppingService { country = getCountryMapSwitcher(asyncCountry); return this._httpClient.get( - `${environment.api}/toppings/lists/${country}/${filename}`, + `${environment.api}/toppings/lists`, { + params: { + country: country, + filename: filename, + }, withCredentials: true, } ); diff --git a/server/routers/topping.go b/server/routers/topping.go index d9be814..730d7e2 100644 --- a/server/routers/topping.go +++ b/server/routers/topping.go @@ -2,6 +2,7 @@ package routers import ( "encoding/json" + "fmt" "net/http" "recipe-manager/data" "recipe-manager/services/logger" @@ -25,9 +26,15 @@ func NewToppingRouter(data *data.Data, taoLogger *logger.TaoLogger) *ToppingRout } func (tr *ToppingRouter) Route(r chi.Router) { + + // check incoming request + fmt.Println("topping router", r.Routes()) + r.Route("/toppings", func(r chi.Router) { - r.Get("/groups/{country}/{filename}", tr.GetToppingGroups) - r.Get("/lists/{country}/{filename}", tr.GetToppingLists) + + r.Get("/groups", tr.GetToppingGroups) + + r.Get("/lists", tr.GetToppingLists) }) } @@ -36,8 +43,13 @@ func (tr *ToppingRouter) GetToppingGroups(w http.ResponseWriter, r *http.Request w.Header().Add("Content-Type", "application/json") // just in case: params country and filename - country := chi.URLParam(r, "country") - filename := chi.URLParam(r, "filename") + // country := chi.URLParam(r, "country") + // filename := chi.URLParam(r, "filename") + + query := r.URL.Query() + + country := query.Get("country") + filename := query.Get("filename") // get topping groups toppingGroups := tr.data.GetAllToppingGroups(country, filename) @@ -55,8 +67,10 @@ func (tr *ToppingRouter) GetToppingGroups(w http.ResponseWriter, r *http.Request func (tr *ToppingRouter) GetToppingLists(w http.ResponseWriter, r *http.Request) { w.Header().Add("Content-Type", "application/json") - country := chi.URLParam(r, "country") - filename := chi.URLParam(r, "filename") + query := r.URL.Query() + + country := query.Get("country") + filename := query.Get("filename") // get toppping list toppingLists := tr.data.GetToppingsList(country, filename)