Skip to content

Commit 8aa9a21

Browse files
tarmo-randmatarmo-randma
authored
Merge pull request #128 from erply/develop
Develop
2 parents e6d8b9b + 2a0e4b9 commit 8aa9a21

File tree

7 files changed

+259
-4
lines changed

7 files changed

+259
-4
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.13
44

55
require (
66
github.com/pkg/errors v0.9.1
7-
github.com/stretchr/testify v1.8.4
7+
github.com/stretchr/testify v1.9.0
88
)

‎go.sum‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
88
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
99
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
1010
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
11+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
1112
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1213
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
13-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1414
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
15+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
16+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1517
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1618
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1719
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎pkg/api/sales/interface.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,19 @@ type (
5555
AssignmentsManger
5656
ReportsManager
5757
GetCoupons(ctx context.Context, filters map[string]string) (*GetCouponsResponse, error)
58-
//payment requests
58+
// payment requests
5959
SavePayment(ctx context.Context, filters map[string]string) (int64, error)
6060
SavePaymentsBulk(ctx context.Context, bulkFilters []map[string]interface{}, baseFilters map[string]string) (SavePaymentsResponseBulk, error)
6161
GetPayments(ctx context.Context, filters map[string]string) ([]PaymentInfo, error)
6262
GetPaymentsBulk(ctx context.Context, bulkFilters []map[string]interface{}, baseFilters map[string]string) (GetPaymentsResponseBulk, error)
6363
DeletePayment(ctx context.Context, filters map[string]string) error
6464
DeletePaymentsBulk(ctx context.Context, bulkFilters []map[string]interface{}, baseFilters map[string]string) (DeleteResponseBulk, error)
6565

66-
//shopping cart
66+
// shopping cart
6767
CalculateShoppingCart(ctx context.Context, filters map[string]string) (*ShoppingCartTotals, error)
6868
CalculateShoppingCartWithFullRowsResponse(ctx context.Context, filters map[string]string) (*ShoppingCartTotalsWithFullRows, error)
69+
70+
// ProcessRecurringBilling is Erply API call processRecurringBilling. https://learn-api.erply.com/requests/processrecurringbilling
71+
ProcessRecurringBilling(ctx context.Context, filters map[string]string) ([]RecurringBillingProcessedInvoices, error)
6972
}
7073
)

‎pkg/api/sales/recurringBillingModel.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package sales
2+
3+
import common2 "github.com/erply/api-go-wrapper/pkg/api/common"
4+
5+
type (
6+
RecurringBillingResponse struct {
7+
Status common2.Status
8+
Records []RecurringBillingRecord `json:"records"`
9+
}
10+
RecurringBillingRecord struct {
11+
ProcessedInvoices []RecurringBillingProcessedInvoices `json:"processedInvoices"`
12+
}
13+
RecurringBillingProcessedInvoices struct {
14+
ID int `json:"id"`
15+
Created bool `json:"created"`
16+
Updated bool `json:"updated"`
17+
}
18+
)

‎pkg/api/sales/recurringBillingRequests.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package sales
2+
3+
import (
4+
"context"
5+
"encoding/json"
6+
"fmt"
7+
"github.com/erply/api-go-wrapper/internal/common"
8+
sharedCommon "github.com/erply/api-go-wrapper/pkg/api/common"
9+
"github.com/pkg/errors"
10+
"net/http"
11+
)
12+
13+
// ProcessRecurringBilling is Erply API call processRecurringBilling. https://learn-api.erply.com/requests/processrecurringbilling
14+
func (cli *Client) ProcessRecurringBilling(ctx context.Context, filters map[string]string) ([]RecurringBillingProcessedInvoices, error) {
15+
resp, err := cli.SendRequest(ctx, "processRecurringBilling", filters)
16+
if err != nil {
17+
return nil, sharedCommon.NewFromError("ProcessRecurringBilling: error sending request", err, 0)
18+
}
19+
if resp.StatusCode != http.StatusOK {
20+
return nil, sharedCommon.NewFromError(fmt.Sprintf("ProcessRecurringBilling: bad response status code: %d", resp.StatusCode), nil, 0)
21+
}
22+
23+
respData := RecurringBillingResponse{}
24+
if err := json.NewDecoder(resp.Body).Decode(&respData); err != nil {
25+
return nil, errors.Wrap(err, "failed to decode processRecurringBilling response")
26+
}
27+
if !common.IsJSONResponseOK(&respData.Status) {
28+
return nil, sharedCommon.NewFromResponseStatus(&respData.Status)
29+
}
30+
if len(respData.Records) > 0 {
31+
return respData.Records[0].ProcessedInvoices, nil
32+
} else {
33+
return make([]RecurringBillingProcessedInvoices, 0), nil
34+
}
35+
}

