Skip to content

Commit

Permalink
Merge pull request #1245 from hrdwdmrbl/fixes/type_errors
Browse files Browse the repository at this point in the history 
Fixes/type errors
  • Loading branch information
@paulomarg
paulomarg committed Apr 1, 2024
2 parents 9c96648 + ae56e50 commit a227bda
Show file tree
Hide file tree
Showing 27 changed files with 103 additions and 121 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Note: For changes to the API, see https://shopify.dev/changelog?filter=api

## Unreleased

- [#1071](https://github.com/Shopify/shopify-api-ruby/issues/1071) Fix FulfillmentEvent class types
- Fix: InventoryItem class `harmonized_system_code` attribute type which can be either integer, string or nil
- Fix: Variant class `inventory_quantity` attribute type which can be either integer, string or nil

## 14.0.1
- [#1288](https://github.com/Shopify/shopify-api-ruby/pull/1288) Fix FeatureDeprecatedError being raised without a message.
- [1290](https://github.com/Shopify/shopify-api-ruby/pull/1290) Move deprecation of `ShopifyAPI::Webhooks::Handler#handle` to version 15.0.0
Expand Down
13 changes: 5 additions & 8 deletions lib/shopify_api/rest/resources/2022_04/fulfillment_event.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)

@address1 = T.let(nil, T.nilable(String))
@city = T.let(nil, T.nilable(String))
@country = T.let(nil, T.nilable(Country))
@country = T.let(nil, T.nilable(String))
@created_at = T.let(nil, T.nilable(String))
@estimated_delivery_at = T.let(nil, T.nilable(String))
@fulfillment_id = T.let(nil, T.nilable(Integer))
Expand All @@ -30,7 +30,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@longitude = T.let(nil, T.nilable(Float))
@message = T.let(nil, T.nilable(String))
@order_id = T.let(nil, T.nilable(Integer))
@province = T.let(nil, T.nilable(Province))
@province = T.let(nil, T.nilable(String))
@shop_id = T.let(nil, T.nilable(Integer))
@status = T.let(nil, T.nilable(String))
@updated_at = T.let(nil, T.nilable(String))
Expand All @@ -39,10 +39,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
super(session: session, from_hash: from_hash)
end

@has_one = T.let({
country: Country,
province: Province
}, T::Hash[Symbol, Class])
@has_one = T.let({}, T::Hash[Symbol, Class])
@has_many = T.let({}, T::Hash[Symbol, Class])
@paths = T.let([
{http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
Expand All @@ -55,7 +52,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :address1
sig { returns(T.nilable(String)) }
attr_reader :city
sig { returns(T.nilable(Country)) }
sig { returns(T.nilable(String)) }
attr_reader :country
sig { returns(T.nilable(String)) }
attr_reader :created_at
Expand All @@ -75,7 +72,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :message
sig { returns(T.nilable(Integer)) }
attr_reader :order_id
sig { returns(T.nilable(Province)) }
sig { returns(T.nilable(String)) }
attr_reader :province
sig { returns(T.nilable(Integer)) }
attr_reader :shop_id
Expand Down
4 changes: 2 additions & 2 deletions lib/shopify_api/rest/resources/2022_04/inventory_item.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@country_code_of_origin = T.let(nil, T.nilable(String))
@country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
@created_at = T.let(nil, T.nilable(String))
@harmonized_system_code = T.let(nil, T.nilable(Integer))
@harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
@id = T.let(nil, T.nilable(Integer))
@province_code_of_origin = T.let(nil, T.nilable(String))
@requires_shipping = T.let(nil, T.nilable(T::Boolean))
Expand All @@ -49,7 +49,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :country_harmonized_system_codes
sig { returns(T.nilable(String)) }
attr_reader :created_at
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :harmonized_system_code
sig { returns(T.nilable(Integer)) }
attr_reader :id
Expand Down
12 changes: 6 additions & 6 deletions lib/shopify_api/rest/resources/2022_04/variant.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@inventory_item_id = T.let(nil, T.nilable(Integer))
@inventory_management = T.let(nil, T.nilable(String))
@inventory_policy = T.let(nil, T.nilable(String))
@inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity_adjustment = T.let(nil, T.nilable(Integer))
@old_inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@inventory_quantity_adjustment = T.let(nil, T.nilable(T.any(Integer, String)))
@old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
@position = T.let(nil, T.nilable(Integer))
@presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
Expand Down Expand Up @@ -83,11 +83,11 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :inventory_management
sig { returns(T.nilable(String)) }
attr_reader :inventory_policy
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity_adjustment
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :old_inventory_quantity
sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
attr_reader :option
Expand Down
13 changes: 5 additions & 8 deletions lib/shopify_api/rest/resources/2022_07/fulfillment_event.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)

@address1 = T.let(nil, T.nilable(String))
@city = T.let(nil, T.nilable(String))
@country = T.let(nil, T.nilable(Country))
@country = T.let(nil, T.nilable(String))
@created_at = T.let(nil, T.nilable(String))
@estimated_delivery_at = T.let(nil, T.nilable(String))
@fulfillment_id = T.let(nil, T.nilable(Integer))
Expand All @@ -30,7 +30,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@longitude = T.let(nil, T.nilable(Float))
@message = T.let(nil, T.nilable(String))
@order_id = T.let(nil, T.nilable(Integer))
@province = T.let(nil, T.nilable(Province))
@province = T.let(nil, T.nilable(String))
@shop_id = T.let(nil, T.nilable(Integer))
@status = T.let(nil, T.nilable(String))
@updated_at = T.let(nil, T.nilable(String))
Expand All @@ -39,10 +39,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
super(session: session, from_hash: from_hash)
end

@has_one = T.let({
country: Country,
province: Province
}, T::Hash[Symbol, Class])
@has_one = T.let({}, T::Hash[Symbol, Class])
@has_many = T.let({}, T::Hash[Symbol, Class])
@paths = T.let([
{http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
Expand All @@ -55,7 +52,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :address1
sig { returns(T.nilable(String)) }
attr_reader :city
sig { returns(T.nilable(Country)) }
sig { returns(T.nilable(String)) }
attr_reader :country
sig { returns(T.nilable(String)) }
attr_reader :created_at
Expand All @@ -75,7 +72,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :message
sig { returns(T.nilable(Integer)) }
attr_reader :order_id
sig { returns(T.nilable(Province)) }
sig { returns(T.nilable(String)) }
attr_reader :province
sig { returns(T.nilable(Integer)) }
attr_reader :shop_id
Expand Down
4 changes: 2 additions & 2 deletions lib/shopify_api/rest/resources/2022_07/inventory_item.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@country_code_of_origin = T.let(nil, T.nilable(String))
@country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
@created_at = T.let(nil, T.nilable(String))
@harmonized_system_code = T.let(nil, T.nilable(Integer))
@harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
@id = T.let(nil, T.nilable(Integer))
@province_code_of_origin = T.let(nil, T.nilable(String))
@requires_shipping = T.let(nil, T.nilable(T::Boolean))
Expand All @@ -49,7 +49,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :country_harmonized_system_codes
sig { returns(T.nilable(String)) }
attr_reader :created_at
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :harmonized_system_code
sig { returns(T.nilable(Integer)) }
attr_reader :id
Expand Down
12 changes: 6 additions & 6 deletions lib/shopify_api/rest/resources/2022_07/variant.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@inventory_item_id = T.let(nil, T.nilable(Integer))
@inventory_management = T.let(nil, T.nilable(String))
@inventory_policy = T.let(nil, T.nilable(String))
@inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity_adjustment = T.let(nil, T.nilable(Integer))
@old_inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@inventory_quantity_adjustment = T.let(nil, T.nilable(T.any(Integer, String)))
@old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
@position = T.let(nil, T.nilable(Integer))
@presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
Expand Down Expand Up @@ -83,11 +83,11 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :inventory_management
sig { returns(T.nilable(String)) }
attr_reader :inventory_policy
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity_adjustment
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :old_inventory_quantity
sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
attr_reader :option
Expand Down
13 changes: 5 additions & 8 deletions lib/shopify_api/rest/resources/2022_10/fulfillment_event.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)

@address1 = T.let(nil, T.nilable(String))
@city = T.let(nil, T.nilable(String))
@country = T.let(nil, T.nilable(Country))
@country = T.let(nil, T.nilable(String))
@created_at = T.let(nil, T.nilable(String))
@estimated_delivery_at = T.let(nil, T.nilable(String))
@fulfillment_id = T.let(nil, T.nilable(Integer))
Expand All @@ -30,7 +30,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@longitude = T.let(nil, T.nilable(Float))
@message = T.let(nil, T.nilable(String))
@order_id = T.let(nil, T.nilable(Integer))
@province = T.let(nil, T.nilable(Province))
@province = T.let(nil, T.nilable(String))
@shop_id = T.let(nil, T.nilable(Integer))
@status = T.let(nil, T.nilable(String))
@updated_at = T.let(nil, T.nilable(String))
Expand All @@ -39,10 +39,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
super(session: session, from_hash: from_hash)
end

@has_one = T.let({
country: Country,
province: Province
}, T::Hash[Symbol, Class])
@has_one = T.let({}, T::Hash[Symbol, Class])
@has_many = T.let({}, T::Hash[Symbol, Class])
@paths = T.let([
{http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
Expand All @@ -55,7 +52,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :address1
sig { returns(T.nilable(String)) }
attr_reader :city
sig { returns(T.nilable(Country)) }
sig { returns(T.nilable(String)) }
attr_reader :country
sig { returns(T.nilable(String)) }
attr_reader :created_at
Expand All @@ -75,7 +72,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :message
sig { returns(T.nilable(Integer)) }
attr_reader :order_id
sig { returns(T.nilable(Province)) }
sig { returns(T.nilable(String)) }
attr_reader :province
sig { returns(T.nilable(Integer)) }
attr_reader :shop_id
Expand Down
4 changes: 2 additions & 2 deletions lib/shopify_api/rest/resources/2022_10/inventory_item.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@country_code_of_origin = T.let(nil, T.nilable(String))
@country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
@created_at = T.let(nil, T.nilable(String))
@harmonized_system_code = T.let(nil, T.nilable(Integer))
@harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
@id = T.let(nil, T.nilable(Integer))
@province_code_of_origin = T.let(nil, T.nilable(String))
@requires_shipping = T.let(nil, T.nilable(T::Boolean))
Expand All @@ -49,7 +49,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :country_harmonized_system_codes
sig { returns(T.nilable(String)) }
attr_reader :created_at
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :harmonized_system_code
sig { returns(T.nilable(Integer)) }
attr_reader :id
Expand Down
8 changes: 4 additions & 4 deletions lib/shopify_api/rest/resources/2022_10/variant.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@inventory_item_id = T.let(nil, T.nilable(Integer))
@inventory_management = T.let(nil, T.nilable(String))
@inventory_policy = T.let(nil, T.nilable(String))
@inventory_quantity = T.let(nil, T.nilable(Integer))
@old_inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
@position = T.let(nil, T.nilable(Integer))
@presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
Expand Down Expand Up @@ -81,9 +81,9 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :inventory_management
sig { returns(T.nilable(String)) }
attr_reader :inventory_policy
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :old_inventory_quantity
sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
attr_reader :option
Expand Down
13 changes: 5 additions & 8 deletions lib/shopify_api/rest/resources/2023_01/fulfillment_event.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)

@address1 = T.let(nil, T.nilable(String))
@city = T.let(nil, T.nilable(String))
@country = T.let(nil, T.nilable(Country))
@country = T.let(nil, T.nilable(String))
@created_at = T.let(nil, T.nilable(String))
@estimated_delivery_at = T.let(nil, T.nilable(String))
@fulfillment_id = T.let(nil, T.nilable(Integer))
Expand All @@ -30,7 +30,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@longitude = T.let(nil, T.nilable(Float))
@message = T.let(nil, T.nilable(String))
@order_id = T.let(nil, T.nilable(Integer))
@province = T.let(nil, T.nilable(Province))
@province = T.let(nil, T.nilable(String))
@shop_id = T.let(nil, T.nilable(Integer))
@status = T.let(nil, T.nilable(String))
@updated_at = T.let(nil, T.nilable(String))
Expand All @@ -39,10 +39,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
super(session: session, from_hash: from_hash)
end

@has_one = T.let({
country: Country,
province: Province
}, T::Hash[Symbol, Class])
@has_one = T.let({}, T::Hash[Symbol, Class])
@has_many = T.let({}, T::Hash[Symbol, Class])
@paths = T.let([
{http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
Expand All @@ -55,7 +52,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :address1
sig { returns(T.nilable(String)) }
attr_reader :city
sig { returns(T.nilable(Country)) }
sig { returns(T.nilable(String)) }
attr_reader :country
sig { returns(T.nilable(String)) }
attr_reader :created_at
Expand All @@ -75,7 +72,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :message
sig { returns(T.nilable(Integer)) }
attr_reader :order_id
sig { returns(T.nilable(Province)) }
sig { returns(T.nilable(String)) }
attr_reader :province
sig { returns(T.nilable(Integer)) }
attr_reader :shop_id
Expand Down
4 changes: 2 additions & 2 deletions lib/shopify_api/rest/resources/2023_01/inventory_item.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@country_code_of_origin = T.let(nil, T.nilable(String))
@country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
@created_at = T.let(nil, T.nilable(String))
@harmonized_system_code = T.let(nil, T.nilable(Integer))
@harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
@id = T.let(nil, T.nilable(Integer))
@province_code_of_origin = T.let(nil, T.nilable(String))
@requires_shipping = T.let(nil, T.nilable(T::Boolean))
Expand All @@ -49,7 +49,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :country_harmonized_system_codes
sig { returns(T.nilable(String)) }
attr_reader :created_at
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :harmonized_system_code
sig { returns(T.nilable(Integer)) }
attr_reader :id
Expand Down
8 changes: 4 additions & 4 deletions lib/shopify_api/rest/resources/2023_01/variant.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
@inventory_item_id = T.let(nil, T.nilable(Integer))
@inventory_management = T.let(nil, T.nilable(String))
@inventory_policy = T.let(nil, T.nilable(String))
@inventory_quantity = T.let(nil, T.nilable(Integer))
@old_inventory_quantity = T.let(nil, T.nilable(Integer))
@inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
@option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
@position = T.let(nil, T.nilable(Integer))
@presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
Expand Down Expand Up @@ -81,9 +81,9 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
attr_reader :inventory_management
sig { returns(T.nilable(String)) }
attr_reader :inventory_policy
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :inventory_quantity
sig { returns(T.nilable(Integer)) }
sig { returns(T.nilable(T.any(Integer, String))) }
attr_reader :old_inventory_quantity
sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
attr_reader :option
Expand Down
Loading

0 comments on commit a227bda

Please sign in to comment.