Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
35e4bc8ac2 |
@@ -3,8 +3,7 @@ package api
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"git.ego.cloudns.be/egommerce/api-entities/basket"
|
def "git.pbiernat.io/egommerce/api-entities/http"
|
||||||
basket "git.ego.cloudns.be/egommerce/api-entities/basket/dto"
|
|
||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -16,9 +15,9 @@ type BasketAPI struct {
|
|||||||
httpClient *HttpClient
|
httpClient *HttpClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
|
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
||||||
req := &basket.GetBasketRequestDTO{BasketID: basketID}
|
req := &def.GetBasketRequest{BasketID: basketID}
|
||||||
res := new(basket.GetBasketResponse)
|
res := new(def.GetBasketResponse)
|
||||||
if err := a.httpClient.SendGet("basket-svc", "/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
|
||||||
}
|
}
|
||||||
@@ -26,9 +25,9 @@ func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, er
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *BasketAPI) GetBasketItems(basketID string) ([]*basket.GetBasketItemsResponseDTO, 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 []*basket.GetBasketItemsResponseDTO
|
var res []*def.GetBasketItemsResponse
|
||||||
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
|
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,11 @@ package consul
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.pbiernat.io/egommerce/go-api-pkg/config"
|
"git.ego.cloudns.be/egommerce/go-api-pkg/config"
|
||||||
consul "github.com/hashicorp/consul/api"
|
consul "github.com/hashicorp/consul/api"
|
||||||
"github.com/hashicorp/consul/connect"
|
"github.com/hashicorp/consul/connect"
|
||||||
)
|
)
|
||||||
@@ -61,7 +60,6 @@ func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix st
|
|||||||
|
|
||||||
func newClientConfig(serverAddr string) *consul.Config {
|
func newClientConfig(serverAddr string) *consul.Config {
|
||||||
conf := consul.DefaultConfig()
|
conf := consul.DefaultConfig()
|
||||||
log.Printf("Setting consul server addr: %s", serverAddr)
|
|
||||||
conf.Address = serverAddr
|
conf.Address = serverAddr
|
||||||
|
|
||||||
return conf
|
return conf
|
||||||
|
|||||||
Reference in New Issue
Block a user