‎pkg/api/sales/recurringBillingRequests_test.go‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
package sales
2+
3+
import (
4+
"context"
5+
"github.com/erply/api-go-wrapper/internal/common"
6+
"github.com/stretchr/testify/assert"
7+
"net/http"
8+
"net/http/httptest"
9+
"testing"
10+
)
11+
12+
func TestRecurringBilling(t *testing.T) {
13+
14+
t.Run("success", func(t *testing.T) {
15+
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
16+
common.AssertFormValues(t, r, map[string]interface{}{
17+
"clientCode": "someclient",
18+
"sessionKey": "somesess",
19+
})
20+
_, err := w.Write([]byte(`{
21+
"status": {
22+
"request": "processRecurringBilling",
23+
"requestUnixTime": 1728482531,
24+
"responseStatus": "ok",
25+
"errorCode": 0,
26+
"generationTime": 0.3931558132171630859375,
27+
"recordsTotal": 0,
28+
"recordsInResponse": 0
29+
},
30+
"records": [
31+
{
32+
"processedInvoices": [
33+
{
34+
"id": 89,
35+
"created": true,
36+
"updated": true
37+
}
38+
]
39+
}
40+
]
41+
}`))
42+
assert.NoError(t, err)
43+
}))
44+
defer srv.Close()
45+
46+
cli := common.NewClient("somesess", "someclient", "", nil, nil)
47+
cli.Url = srv.URL
48+
cl := NewClient(cli)
49+
bulkResp, err := cl.ProcessRecurringBilling(
50+
context.Background(),
51+
map[string]string{
52+
"billingStatementIDs": "1,2",
53+
},
54+
)
55+
assert.NoError(t, err)
56+
assert.Equal(t, 1, len(bulkResp))
57+
assert.Equal(t, 89, bulkResp[0].ID)
58+
assert.Equal(t, true, bulkResp[0].Created)
59+
assert.Equal(t, true, bulkResp[0].Updated)
60+
})
61+
t.Run("empty", func(t *testing.T) {
62+
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
63+
common.AssertFormValues(t, r, map[string]interface{}{
64+
"clientCode": "someclient",
65+
"sessionKey": "somesess",
66+
})
67+
_, err := w.Write([]byte(`{
68+
"status": {
69+
"request": "processRecurringBilling",
70+
"requestUnixTime": 1728485864,
71+
"responseStatus": "ok",
72+
"errorCode": 0,
73+
"generationTime": 0.1155679225921630859375,
74+
"recordsTotal": 0,
75+
"recordsInResponse": 0
76+
},
77+
"records": [
78+
{
79+
"processedInvoices": []
80+
}
81+
]
82+
}`))
83+
assert.NoError(t, err)
84+
}))
85+
defer srv.Close()
86+
87+
cli := common.NewClient("somesess", "someclient", "", nil, nil)
88+
cli.Url = srv.URL
89+
cl := NewClient(cli)
90+
bulkResp, err := cl.ProcessRecurringBilling(
91+
context.Background(),
92+
map[string]string{
93+
"billingStatementIDs": "1,2",
94+
},
95+
)
96+
assert.NoError(t, err)
97+
assert.Equal(t, 0, len(bulkResp))
98+
})
99+
t.Run("error", func(t *testing.T) {
100+
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
101+
common.AssertFormValues(t, r, map[string]interface{}{
102+
"clientCode": "someclient",
103+
"sessionKey": "somesess",
104+
})
105+
_, err := w.Write([]byte(`{
106+
"status": {
107+
"request": "processRecurringBilling",
108+
"requestUnixTime": 1728489814,
109+
"responseStatus": "error",
110+
"errorCode": 1016,
111+
"errorField": "billingStatementIDs",
112+
"generationTime": 0.0900490283966064453125,
113+
"recordsTotal": 0,
114+
"recordsInResponse": 0
115+
},
116+
"records": []
117+
}`))
118+
assert.NoError(t, err)
119+
}))
120+
defer srv.Close()
121+
122+
cli := common.NewClient("somesess", "someclient", "", nil, nil)
123+
cli.Url = srv.URL
124+
cl := NewClient(cli)
125+
bulkResp, err := cl.ProcessRecurringBilling(
126+
context.Background(),
127+
map[string]string{
128+
"billingStatementIDs": "a",
129+
},
130+
)
131+
assert.Error(t, err)
132+
assert.Equal(t, "ERPLY API: processRecurringBilling: error, status: [1016] Invalid value.(Attribute \"errorField\" indicates the field that contains an invalid value.), error field: billingStatementIDs, code: 1016", err.Error())
133+
assert.Equal(t, 0, len(bulkResp))
134+
})
135+
}

