shopify_graphql 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db26915271fd8d34d5efe679772d946dda1e897ef2e608708cd6c6a07f646a38
-  data.tar.gz: 0ab8496a613921d8e8dc2ff4fd727ac46140fac042ae9c3d54ddbaec29cd3592
+  metadata.gz: 676b35a53c5124709bcb8760437d53e16678bfae111ddb757036df4c07d01fa0
+  data.tar.gz: a32e7e86b6bb543e27d234098225a399e6f38e49e330f7d871f51547943a9eeb
 SHA512:
-  metadata.gz: dd0087c86d4efa3bbec51001f98373e5d9c506e7740991c1614c207af0ac93c59b86161916a303f79be074edb1341bc2b38bd2b95290f12af24bd247343024d6
-  data.tar.gz: d3f98b28aac804244d13be7610f9e69e19b28633335002fd20a5bff6c99a67b99aa7efe93da4ad3f2174e8445985273706a2a0c6d7392e072e8241a2b8b8e897
+  metadata.gz: c0f3ee5179384954a776d2afecc37a5377c123aecc99b352deb02fb71493792d911356c8a2a950ff9279cfaca0e39c2122d4f002e72ed43dee2e6e0e6e10de0b
+  data.tar.gz: ef42df04753e9acd8b3f7b37cddb4c35195dc443fd67300ff5fdbc69487602e3f7dcbda0f5b49f92af52272ac7e56a3db070b9dcff9914753639f3f4d9c07fc9

data/app/graphql/shopify_graphql/create_bulk_mutation.rb

@@ -10,6 +10,7 @@ module ShopifyGraphql
             status
           }
           userErrors {
+            code
             field
             message
           }

data/app/graphql/shopify_graphql/create_bulk_query.rb

@@ -10,6 +10,7 @@ module ShopifyGraphql
             status
           }
           userErrors {
+            code
             field
             message
           }

data/app/graphql/shopify_graphql/get_bulk_operation.rb

@@ -13,6 +13,8 @@ module ShopifyGraphql
             completedAt
             fileSize
             url
+            objectCount
+            rootObjectCount
           }
         }
       }
@@ -37,7 +39,9 @@ module ShopifyGraphql
         error_code: data.errorCode,
         created_at: Time.find_zone("UTC").parse(data.createdAt),
         completed_at: data.completedAt ? Time.find_zone("UTC").parse(data.completedAt) : nil,
-        url: data.url
+        url: data.url,
+        object_count: data.objectCount.to_i,
+        root_object_count: data.rootObjectCount.to_i,
       )
     end
   end

data/lib/shopify_graphql/client.rb

@@ -114,6 +114,8 @@ module ShopifyGraphql
           ConnectionError.new(response: response)
         end
       exception.error_code = error_code
+      exception.error_codes = [ error_code ]
+      exception.messages = [ error.message ]
       raise exception, error_message
     end
 
@@ -121,27 +123,52 @@ module ShopifyGraphql
       return response if response.userErrors.blank?
 
       error = response.userErrors.first
-      error_code = error.code
-      error_message = generate_error_message(
-        message: error.message,
-        code: error_code,
-        fields: error.field,
+      errors = response.userErrors
+      error_message = generate_user_errors_message(
+        messages: errors.map(&:message),
+        codes: errors.map(&:code),
+        fields: errors.map(&:field),
       )
 
       exception = UserError.new(response: response)
-      exception.error_code = error_code
-      exception.fields = error.field
+      exception.error_code = error.code
+      exception.error_codes = errors.map(&:code)
+      exception.fields = errors.map(&:field)
+      exception.messages = errors.map(&:message)
       raise exception, error_message
     end
 
-    def generate_error_message(message: nil, code: nil, doc: nil, fields: nil)
+    def generate_error_message(message: nil, code: nil, doc: nil)
       string = "Failed.".dup
       string << " Response code = #{code}." if code
       string << " Response message = #{message}.".gsub("..", ".") if message
       string << " Documentation = #{doc}." if doc
-      string << " Fields = #{fields}." if fields
       string
     end
+
+    def generate_user_errors_message(messages: nil, codes: nil, fields: [])
+      if fields.any?
+        field_count = fields.size
+        result = ["#{field_count} #{"field".pluralize(field_count)} have failed:"]
+        
+        fields.each.with_index do |field, index|
+          field_details = ["\n-"]
+          field_details << "Response code = #{codes[index]}." if codes&.at(index)
+          field_details << "Response message = #{messages[index]}.".gsub("..", ".") if messages&.at(index)
+          field_details << "Field = #{field}." if field
+
+          result << field_details.join(" ")
+        end
+        
+        result.join("\n")
+      else
+        result = ["Failed."]
+        result << "Response code = #{codes.join(", ")}." if codes&.any?
+        result << "Response message = #{messages&.join(", ")}.".gsub("..", ".") if messages&.any?
+        
+        result.join(" ")
+      end
+    end
   end
 
   class << self

data/lib/shopify_graphql/exceptions.rb

@@ -1,6 +1,6 @@
 module ShopifyGraphql
   class ConnectionError < ShopifyAPI::Errors::HttpResponseError
-    attr_accessor :error_code, :fields
+    attr_accessor :error_code, :error_codes, :fields, :messages
 
     def initialize(response: nil)
       unless response

data/lib/shopify_graphql/version.rb

@@ -1,3 +1,3 @@
 module ShopifyGraphql
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Kirill Platonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails