Compare commits

..

3 Commits

Author SHA1 Message Date
c4f6ba825c Update go.mod 2025-12-13 16:38:33 +01:00
8bb3101bb0 Update repo URL 2025-12-13 16:31:26 +01:00
67b0b54eea Refactor - simplify code 2025-11-16 18:06:36 +01:00
6 changed files with 23 additions and 35 deletions

View File

@@ -3,8 +3,8 @@ package api
import (
"fmt"
basket "git.ego.freeddns.org/egommerce/api-entities/basket/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
basket "git.pbiernat.space/egommerce/api-entities/basket/dto"
cnf "git.pbiernat.space/egommerce/go-api-pkg/config"
)
func NewBasketAPI() *BasketAPI {

View File

@@ -4,7 +4,6 @@ import (
"bytes"
"crypto/tls"
"encoding/json"
"fmt"
"net/http"
)
@@ -18,38 +17,27 @@ func NewHttpClient(baseURL string) *HttpClient {
}
func (c *HttpClient) SendGet(url string, data, out any) error {
fmt.Printf("Sending req to: %s%s\n", c.baseURL, url)
res, err := c.sendRequest(url, http.MethodGet, data)
resp, err := c.sendRequest(url, http.MethodGet, data)
if err != nil {
return err
}
decoder := json.NewDecoder(res.Body)
defer res.Body.Close()
decoder := json.NewDecoder(resp.Body)
defer resp.Body.Close()
err = decoder.Decode(&out)
if err != nil {
return err
}
return nil
return decoder.Decode(&out)
}
func (c *HttpClient) SendPost(url string, data, out any) (any, error) {
res, err := c.sendRequest(url, http.MethodPost, data)
func (c *HttpClient) SendPost(url string, data, out any) error {
resp, err := c.sendRequest(url, http.MethodPost, data)
if err != nil {
return nil, err
return err
}
decoder := json.NewDecoder(res.Body)
defer res.Body.Close()
decoder := json.NewDecoder(resp.Body)
defer resp.Body.Close()
err = decoder.Decode(out)
if err != nil {
return nil, err
}
return out, nil
return decoder.Decode(&out)
}
func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response, error) {
@@ -59,7 +47,6 @@ func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode
}
// Create an HTTP client with the custom transport
client := &http.Client{Transport: tr} // FIXME dev mode
json, err := json.Marshal(&data)
@@ -74,10 +61,11 @@ func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response,
req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", c.userAgent)
res, err := client.Do(req)
req.Header.Set("Authorization", "Bearer DupaToken")
resp, err := client.Do(req)
if err != nil {
return nil, err
}
return res, nil
return resp, nil
}

View File

@@ -1,8 +1,8 @@
package api
import (
identity "git.ego.freeddns.org/egommerce/api-entities/identity/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
identity "git.pbiernat.space/egommerce/api-entities/identity/dto"
cnf "git.pbiernat.space/egommerce/go-api-pkg/config"
)
type IdentityAPI struct {

View File

@@ -3,8 +3,8 @@ package api
import (
"fmt"
pricing "git.ego.freeddns.org/egommerce/api-entities/pricing/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
pricing "git.pbiernat.space/egommerce/api-entities/pricing/dto"
cnf "git.pbiernat.space/egommerce/go-api-pkg/config"
)
func NewPricingAPI() *PricingAPI {

4
go.mod
View File

@@ -1,4 +1,4 @@
module git.ego.freeddns.org/egommerce/go-api-pkg
module git.pbiernat.space/egommerce/go-api-pkg
go 1.24
@@ -10,7 +10,7 @@ require (
)
require (
git.ego.freeddns.org/egommerce/api-entities v0.3.50
git.pbiernat.space/egommerce/api-entities v0.3.53
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/jackc/pgx/v5 v5.7.6
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

4
go.sum
View File

@@ -1,5 +1,5 @@
git.ego.freeddns.org/egommerce/api-entities v0.3.50 h1:3BYB+0gGSkXf4JlcYQtlLhe3goL5aL8A9M54LlzdlfM=
git.ego.freeddns.org/egommerce/api-entities v0.3.50/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY=
git.pbiernat.space/egommerce/api-entities v0.3.50 h1:3BYB+0gGSkXf4JlcYQtlLhe3goL5aL8A9M54LlzdlfM=
git.pbiernat.space/egommerce/api-entities v0.3.50/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=