‎pkg/api/servicediscovery/models.go.bak‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package servicediscovery
2+
3+
import (
4+
common2 "github.com/erply/api-go-wrapper/pkg/api/common"
5+
)
6+
7+
type getServiceEndpointsResponse struct {
8+
Status common2.Status
9+
Records []ServiceEndpoints `json:"records"`
10+
}
11+
type Endpoint struct {
12+
IsSandbox bool `json:"isSandbox"`
13+
Url string `json:"url"`
14+
Documentation string `json:"documentation"`
15+
}
16+
17+
type ServiceEndpoints struct {
18+
Cafa Endpoint `json:"cafa"`
19+
Pim Endpoint `json:"pim"`
20+
Wms Endpoint `json:"wms"`
21+
Promotion Endpoint `json:"promotion"`
22+
Reports Endpoint `json:"reports"`
23+
JSON Endpoint `json:"json"`
24+
Assignments Endpoint `json:"assignments"`
25+
AccountAdmin Endpoint `json:"account-admin"`
26+
VisitorQueue Endpoint `json:"visitor-queue"`
27+
Loyalty Endpoint `json:"loyalty"`
28+
Cdn Endpoint `json:"cdn"`
29+
Tasks Endpoint `json:"tasks"`
30+
Webhook Endpoint `json:"webhook"`
31+
User Endpoint `json:"user"`
32+
Import Endpoint `json:"import"`
33+
Ems Endpoint `json:"ems"`
34+
Clockin Endpoint `json:"clockin"`
35+
Ledger Endpoint `json:"ledger"`
36+
Auth Endpoint `json:"auth"`
37+
Crm Endpoint `json:"crm"`
38+
Buum Endpoint `json:"buum"`
39+
Sales Endpoint `json:"sales"`
40+
Pricing Endpoint `json:"pricing"`
41+
Inventory Endpoint `json:"inventory"`
42+
Chair Endpoint `json:"chair"`
43+
PosAPI Endpoint `json:"pos-api"`
44+
Vin Endpoint `json:"vin"`
45+
IntegrationLogs Endpoint `json:"integration-logs"`
46+
InventoryTransaction Endpoint `json:"inventory-transaction"`
47+
InventoryDocuments Endpoint `json:"inventory-documents"`
48+
EInvoice Endpoint `json:"e-invoice"`
49+
Memberships Endpoint `json:"memberships"`
50+
CustomData Endpoint `json:"custom-data"`
51+
Stripe Endpoint `json:"stripe"`
52+
GoERP Endpoint `json:"goerp"`
53+
Logfiles Endpoint `json:"logfiles"`
54+
CommandBroker Endpoint `json:"command-broker"`
55+
EcomShopify Endpoint `json:"ecom-shopify"`
56+
Automation Endpoint `json:"automation"`
57+
WooCommerce Endpoint `json:"woocommerce"`
58+
Billing Endpoint `json:"billing"`
59+
Erply Endpoint `json:"erply"`
60+
InventoryDocument Endpoint `json:"inventory-document"`
61+
InventoryTransaction Endpoint `json:"inventory-transaction"`
62+
}

0 commit comments

Comments
 (0)