Compare commits

...

11 Commits

Author SHA1 Message Date
sinhluu 91e69993af Merge pull request 'viettel-ffm' (#19) from viettel-ffm into master
Reviewed-on: #19
2024-07-11 03:04:15 +00:00
Sinh b7195b364f feat: refactor webhook handling for ViettelFFM partner API
- Add structs `Webhook`, `WebhookData` to handle webhook data in ViettelFFM partner API

Signed-off-by: Sinh <luuvansinh555@gmail.com>
2024-06-26 16:53:44 +07:00
Sinh 624cb96239 update VTP FFM model 2024-06-25 14:53:10 +07:00
Sinh e5619ae68c update VTP FFM api path 2024-06-25 14:13:40 +07:00
Sinh 00ec7e1f2f update VTP FFM model 2024-06-21 15:37:59 +07:00
Sinh fa6198d7e3 update VTP FFM model 2024-06-21 15:23:51 +07:00
Sinh d70f298734 change api path 2024-06-21 14:36:53 +07:00
Sinh ee60175a4d feat: integrate VTP FFM 2024-06-21 14:32:52 +07:00
Sinh baf7be0820 update model 2024-06-20 10:09:35 +07:00
Sinh 178652fcef feat: refactor logistics functions in Viettel FFM module
- Add a new type `CancelORPayload` to the file `model.go`
- Add a new constant `pathCancelOR` in the `viettel_ffm.go` file
- Change the method from `POST` to `PUT` in the `UpdateORLogisticInfo` function in `viettel_ffm.go`
- Add a new function `CancelOR` in the `viettel_ffm.go` file

Signed-off-by: Sinh <luuvansinh555@gmail.com>
2024-06-18 16:02:52 +07:00
Sinh 1034d2e077 feat: refactor ViettelFFM partner API integration
- Add the `const.go` file defining `ENV` type and constants `EnvStaging` and `EnvProd`
- Update `go.mod` to use `go 1.20` instead of `go 1.17`
- Introduce `model.go` file for ViettelFFM partner API structs
- Implement client methods for creating outbound requests and updating logistics information
- Implement an authentication method for the client with `AuthRes` struct
- Define constants for base URLs and authentication paths in ViettelFFM client
- Implement helper methods for getting base URL and making HTTP requests via NATS
- Update `util/httputil/const.go` to include `HeaderKeyAuthorization` constant

Signed-off-by: Sinh <luuvansinh555@gmail.com>
2024-06-14 17:31:02 +07:00
6 changed files with 325 additions and 7 deletions

9
const.go Normal file
View File

@ -0,0 +1,9 @@
package tpl
// ENV ...
type ENV string
const (
EnvStaging ENV = "STAGING"
EnvProd ENV = "PROD"
)

4
go.mod
View File

@ -1,10 +1,11 @@
module git.selly.red/Selly-Modules/3pl module git.selly.red/Selly-Modules/3pl
go 1.17 go 1.20
require ( require (
git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb
git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393 git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393
github.com/go-resty/resty/v2 v2.7.0
github.com/nats-io/nats.go v1.17.0 github.com/nats-io/nats.go v1.17.0
github.com/thoas/go-funk v0.9.2 github.com/thoas/go-funk v0.9.2
) )
@ -14,7 +15,6 @@ require (
github.com/elastic/go-licenser v0.4.1 // indirect github.com/elastic/go-licenser v0.4.1 // indirect
github.com/elastic/go-sysinfo v1.1.1 // indirect github.com/elastic/go-sysinfo v1.1.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect github.com/elastic/go-windows v1.0.1 // indirect
github.com/go-resty/resty/v2 v2.7.0 // indirect
github.com/golang/snappy v0.0.3 // indirect github.com/golang/snappy v0.0.3 // indirect
github.com/jcchavezs/porto v0.4.0 // indirect github.com/jcchavezs/porto v0.4.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect

4
go.sum
View File

@ -1,9 +1,5 @@
git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb h1:AmcYd88IcdSkH+NEvKyJLT7psidSkjJQT/nAg/KuzFk= git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb h1:AmcYd88IcdSkH+NEvKyJLT7psidSkjJQT/nAg/KuzFk=
git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb/go.mod h1:Q1//Z6HRmfa7VyjH2J6YyT0YV2jT8+K6SIgwnYuS4II= git.selly.red/Selly-Modules/logger v0.0.2-0.20221010053254-567df039afdb/go.mod h1:Q1//Z6HRmfa7VyjH2J6YyT0YV2jT8+K6SIgwnYuS4II=
git.selly.red/Selly-Modules/natsio v1.0.2-0.20221010041139-c11419a3ad33 h1:GvQjelaV4XZm++AOihYAKOD6k9510aMAr6B6MGnrXPs=
git.selly.red/Selly-Modules/natsio v1.0.2-0.20221010041139-c11419a3ad33/go.mod h1:KNODhfeBqxRmHHQHHU+p3JfH42t8s5aNxfgr6X8fr6g=
git.selly.red/Selly-Modules/natsio v1.0.3-0.20231006093940-b3bde5cd0960 h1:wL/BW1xGoB/EXeA2HtxT6Nr/cXpPJYVNfToV3aFtGls=
git.selly.red/Selly-Modules/natsio v1.0.3-0.20231006093940-b3bde5cd0960/go.mod h1:KNODhfeBqxRmHHQHHU+p3JfH42t8s5aNxfgr6X8fr6g=
git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393 h1:43kE03FW3NONfE6hXlghafS1d233dfc7grlFqd+15SA= git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393 h1:43kE03FW3NONfE6hXlghafS1d233dfc7grlFqd+15SA=
git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393/go.mod h1:KNODhfeBqxRmHHQHHU+p3JfH42t8s5aNxfgr6X8fr6g= git.selly.red/Selly-Modules/natsio v1.0.3-0.20231020090841-5edec97ee393/go.mod h1:KNODhfeBqxRmHHQHHU+p3JfH42t8s5aNxfgr6X8fr6g=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=

View File

@ -0,0 +1,79 @@
package viettelffm
type AuthRes struct {
AccessToken string `json:"access_token"`
ExpiresIn int `json:"expires_in"`
RefreshExpiresIn int `json:"refresh_expires_in"`
RefreshToken string `json:"refresh_token"`
TokenType string `json:"token_type"`
NotBeforePolicy int `json:"not-before-policy"`
SessionState string `json:"session_state"`
Scope string `json:"scope"`
}
type UpdateLogisticInfoPayload struct {
PrintLabelLink string `json:"print_label_link"`
TrackingCode string `json:"tracking_code"`
OrCode string `json:"or_code,omitempty"`
}
type CancelORPayload struct {
OrID int `json:"or_id"`
}
type ORPayload struct {
OrProductLines []ORProductLine `json:"or_product_lines"`
AmountPaid float64 `json:"amount_paid"`
CodAmount float64 `json:"cod_amount"`
CodType string `json:"cod_type"`
Note string `json:"note"`
OrCode string `json:"or_code"`
OrType string `json:"or_type"`
ShippingType string `json:"shipping_type"`
CustomerName string `json:"customer_name"`
CustomerEmail string `json:"customer_email"`
PackType string `json:"pack_type"`
PriorityType string `json:"priority_type"`
WarehouseCode string `json:"warehouse_code"`
}
type ORProductLine struct {
Discount float64 `json:"discount"`
Price float64 `json:"price"`
Product Product `json:"product"`
Quantity int `json:"quantity"`
SpecifiedProductLine SpecifiedProductLine `json:"specified_product_line"`
Unit string `json:"unit"`
}
type SpecifiedProductLine struct {
ProductConditionType ProdCondType `json:"product_condition_type"`
}
type Product struct {
PartnerSku string `json:"partner_sku"`
SKU string `json:"sku"`
}
type ProdCondType struct {
Name string `json:"name"`
}
type ORResult struct {
OrCode string `json:"or_code"`
OrId int `json:"or_id"`
Status string `json:"status"`
}
type Webhook struct {
Data WebhookData `json:"data"`
}
type WebhookData struct {
OrId int `json:"or_id"`
OrCode string `json:"or_code"`
PartnerOrCode string `json:"partner_or_code"`
Status string `json:"status"`
TotalPrice float64 `json:"total_price"`
ShippingFee int `json:"shipping_fee"`
}

View File

@ -0,0 +1,233 @@
package viettelffm
import (
"errors"
"fmt"
"net/http"
"net/url"
"time"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
tpl "git.selly.red/Selly-Modules/3pl"
"git.selly.red/Selly-Modules/3pl/util/httputil"
"git.selly.red/Selly-Modules/3pl/util/pjson"
)
const (
baseURLStag = "https://stg-gw.viettelpost.vn"
baseURLAuthStag = "https://stg-keycloak.viettelpost.vn"
// TODO: update prod url
baseURLProd = ""
baseURLAuthProd = ""
pathAuth = "/realms/wms/protocol/openid-connect/token"
pathUpdateORLogisticInfo = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/%s"
pathCreateOR = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/hab"
pathCancelOR = "/wms-core/api/v1/obms/outbound-request/cancel"
logTarget = "viettel-ffm"
)
var (
baseURLENVMapping = map[tpl.ENV]string{
tpl.EnvProd: baseURLProd,
tpl.EnvStaging: baseURLStag,
}
)
type Client struct {
env tpl.ENV
username string
password string
natsClient natsio.Server
authInfo *AuthRes
authTokenExpireTime time.Time
}
// NewClient generate OnPoint client
func NewClient(env tpl.ENV, user, pwd string, nc natsio.Server) (*Client, error) {
if user == "" || pwd == "" {
return nil, errors.New("viettelffm: cannot init with empty api key")
}
return &Client{
env: env,
username: user,
password: pwd,
natsClient: nc,
}, nil
}
func (c *Client) CreateOR(p ORPayload) (*ORResult, error) {
apiURL := c.getBaseURL() + pathCreateOR
token, err := c.getToken()
if err != nil {
return nil, err
}
natsPayload := model.CommunicationRequestHttp{
ResponseImmediately: true,
Payload: model.HttpRequest{
URL: apiURL,
Method: http.MethodPost,
Data: pjson.ToJSONString(p),
Header: map[string]string{
httputil.HeaderKeyAuthorization: fmt.Sprintf("Bearer %s", token),
httputil.HeaderKeyContentType: httputil.HeaderValueApplicationJSON,
},
},
LogTarget: logTarget,
}
r, err := c.requestHttpViaNats(natsPayload)
if err != nil {
return nil, fmt.Errorf("viettelffm.Client.CreateOR - requestHttpViaNats %v", err)
}
res := r.Response
if res.StatusCode >= http.StatusBadRequest {
return nil, fmt.Errorf("viettelffm.Client.CreateOR - requestHttpViaNats %s", res.Body)
}
var data ORResult
if err = r.ParseResponseData(&data); err != nil {
return nil, fmt.Errorf("viettelffm.Client.CreateOR - requestHttpViaNats parse response %v, %s", err, res.Body)
}
return &data, nil
}
func (c *Client) UpdateORLogisticInfo(p UpdateLogisticInfoPayload) error {
apiURL := c.getBaseURL() + fmt.Sprintf(pathUpdateORLogisticInfo, p.OrCode)
p.OrCode = ""
token, err := c.getToken()
if err != nil {
return err
}
natsPayload := model.CommunicationRequestHttp{
ResponseImmediately: true,
Payload: model.HttpRequest{
URL: apiURL,
Method: http.MethodPut,
Data: pjson.ToJSONString(p),
Header: map[string]string{
httputil.HeaderKeyAuthorization: fmt.Sprintf("Bearer %s", token),
httputil.HeaderKeyContentType: httputil.HeaderValueApplicationJSON,
},
},
LogTarget: logTarget,
}
r, err := c.requestHttpViaNats(natsPayload)
if err != nil {
return err
}
res := r.Response
if res.StatusCode >= http.StatusBadRequest {
return fmt.Errorf("viettelffm.Client.UpdateOutboundRequestLogisticInfo - requestHttpViaNats %s", res.Body)
}
return nil
}
func (c *Client) CancelOR(p CancelORPayload) error {
apiURL := c.getBaseURL() + pathCancelOR
token, err := c.getToken()
if err != nil {
return err
}
natsPayload := model.CommunicationRequestHttp{
ResponseImmediately: true,
Payload: model.HttpRequest{
URL: apiURL,
Method: http.MethodPost,
Data: pjson.ToJSONString(p),
Header: map[string]string{
httputil.HeaderKeyAuthorization: fmt.Sprintf("Bearer %s", token),
httputil.HeaderKeyContentType: httputil.HeaderValueApplicationJSON,
},
},
LogTarget: logTarget,
}
r, err := c.requestHttpViaNats(natsPayload)
if err != nil {
return err
}
res := r.Response
if res.StatusCode >= http.StatusBadRequest {
return fmt.Errorf("viettelffm.Client.CancelOR - requestHttpViaNats %s", res.Body)
}
return nil
}
// Auth ...
func (c *Client) Auth() (*AuthRes, error) {
v := url.Values{}
v.Set("username", c.username)
v.Set("password", c.password)
v.Set("grant_type", "password")
v.Set("client_id", "wms_account")
b := v.Encode()
header := map[string]string{
httputil.HeaderKeyContentType: httputil.HeaderValueApplicationURLEncoded,
}
bURL := baseURLAuthStag
if c.env == tpl.EnvProd {
bURL = baseURLAuthProd
}
api := bURL + pathAuth
natsPayload := model.CommunicationRequestHttp{
ResponseImmediately: true,
Payload: model.HttpRequest{
URL: api,
Method: http.MethodPost,
Data: b,
Header: header,
},
LogTarget: logTarget,
}
r, err := c.requestHttpViaNats(natsPayload)
if err != nil {
return nil, fmt.Errorf("viettelffm.Client.Auth - requestHttpViaNats: payload %+v, err %v\n", natsPayload, err)
}
res := r.Response
if res.StatusCode >= http.StatusBadRequest {
return nil, fmt.Errorf("viettelffm.Client.Auth - requestHttpViaNats %s", res.Body)
}
var data AuthRes
if err = r.ParseResponseData(&data); err != nil {
return nil, fmt.Errorf("viettelffm.Client.Auth - requestHttpViaNats parse response %v, %s", err, res.Body)
}
return &data, nil
}
func (c *Client) getToken() (string, error) {
if c.authInfo == nil || time.Now().After(c.authTokenExpireTime) {
auth, err := c.Auth()
if err != nil {
return "", err
}
c.authInfo = auth
c.authTokenExpireTime = time.Now().Add(time.Duration(auth.ExpiresIn) * time.Second).Add(-time.Minute)
}
return c.authInfo.AccessToken, nil
}
func (c *Client) getBaseURL() string {
return baseURLENVMapping[c.env]
}
func (c *Client) requestHttpViaNats(data model.CommunicationRequestHttp) (*model.CommunicationHttpResponse, error) {
b := pjson.ToBytes(data)
msg, err := c.natsClient.Request(subject.Communication.RequestHTTP, b)
if err != nil {
return nil, fmt.Errorf("viettelffm.Client.requestHttpViaNats err: %v, url %s", err, data.Payload.URL)
}
var r model.CommunicationHttpResponse
if err = pjson.Unmarshal(msg.Data, &r); err != nil {
return nil, fmt.Errorf("viettelffm.Client.requestHttpViaNats parse data err: %v, url %s, data %s", err, data.Payload.URL, string(msg.Data))
}
if r.Response == nil {
return nil, fmt.Errorf("viettelffm.Client.requestHttpViaNats empty reponse")
}
return &r, nil
}

View File

@ -1,7 +1,8 @@
package httputil package httputil
const ( const (
HeaderKeyContentType = "Content-Type" HeaderKeyContentType = "Content-Type"
HeaderKeyAuthorization = "Authorization"
HeaderValueApplicationJSON = "application/json" HeaderValueApplicationJSON = "application/json"
HeaderValueApplicationURLEncoded = "application/x-www-form-urlencoded" HeaderValueApplicationURLEncoded = "application/x-www-form-urlencoded"