Skip to content

Commit c6dac11

Browse files
KachitKachit
committed
refactor tests
1 parent c043a29 commit c6dac11

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ func (cl *Client) Init() error {
2525

2626
//SalesReports resource
2727
func (cl *Client) SalesReports() *SalesReportsResource {
28-
return &SalesReportsResource{ResourceAbstract: newResourceAbstract(cl.transport, cl.Cfg)}
28+
return &SalesReportsResource{newResourceAbstract(cl.transport, cl.Cfg)}
2929
}
3030

3131
//FinancesReports resource
3232
func (cl *Client) FinancesReports() *FinancesReportsResource {
33-
return &FinancesReportsResource{ResourceAbstract: newResourceAbstract(cl.transport, cl.Cfg)}
33+
return &FinancesReportsResource{newResourceAbstract(cl.transport, cl.Cfg)}
3434
}
3535

3636
//NewClientFromConfig Create new client from config

‎finances.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
//FinancialReportsResponse struct
1010
type FinancialReportsResponse struct {
11-
*ResponseBody
11+
ResponseBody
1212
Data []*FinancialReport `json:"data,omitempty"`
1313
}
1414

1515
//FinancesReportsResource reports
1616
type FinancesReportsResource struct {
17-
*ResourceAbstract
17+
ResourceAbstract
1818
}
1919

2020
//GetReports Get finances reports by filter
@@ -33,7 +33,7 @@ func (frr *FinancesReportsResource) GetFinancialReports(ctx context.Context, fil
3333
if err != nil {
3434
return nil, nil, fmt.Errorf("FinancialReportsResponse.GetFinancialReports error: %v", err)
3535
}
36-
result := FinancialReportsResponse{ResponseBody: &ResponseBody{}}
36+
result := FinancialReportsResponse{}
3737
result.status = resp.StatusCode
3838
if result.IsSuccess() {
3939
reports := []*FinancialReport{}

‎resource.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ func (ra *ResourceAbstract) unmarshalResponse(resp *http.Response, v interface{}
3030
}
3131

3232
//newResourceAbstract create new resource abstract
33-
func newResourceAbstract(transport *Transport, config *Config) *ResourceAbstract {
34-
return &ResourceAbstract{transport: transport, config: config}
33+
func newResourceAbstract(transport *Transport, config *Config) ResourceAbstract {
34+
return ResourceAbstract{transport: transport, config: config}
3535
}

‎sales.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ import (
88

99
//SalesReportsResource reports
1010
type SalesReportsResource struct {
11-
*ResourceAbstract
11+
ResourceAbstract
1212
}
1313

1414
//SalesReportsResponse struct
1515
type SalesReportsResponse struct {
16-
*ResponseBody
16+
ResponseBody
1717
Data []*SalesReport `json:"data,omitempty"`
1818
}
1919

2020
//SubscriptionsReportsResponse struct
2121
type SubscriptionsReportsResponse struct {
22-
*ResponseBody
22+
ResponseBody
2323
Data []*SubscriptionsReport `json:"data,omitempty"`
2424
}
2525

2626
//SubscriptionsEventsReportsResponse struct
2727
type SubscriptionsEventsReportsResponse struct {
28-
*ResponseBody
28+
ResponseBody
2929
Data []*SubscriptionsEventsReport `json:"data,omitempty"`
3030
}
3131

3232
//SubscribersReportsResponse struct
3333
type SubscribersReportsResponse struct {
34-
*ResponseBody
34+
ResponseBody
3535
Data []*SubscribersReport `json:"data,omitempty"`
3636
}
3737

3838
//PreOrdersReportsResponse struct
3939
type PreOrdersReportsResponse struct {
40-
*ResponseBody
40+
ResponseBody
4141
Data []*PreOrdersReport `json:"data,omitempty"`
4242
}
4343

@@ -57,7 +57,7 @@ func (srr *SalesReportsResource) GetSalesReports(ctx context.Context, filter *Sa
5757
if err != nil {
5858
return nil, nil, fmt.Errorf("SalesReportsResource.GetSalesReports error: %v", err)
5959
}
60-
result := SalesReportsResponse{ResponseBody: &ResponseBody{}}
60+
result := SalesReportsResponse{}
6161
result.status = resp.StatusCode
6262
if result.IsSuccess() {
6363
reports := []*SalesReport{}
@@ -82,7 +82,7 @@ func (srr *SalesReportsResource) GetSubscriptionsReports(ctx context.Context, fi
8282
if err != nil {
8383
return nil, nil, fmt.Errorf("SalesReportsResource.GetSubscriptionsReports error: %v", err)
8484
}
85-
result := SubscriptionsReportsResponse{ResponseBody: &ResponseBody{}}
85+
result := SubscriptionsReportsResponse{}
8686
result.status = resp.StatusCode
8787
if result.IsSuccess() {
8888
reports := []*SubscriptionsReport{}
@@ -107,7 +107,7 @@ func (srr *SalesReportsResource) GetSubscriptionsEventsReports(ctx context.Conte
107107
if err != nil {
108108
return nil, nil, fmt.Errorf("SalesReportsResource.GetSubscriptionsReports error: %v", err)
109109
}
110-
result := SubscriptionsEventsReportsResponse{ResponseBody: &ResponseBody{}}
110+
result := SubscriptionsEventsReportsResponse{}
111111
result.status = resp.StatusCode
112112
if result.IsSuccess() {
113113
reports := []*SubscriptionsEventsReport{}
@@ -132,7 +132,7 @@ func (srr *SalesReportsResource) GetSubscribersReports(ctx context.Context, filt
132132
if err != nil {
133133
return nil, nil, fmt.Errorf("SalesReportsResource.GetSubscribersReports error: %v", err)
134134
}
135-
result := SubscribersReportsResponse{ResponseBody: &ResponseBody{}}
135+
result := SubscribersReportsResponse{}
136136
result.status = resp.StatusCode
137137
if result.IsSuccess() {
138138
reports := []*SubscribersReport{}
@@ -157,7 +157,7 @@ func (srr *SalesReportsResource) GetPreOrdersReports(ctx context.Context, filter
157157
if err != nil {
158158
return nil, nil, fmt.Errorf("SalesReportsResource.GetPreOrdersReports error: %v", err)
159159
}
160-
result := PreOrdersReportsResponse{ResponseBody: &ResponseBody{}}
160+
result := PreOrdersReportsResponse{}
161161
result.status = resp.StatusCode
162162
if result.IsSuccess() {
163163
reports := []*PreOrdersReport{}

‎sales_filters.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ type SalesReportsFilterInterface interface {
219219

220220
//SalesReportsFilter
221221
type SalesReportsFilter struct {
222-
*SalesReportsBaseFilter
222+
SalesReportsBaseFilter
223223
}
224224

225225
//IsValid Validate sales report filter params
@@ -242,7 +242,7 @@ func (f *SalesReportsFilter) IsValid() error {
242242

243243
//SubscriptionsReportsFilter
244244
type SubscriptionsReportsFilter struct {
245-
*SalesReportsBaseFilter
245+
SalesReportsBaseFilter
246246
}
247247

248248
//IsValid Validate sales report filter params
@@ -268,7 +268,7 @@ func (f *SubscriptionsReportsFilter) IsValid() error {
268268

269269
//SubscriptionsEventsReportsFilter
270270
type SubscriptionsEventsReportsFilter struct {
271-
*SalesReportsBaseFilter
271+
SalesReportsBaseFilter
272272
}
273273

274274
//IsValid Validate sales report filter params
@@ -294,7 +294,7 @@ func (f *SubscriptionsEventsReportsFilter) IsValid() error {
294294

295295
//SubscribersReportsFilter
296296
type SubscribersReportsFilter struct {
297-
*SalesReportsBaseFilter
297+
SalesReportsBaseFilter
298298
}
299299

300300
//IsValid Validate sales report filter params
@@ -320,7 +320,7 @@ func (f *SubscribersReportsFilter) IsValid() error {
320320

321321
//SubscriptionsOffersCodesRedemptionReportsFilter
322322
type SubscriptionsOffersCodesRedemptionReportsFilter struct {
323-
*SalesReportsBaseFilter
323+
SalesReportsBaseFilter
324324
}
325325

326326
//IsValid Validate sales report filter params
@@ -346,7 +346,7 @@ func (f *SubscriptionsOffersCodesRedemptionReportsFilter) IsValid() error {
346346

347347
//NewsstandReportsFilter
348348
type NewsstandReportsFilter struct {
349-
*SalesReportsBaseFilter
349+
SalesReportsBaseFilter
350350
}
351351

352352
//IsValid Validate sales report filter params
@@ -372,7 +372,7 @@ func (f *NewsstandReportsFilter) IsValid() error {
372372

373373
//PreOrdersReportsFilter
374374
type PreOrdersReportsFilter struct {
375-
*SalesReportsBaseFilter
375+
SalesReportsBaseFilter
376376
}
377377

378378
//IsValid Validate sales report filter params
@@ -395,34 +395,34 @@ func (f *PreOrdersReportsFilter) IsValid() error {
395395

396396
//NewSalesReportsFilter
397397
func NewSalesReportsFilter() *SalesReportsFilter {
398-
return &SalesReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeSales}}
398+
return &SalesReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeSales}}
399399
}
400400

401401
//NewSubscriptionsReportsFilter
402402
func NewSubscriptionsReportsFilter() *SubscriptionsReportsFilter {
403-
return &SubscriptionsReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeSubscription}}
403+
return &SubscriptionsReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeSubscription}}
404404
}
405405

406406
//NewSubscriptionsEventsReportsFilter
407407
func NewSubscriptionsEventsReportsFilter() *SubscriptionsEventsReportsFilter {
408-
return &SubscriptionsEventsReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriptionEvent}}
408+
return &SubscriptionsEventsReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriptionEvent}}
409409
}
410410

411411
//NewSubscribersReportsFilter
412412
func NewSubscribersReportsFilter() *SubscribersReportsFilter {
413-
return &SubscribersReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriber}}
413+
return &SubscribersReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriber}}
414414
}
415415

416416
func NewSubscriptionsOffersCodesRedemptionReportsFilter() *SubscriptionsOffersCodesRedemptionReportsFilter {
417-
return &SubscriptionsOffersCodesRedemptionReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriptionOfferCodeRedemption}}
417+
return &SubscriptionsOffersCodesRedemptionReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeSubscriptionOfferCodeRedemption}}
418418
}
419419

420420
//NewNewsstandReportsFilter
421421
func NewNewsstandReportsFilter() *NewsstandReportsFilter {
422-
return &NewsstandReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypeNewsStand}}
422+
return &NewsstandReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypeNewsStand}}
423423
}
424424

425425
//NewPreOrdersReportsFilter
426426
func NewPreOrdersReportsFilter() *PreOrdersReportsFilter {
427-
return &PreOrdersReportsFilter{&SalesReportsBaseFilter{ReportType: SalesReportTypePreorder}}
427+
return &PreOrdersReportsFilter{SalesReportsBaseFilter{ReportType: SalesReportTypePreorder}}
428428
}

‎stubs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func buildStubResponseFromGzip(statusCode int, path string) *http.Response {
6666
return &http.Response{Body: body, StatusCode: statusCode, Header: http.Header{}}
6767
}
6868

69-
func buildStubResourceAbstract() *ResourceAbstract {
69+
func buildStubResourceAbstract() ResourceAbstract {
7070
config := buildStubConfig()
7171
transport := buildStubHttpTransport()
7272
return newResourceAbstract(transport, config)

0 commit comments

Comments
 (0)