egommerce/go-api-pkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API fix

Browse Source
This commit is contained in:
Piotr Biernat 2022-12-25 22:59:04 +01:00
parent f141f6c34f
commit 2e40ca75c9
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/basket.go
View File

@ -7,8 +7,8 @@ import (
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
) )
func NewBasketAPI(redis *redis.Client) *BasketAPI { func NewBasketAPI(ua string, redis *redis.Client) *BasketAPI {
return &BasketAPI{NewHttpClient(redis)} return &BasketAPI{NewHttpClient(ua, redis)}
} }
type BasketAPI struct { type BasketAPI struct {
@ -18,7 +18,7 @@ type BasketAPI struct {
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) { func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
req := &def.GetBasketRequest{BasketID: basketID} req := &def.GetBasketRequest{BasketID: basketID}
res := new(def.GetBasketResponse) res := new(def.GetBasketResponse)
if err := a.httpClient.SendGet("basket", "/api/v1/basket", req, res); err != nil { if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
return nil, err return nil, err
} }
@ -28,7 +28,7 @@ func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) { func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID) url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
var res []*def.GetBasketItemsResponse var res []*def.GetBasketItemsResponse
if err := a.httpClient.SendGet("basket", url, nil, &res); err != nil { if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
return nil, err return nil, err
} }

13
api/http.go
View File

@ -10,16 +10,13 @@ import (
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
) )
const (
HEADER_USER_AGENT = "order-httpclient"
)
type HttpClient struct { type HttpClient struct {
ua string
redis *redis.Client redis *redis.Client
} }
func NewHttpClient(redis *redis.Client) *HttpClient { func NewHttpClient(ua string, redis *redis.Client) *HttpClient {
return &HttpClient{redis} return &HttpClient{ua, redis}
} }
func (c *HttpClient) SendGet(api, url string, data, out any) error { func (c *HttpClient) SendGet(api, url string, data, out any) error {
@ -67,7 +64,7 @@ func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Respo
} }
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", HEADER_USER_AGENT) req.Header.Set("User-Agent", c.ua)
res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
@ -78,7 +75,7 @@ func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Respo
} }
func (c *HttpClient) getApiUrl(api string) string { func (c *HttpClient) getApiUrl(api string) string {
ctx, key, apiAddr := context.Background(), "internal__"+api+"_ips", api ctx, key, apiAddr := context.Background(), "internal__"+api+"__ips", api
// FIXME: key name ^^ // FIXME: key name ^^
cmd := c.redis.LLen(ctx, key) cmd := c.redis.LLen(ctx, key)
if cmd.Err() == nil { if cmd.Err() == nil {

6
api/pricing.go
View File

@ -7,8 +7,8 @@ import (
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
) )
func NewPricingAPI(redis *redis.Client) *PricingAPI { func NewPricingAPI(ua string, redis *redis.Client) *PricingAPI {
return &PricingAPI{NewHttpClient(redis)} return &PricingAPI{NewHttpClient(ua, redis)}
} }
type PricingAPI struct { type PricingAPI struct {
@ -18,7 +18,7 @@ type PricingAPI struct {
func (a *PricingAPI) GetProductPrice(productID int) (*def.ProductPriceResponse, error) { func (a *PricingAPI) GetProductPrice(productID int) (*def.ProductPriceResponse, error) {
url := fmt.Sprintf("/api/v1/product/%d", productID) url := fmt.Sprintf("/api/v1/product/%d", productID)
res := new(def.ProductPriceResponse) res := new(def.ProductPriceResponse)
if err := a.httpClient.SendGet("pricing", url, nil, res); err != nil { if err := a.httpClient.SendGet("pricing-svc", url, nil, res); err != nil {
return nil, err return nil, err
} }