diff --git a/filter.go b/filter.go index 47e4049..b90eba4 100644 --- a/filter.go +++ b/filter.go @@ -235,8 +235,7 @@ func processNumberedItemFilters(params map[string]string) ([]itemFilter, error) itemFilters = append(itemFilters, itemFilter) } for i := range itemFilters { - err := handleItemFilterType(&itemFilters[i], itemFilters, params) - if err != nil { + if err := handleItemFilterType(&itemFilters[i], itemFilters, params); err != nil { return nil, err } } @@ -347,13 +346,11 @@ func handleItemFilterType(filter *itemFilter, itemFilters []itemFilter, params m return fmt.Errorf("%w: %q", ErrInvalidDateTime, filter.values[0]) } case excludeCategory: - err := validateExcludeCategories(filter.values) - if err != nil { + if err := validateExcludeCategories(filter.values); err != nil { return err } case excludeSeller: - err := validateExcludeSellers(filter.values, itemFilters) - if err != nil { + if err := validateExcludeSellers(filter.values, itemFilters); err != nil { return err } case expeditedShippingType: @@ -361,33 +358,27 @@ func handleItemFilterType(filter *itemFilter, itemFilters []itemFilter, params m return fmt.Errorf("%w: %q", ErrInvalidExpeditedShippingType, filter.values[0]) } case feedbackScoreMax, feedbackScoreMin: - err := validateNumericFilter(filter, itemFilters, 0, feedbackScoreMax, feedbackScoreMin) - if err != nil { + if err := validateNumericFilter(filter, itemFilters, 0, feedbackScoreMax, feedbackScoreMin); err != nil { return err } case listedIn: - err := validateGlobalID(filter.values[0]) - if err != nil { + if err := validateGlobalID(filter.values[0]); err != nil { return err } case listingType: - err := validateListingTypes(filter.values) - if err != nil { + if err := validateListingTypes(filter.values); err != nil { return err } case localSearchOnly: - err := validateLocalSearchOnly(filter.values, itemFilters, params) - if err != nil { + if err := validateLocalSearchOnly(filter.values, itemFilters, params); err != nil { return err } case locatedIn: - err := validateLocatedIns(filter.values) - if err != nil { + if err := validateLocatedIns(filter.values); err != nil { return err } case maxBids, minBids: - err := validateNumericFilter(filter, itemFilters, 0, maxBids, minBids) - if err != nil { + if err := validateNumericFilter(filter, itemFilters, 0, maxBids, minBids); err != nil { return err } case maxDistance: @@ -402,13 +393,11 @@ func handleItemFilterType(filter *itemFilter, itemFilters []itemFilter, params m return invalidIntegerError(filter.values[0], 1) } case maxPrice, minPrice: - err := validatePriceRange(filter, itemFilters) - if err != nil { + if err := validatePriceRange(filter, itemFilters); err != nil { return err } case maxQuantity, minQuantity: - err := validateNumericFilter(filter, itemFilters, 1, maxQuantity, minQuantity) - if err != nil { + if err := validateNumericFilter(filter, itemFilters, 1, maxQuantity, minQuantity); err != nil { return err } case modTimeFrom: @@ -416,18 +405,15 @@ func handleItemFilterType(filter *itemFilter, itemFilters []itemFilter, params m return fmt.Errorf("%w: %q", ErrInvalidDateTime, filter.values[0]) } case seller: - err := validateSellers(filter.values, itemFilters) - if err != nil { + if err := validateSellers(filter.values, itemFilters); err != nil { return err } case sellerBusinessType: - err := validateSellerBusinessType(filter.values) - if err != nil { + if err := validateSellerBusinessType(filter.values); err != nil { return err } case topRatedSellerOnly: - err := validateTopRatedSellerOnly(filter.values[0], itemFilters) - if err != nil { + if err := validateTopRatedSellerOnly(filter.values[0], itemFilters); err != nil { return err } case valueBoxInventory: diff --git a/finding.go b/finding.go index cd66772..d91f18e 100644 --- a/finding.go +++ b/finding.go @@ -72,8 +72,7 @@ func (e *APIError) Error() string { // [Searching and Browsing By Category]: https://developer.ebay.com/api-docs/user-guides/static/finding-user-guide/finding-searching-browsing-by-category.html func (c *FindingClient) FindItemsByCategories(ctx context.Context, params map[string]string) (FindItemsByCategoriesResponse, error) { var findItems FindItemsByCategoriesResponse - err := c.findItems(ctx, params, &findItemsByCategoryParams{appID: c.AppID}, &findItems) - if err != nil { + if err := c.findItems(ctx, params, &findItemsByCategoryParams{appID: c.AppID}, &findItems); err != nil { return findItems, err } return findItems, nil @@ -96,8 +95,7 @@ func (c *FindingClient) FindItemsByCategories(ctx context.Context, params map[st // [Searching by Keywords]: https://developer.ebay.com/api-docs/user-guides/static/finding-user-guide/finding-searching-by-keywords.html func (c *FindingClient) FindItemsByKeywords(ctx context.Context, params map[string]string) (FindItemsByKeywordsResponse, error) { var findItems FindItemsByKeywordsResponse - err := c.findItems(ctx, params, &findItemsByKeywordsParams{appID: c.AppID}, &findItems) - if err != nil { + if err := c.findItems(ctx, params, &findItemsByKeywordsParams{appID: c.AppID}, &findItems); err != nil { return findItems, err } return findItems, nil @@ -123,8 +121,7 @@ func (c *FindingClient) FindItemsByKeywords(ctx context.Context, params map[stri // [Searching by Keywords]: https://developer.ebay.com/api-docs/user-guides/static/finding-user-guide/finding-searching-by-keywords.html func (c *FindingClient) FindItemsAdvanced(ctx context.Context, params map[string]string) (FindItemsAdvancedResponse, error) { var findItems FindItemsAdvancedResponse - err := c.findItems(ctx, params, &findItemsAdvancedParams{appID: c.AppID}, &findItems) - if err != nil { + if err := c.findItems(ctx, params, &findItemsAdvancedParams{appID: c.AppID}, &findItems); err != nil { return findItems, err } return findItems, nil @@ -147,8 +144,7 @@ func (c *FindingClient) FindItemsAdvanced(ctx context.Context, params map[string // [Searching by Product]: https://developer.ebay.com/api-docs/user-guides/static/finding-user-guide/finding-searching-by-product.html func (c *FindingClient) FindItemsByProduct(ctx context.Context, params map[string]string) (FindItemsByProductResponse, error) { var findItems FindItemsByProductResponse - err := c.findItems(ctx, params, &findItemsByProductParams{appID: c.AppID}, &findItems) - if err != nil { + if err := c.findItems(ctx, params, &findItemsByProductParams{appID: c.AppID}, &findItems); err != nil { return findItems, err } return findItems, nil @@ -176,8 +172,7 @@ func (c *FindingClient) FindItemsByProduct(ctx context.Context, params map[strin // [Searching by Keywords]: https://developer.ebay.com/api-docs/user-guides/static/finding-user-guide/finding-searching-by-keywords.html func (c *FindingClient) FindItemsInEBayStores(ctx context.Context, params map[string]string) (FindItemsInEBayStoresResponse, error) { var findItems FindItemsInEBayStoresResponse - err := c.findItems(ctx, params, &findItemsInEBayStoresParams{appID: c.AppID}, &findItems) - if err != nil { + if err := c.findItems(ctx, params, &findItemsInEBayStoresParams{appID: c.AppID}, &findItems); err != nil { return findItems, err } return findItems, nil @@ -195,8 +190,7 @@ var ( ) func (c *FindingClient) findItems(ctx context.Context, params map[string]string, v findParamsValidator, res ResultProvider) error { - err := v.validate(params) - if err != nil { + if err := v.validate(params); err != nil { return &APIError{Err: err, StatusCode: http.StatusBadRequest} } req, err := v.newRequest(ctx, c.URL) diff --git a/finding_test.go b/finding_test.go index d81fc79..ca0cf2e 100644 --- a/finding_test.go +++ b/finding_test.go @@ -4676,7 +4676,7 @@ func testFindItems(t *testing.T, params map[string]string, findMethod string, wa t.Run("returns error if the client returns an error", func(t *testing.T) { t.Parallel() - fc := ebay.NewFindingClient(&http.Client{}, appID) + fc := ebay.NewFindingClient(http.DefaultClient, appID) fc.URL = "http://localhost" var err error @@ -4789,8 +4789,7 @@ func testFindItems(t *testing.T, params map[string]string, findMethod string, wa badData := `[123.1, 234.2]` ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte(badData)) - if err != nil { + if _, err := w.Write([]byte(badData)); err != nil { t.Fatal(err) } })) diff --git a/go.mod b/go.mod index 300bd56..acf9094 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/matthewdargan/ebay -go 1.21.0 +go 1.21.1 diff --git a/params.go b/params.go index 5d855d6..2026ae3 100644 --- a/params.go +++ b/params.go @@ -243,8 +243,7 @@ func (fp *findItemsByCategoryParams) validate(params map[string]string) error { fp.categoryIDs = categoryIDs globalID, ok := params["Global-ID"] if ok { - err := validateGlobalID(globalID) - if err != nil { + if err := validateGlobalID(globalID); err != nil { return err } fp.globalID = &globalID @@ -278,8 +277,7 @@ func (fp *findItemsByCategoryParams) validate(params map[string]string) error { } sortOrder, ok := params["sortOrder"] if ok { - err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil) - if err != nil { + if err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil); err != nil { return err } fp.sortOrder = &sortOrder @@ -375,8 +373,7 @@ func (fp *findItemsByKeywordsParams) validate(params map[string]string) error { fp.keywords = keywords globalID, ok := params["Global-ID"] if ok { - err := validateGlobalID(globalID) - if err != nil { + if err := validateGlobalID(globalID); err != nil { return err } fp.globalID = &globalID @@ -410,8 +407,7 @@ func (fp *findItemsByKeywordsParams) validate(params map[string]string) error { } sortOrder, ok := params["sortOrder"] if ok { - err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil) - if err != nil { + if err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil); err != nil { return err } fp.sortOrder = &sortOrder @@ -522,8 +518,7 @@ func (fp *findItemsAdvancedParams) validate(params map[string]string) error { } globalID, ok := params["Global-ID"] if ok { - err := validateGlobalID(globalID) - if err != nil { + if err := validateGlobalID(globalID); err != nil { return err } fp.globalID = &globalID @@ -565,8 +560,7 @@ func (fp *findItemsAdvancedParams) validate(params map[string]string) error { } sortOrder, ok := params["sortOrder"] if ok { - err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil) - if err != nil { + if err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil); err != nil { return err } fp.sortOrder = &sortOrder @@ -677,8 +671,7 @@ func (fp *findItemsByProductParams) validate(params map[string]string) error { } globalID, ok := params["Global-ID"] if ok { - err := validateGlobalID(globalID) - if err != nil { + if err := validateGlobalID(globalID); err != nil { return err } fp.globalID = &globalID @@ -708,8 +701,7 @@ func (fp *findItemsByProductParams) validate(params map[string]string) error { } sortOrder, ok := params["sortOrder"] if ok { - err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil) - if err != nil { + if err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil); err != nil { return err } fp.sortOrder = &sortOrder @@ -815,16 +807,14 @@ func (fp *findItemsInEBayStoresParams) validate(params map[string]string) error fp.keywords = &keywords } if ok { - err := validateStoreName(storeName) - if err != nil { + if err := validateStoreName(storeName); err != nil { return err } fp.storeName = &storeName } globalID, ok := params["Global-ID"] if ok { - err := validateGlobalID(globalID) - if err != nil { + if err := validateGlobalID(globalID); err != nil { return err } fp.globalID = &globalID @@ -859,8 +849,7 @@ func (fp *findItemsInEBayStoresParams) validate(params map[string]string) error } sortOrder, ok := params["sortOrder"] if ok { - err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil) - if err != nil { + if err := validateSortOrder(sortOrder, fp.itemFilters, fp.buyerPostalCode != nil); err != nil { return err } fp.sortOrder = &sortOrder @@ -948,8 +937,7 @@ func processCategoryIDs(params map[string]string) ([]string, error) { return nil, ErrInvalidIndexSyntax } if nonNumberedExists { - err := validateCategoryID(categoryID) - if err != nil { + if err := validateCategoryID(categoryID); err != nil { return nil, err } return []string{categoryID}, nil @@ -960,8 +948,7 @@ func processCategoryIDs(params map[string]string) ([]string, error) { if !ok { break } - err := validateCategoryID(cID) - if err != nil { + if err := validateCategoryID(cID); err != nil { return nil, err } categoryIDs = append(categoryIDs, cID) @@ -976,8 +963,7 @@ func validateCategoryID(id string) error { if len(id) > maxCategoryIDLen { return ErrInvalidCategoryIDLength } - _, err := strconv.Atoi(id) - if err != nil { + if _, err := strconv.Atoi(id); err != nil { return fmt.Errorf("%w: %w", ErrInvalidCategoryID, err) } return nil @@ -1230,8 +1216,7 @@ func processAffiliate(params map[string]string) (*affiliate, error) { return nil, ErrInvalidNetworkIDRange } if nID == ebayPartnerNetworkID { - err := validateTrackingID(trackingID) - if err != nil { + if err := validateTrackingID(trackingID); err != nil { return nil, err } } @@ -1241,8 +1226,7 @@ func processAffiliate(params map[string]string) (*affiliate, error) { } func validateTrackingID(trackingID string) error { - _, err := strconv.Atoi(trackingID) - if err != nil { + if _, err := strconv.Atoi(trackingID); err != nil { return fmt.Errorf("%w: %w", ErrInvalidTrackingID, err) } const maxCampIDLen = 10