trophy_api_client 1.0.36 → 1.0.40.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70c39a88f44a9a92618d3953c39a947513d02a2ea0dade3fd4fdbdf9de89ad94
-  data.tar.gz: 4d36287ce62401dd40657fac67764aff80c9c55315d2d611b832c92df533cdbb
+  metadata.gz: 2370ecd85550dfdf075f1458764d0070068fe6757fdfb9057644cc8a891bc7eb
+  data.tar.gz: 2c731a0e2da22159f6f5ede24317bf83c0b0ca5d100788da182ad96ad4510530
 SHA512:
-  metadata.gz: 137070ab6a7c5517ded89325942d327d876e4129c64dbb4929cbc466f73884bf401afe0ab1b61935cf0e5cbea57d86ebe1488f8f0fb2cf08d813e68aa9ec42ea
-  data.tar.gz: 6f9417b7950b6d2a8cec35da7a8780ae4ad13a59f17a25eb3af05ffed7a3955a05e42d6b8e3c956ef06b84ef95b9b0843023788f476d5961e209c701a865e187
+  metadata.gz: 9c35f9fe859def5b504d1310a8bbdd0efed2c06209ce67bca78d2521f2ce87bc7520547b1295941de48bac8e13c7af88b5d74d9c2d2c228f9f4843d8466e53a6
+  data.tar.gz: 8361d138e62c2e8616922287b7d5d2747de2f5163d185a69e6eada3a4b89df57f33c7cd395546b84d80a4de8d9402cb4d8474ab495178dae14887c266f1f9f06

data/lib/gemconfig.rb

@@ -2,7 +2,7 @@
 
 module TrophyApiClient
   module Gemconfig
-    VERSION = "1.0.36"
+    VERSION = "1.0.40-beta.5"
     AUTHORS = ["Trophy Labs, Inc"].freeze
     EMAIL = ""
     SUMMARY = "Ruby library for the Trophy API."

data/lib/trophy_api_client/admin/client.rb

@@ -6,24 +6,24 @@ require_relative "streaks/client"
 module TrophyApiClient
   module Admin
     class Client
-      # @return [TrophyApiClient::Admin::Streaks::Client]
-      attr_reader :admin
+      # @return [TrophyApiClient::Admin::StreaksClient]
+      attr_reader :streaks
 
       # @param request_client [TrophyApiClient::RequestClient]
       # @return [TrophyApiClient::Admin::Client]
       def initialize(request_client:)
-        @admin = TrophyApiClient::Admin::Streaks::Client.new(request_client: request_client)
+        @streaks = TrophyApiClient::Admin::StreaksClient.new(request_client: request_client)
       end
     end
 
     class AsyncClient
-      # @return [TrophyApiClient::Admin::Streaks::AsyncClient]
-      attr_reader :admin
+      # @return [TrophyApiClient::Admin::AsyncStreaksClient]
+      attr_reader :streaks
 
       # @param request_client [TrophyApiClient::AsyncRequestClient]
       # @return [TrophyApiClient::Admin::AsyncClient]
       def initialize(request_client:)
-        @admin = TrophyApiClient::Admin::Streaks::AsyncClient.new(request_client: request_client)
+        @streaks = TrophyApiClient::Admin::AsyncStreaksClient.new(request_client: request_client)
       end
     end
   end

data/lib/trophy_api_client/admin/streaks/client.rb

@@ -1,30 +1,98 @@
 # frozen_string_literal: true
 
 require_relative "../../../requests"
-require_relative "freezes/client"
+require_relative "types/restore_streaks_request_users_item"
+require_relative "../../types/restore_streaks_response"
+require "async"
 
 module TrophyApiClient
   module Admin
-    module Streaks
-      class Client
-        # @return [TrophyApiClient::Admin::Streaks::FreezesClient]
-        attr_reader :freezes
+    class StreaksClient
+      # @return [TrophyApiClient::RequestClient]
+      attr_reader :request_client
 
-        # @param request_client [TrophyApiClient::RequestClient]
-        # @return [TrophyApiClient::Admin::Streaks::Client]
-        def initialize(request_client:)
-          @freezes = TrophyApiClient::Admin::Streaks::FreezesClient.new(request_client: request_client)
+      # @param request_client [TrophyApiClient::RequestClient]
+      # @return [TrophyApiClient::Admin::StreaksClient]
+      def initialize(request_client:)
+        @request_client = request_client
+      end
+
+      # Restore streaks for multiple users to the maximum length in the last 90 days (in
+      #  the case of daily streaks), one year (in the case of weekly streaks), or two
+      #  years (in the case of monthly streaks).
+      #
+      # @param users [Array<Hash>] Array of users to restore streaks for. Maximum 100 users per request.Request of type Array<TrophyApiClient::Admin::Streaks::RestoreStreaksRequestUsersItem>, as a Hash
+      #   * :id (String)
+      # @param request_options [TrophyApiClient::RequestOptions]
+      # @return [TrophyApiClient::RestoreStreaksResponse]
+      # @example
+      #  api = TrophyApiClient::Client.new(
+      #    base_url: "https://api.example.com",
+      #    environment: TrophyApiClient::Environment::PRODUCTION,
+      #    api_key: "YOUR_API_KEY"
+      #  )
+      #  api.admin.streaks.restore(users: [{ id: "user-123" }, { id: "user-456" }])
+      def restore(users:, request_options: nil)
+        response = @request_client.conn.post do |req|
+          req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
+          req.headers["X-API-KEY"] = request_options.api_key unless request_options&.api_key.nil?
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
+          unless request_options.nil? || request_options&.additional_query_parameters.nil?
+            req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+          end
+          req.body = { **(request_options&.additional_body_parameters || {}), users: users }.compact
+          req.url "#{@request_client.get_url(environment: admin, request_options: request_options)}/streaks/restore"
         end
+        TrophyApiClient::RestoreStreaksResponse.from_json(json_object: response.body)
       end
+    end
 
-      class AsyncClient
-        # @return [TrophyApiClient::Admin::Streaks::AsyncFreezesClient]
-        attr_reader :freezes
+    class AsyncStreaksClient
+      # @return [TrophyApiClient::AsyncRequestClient]
+      attr_reader :request_client
+
+      # @param request_client [TrophyApiClient::AsyncRequestClient]
+      # @return [TrophyApiClient::Admin::AsyncStreaksClient]
+      def initialize(request_client:)
+        @request_client = request_client
+      end
 
-        # @param request_client [TrophyApiClient::AsyncRequestClient]
-        # @return [TrophyApiClient::Admin::Streaks::AsyncClient]
-        def initialize(request_client:)
-          @freezes = TrophyApiClient::Admin::Streaks::AsyncFreezesClient.new(request_client: request_client)
+      # Restore streaks for multiple users to the maximum length in the last 90 days (in
+      #  the case of daily streaks), one year (in the case of weekly streaks), or two
+      #  years (in the case of monthly streaks).
+      #
+      # @param users [Array<Hash>] Array of users to restore streaks for. Maximum 100 users per request.Request of type Array<TrophyApiClient::Admin::Streaks::RestoreStreaksRequestUsersItem>, as a Hash
+      #   * :id (String)
+      # @param request_options [TrophyApiClient::RequestOptions]
+      # @return [TrophyApiClient::RestoreStreaksResponse]
+      # @example
+      #  api = TrophyApiClient::Client.new(
+      #    base_url: "https://api.example.com",
+      #    environment: TrophyApiClient::Environment::PRODUCTION,
+      #    api_key: "YOUR_API_KEY"
+      #  )
+      #  api.admin.streaks.restore(users: [{ id: "user-123" }, { id: "user-456" }])
+      def restore(users:, request_options: nil)
+        Async do
+          response = @request_client.conn.post do |req|
+            req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
+            req.headers["X-API-KEY"] = request_options.api_key unless request_options&.api_key.nil?
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
+            unless request_options.nil? || request_options&.additional_query_parameters.nil?
+              req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+            end
+            req.body = { **(request_options&.additional_body_parameters || {}), users: users }.compact
+            req.url "#{@request_client.get_url(environment: admin, request_options: request_options)}/streaks/restore"
+          end
+          TrophyApiClient::RestoreStreaksResponse.from_json(json_object: response.body)
         end
       end
     end

data/lib/trophy_api_client/admin/streaks/types/restore_streaks_request_users_item.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "ostruct"
+require "json"
+
+module TrophyApiClient
+  module Admin
+    class Streaks
+      class RestoreStreaksRequestUsersItem
+        # @return [String] The ID of the user to restore streaks for.
+        attr_reader :id
+        # @return [OpenStruct] Additional properties unmapped to the current class definition
+        attr_reader :additional_properties
+        # @return [Object]
+        attr_reader :_field_set
+        protected :_field_set
+
+        OMIT = Object.new
+
+        # @param id [String] The ID of the user to restore streaks for.
+        # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
+        # @return [TrophyApiClient::Admin::Streaks::RestoreStreaksRequestUsersItem]
+        def initialize(id:, additional_properties: nil)
+          @id = id
+          @additional_properties = additional_properties
+          @_field_set = { "id": id }
+        end
+
+        # Deserialize a JSON object to an instance of RestoreStreaksRequestUsersItem
+        #
+        # @param json_object [String]
+        # @return [TrophyApiClient::Admin::Streaks::RestoreStreaksRequestUsersItem]
+        def self.from_json(json_object:)
+          struct = JSON.parse(json_object, object_class: OpenStruct)
+          parsed_json = JSON.parse(json_object)
+          id = parsed_json["id"]
+          new(id: id, additional_properties: struct)
+        end
+
+        # Serialize an instance of RestoreStreaksRequestUsersItem to a JSON object
+        #
+        # @return [String]
+        def to_json(*_args)
+          @_field_set&.to_json
+        end
+
+        # Leveraged for Union-type generation, validate_raw attempts to parse the given
+        #  hash and check each fields type against the current object's property
+        #  definitions.
+        #
+        # @param obj [Object]
+        # @return [Void]
+        def self.validate_raw(obj:)
+          obj.id.is_a?(String) != false || raise("Passed value for field obj.id is not the expected type, validation failed.")
+        end
+      end
+    end
+  end
+end

data/lib/trophy_api_client/types/achievement_completion_response.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "achievement_completion_response_achievement"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -8,7 +8,7 @@ module TrophyApiClient
   class AchievementCompletionResponse
     # @return [String] The unique ID of the completion.
     attr_reader :completion_id
-    # @return [TrophyApiClient::AchievementCompletionResponseAchievement]
+    # @return [TrophyApiClient::UserAchievementResponse]
     attr_reader :achievement
     # @return [Hash{String => TrophyApiClient::MetricEventPointsResponse}] A map of points systems by key that were affected by this achievement
     #  completion.
@@ -22,7 +22,7 @@ module TrophyApiClient
     OMIT = Object.new
 
     # @param completion_id [String] The unique ID of the completion.
-    # @param achievement [TrophyApiClient::AchievementCompletionResponseAchievement]
+    # @param achievement [TrophyApiClient::UserAchievementResponse]
     # @param points [Hash{String => TrophyApiClient::MetricEventPointsResponse}] A map of points systems by key that were affected by this achievement
     #  completion.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
@@ -47,7 +47,7 @@ module TrophyApiClient
         achievement = nil
       else
         achievement = parsed_json["achievement"].to_json
-        achievement = TrophyApiClient::AchievementCompletionResponseAchievement.from_json(json_object: achievement)
+        achievement = TrophyApiClient::UserAchievementResponse.from_json(json_object: achievement)
       end
       points = parsed_json["points"]&.transform_values do |value|
         value = value.to_json
@@ -76,7 +76,7 @@ module TrophyApiClient
     # @return [Void]
     def self.validate_raw(obj:)
       obj.completion_id.is_a?(String) != false || raise("Passed value for field obj.completion_id is not the expected type, validation failed.")
-      TrophyApiClient::AchievementCompletionResponseAchievement.validate_raw(obj: obj.achievement)
+      TrophyApiClient::UserAchievementResponse.validate_raw(obj: obj.achievement)
       obj.points.is_a?(Hash) != false || raise("Passed value for field obj.points is not the expected type, validation failed.")
     end
   end

data/lib/trophy_api_client/types/achievement_response.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "achievement_response_trigger"
+require_relative "achievement_response_user_attributes_item"
+require_relative "achievement_response_event_attribute"
 require "ostruct"
 require "json"
 
@@ -31,6 +33,12 @@ module TrophyApiClient
     # @return [String] The name of the metric associated with this achievement (only applicable if
     #  trigger = 'metric')
     attr_reader :metric_name
+    # @return [Array<TrophyApiClient::AchievementResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
+    #  Only present if the achievement has user attribute filters configured.
+    attr_reader :user_attributes
+    # @return [TrophyApiClient::AchievementResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
+    #  Only present if the achievement has an event filter configured.
+    attr_reader :event_attribute
     # @return [OpenStruct] Additional properties unmapped to the current class definition
     attr_reader :additional_properties
     # @return [Object]
@@ -54,20 +62,26 @@ module TrophyApiClient
     #  trigger = 'metric')
     # @param metric_name [String] The name of the metric associated with this achievement (only applicable if
     #  trigger = 'metric')
+    # @param user_attributes [Array<TrophyApiClient::AchievementResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
+    #  Only present if the achievement has user attribute filters configured.
+    # @param event_attribute [TrophyApiClient::AchievementResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
+    #  Only present if the achievement has an event filter configured.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
     # @return [TrophyApiClient::AchievementResponse]
-    def initialize(id:, name:, trigger:, key:, description: OMIT, badge_url: OMIT, streak_length: OMIT,
-                   metric_id: OMIT, metric_value: OMIT, metric_name: OMIT, additional_properties: nil)
+    def initialize(id:, name:, trigger:, description: OMIT, badge_url: OMIT, key: OMIT, streak_length: OMIT,
+                   metric_id: OMIT, metric_value: OMIT, metric_name: OMIT, user_attributes: OMIT, event_attribute: OMIT, additional_properties: nil)
       @id = id
       @name = name
       @trigger = trigger
       @description = description if description != OMIT
       @badge_url = badge_url if badge_url != OMIT
-      @key = key
+      @key = key if key != OMIT
       @streak_length = streak_length if streak_length != OMIT
       @metric_id = metric_id if metric_id != OMIT
       @metric_value = metric_value if metric_value != OMIT
       @metric_name = metric_name if metric_name != OMIT
+      @user_attributes = user_attributes if user_attributes != OMIT
+      @event_attribute = event_attribute if event_attribute != OMIT
       @additional_properties = additional_properties
       @_field_set = {
         "id": id,
@@ -79,7 +93,9 @@ module TrophyApiClient
         "streakLength": streak_length,
         "metricId": metric_id,
         "metricValue": metric_value,
-        "metricName": metric_name
+        "metricName": metric_name,
+        "userAttributes": user_attributes,
+        "eventAttribute": event_attribute
       }.reject do |_k, v|
         v == OMIT
       end
@@ -102,6 +118,16 @@ module TrophyApiClient
       metric_id = parsed_json["metricId"]
       metric_value = parsed_json["metricValue"]
       metric_name = parsed_json["metricName"]
+      user_attributes = parsed_json["userAttributes"]&.map do |item|
+        item = item.to_json
+        TrophyApiClient::AchievementResponseUserAttributesItem.from_json(json_object: item)
+      end
+      if parsed_json["eventAttribute"].nil?
+        event_attribute = nil
+      else
+        event_attribute = parsed_json["eventAttribute"].to_json
+        event_attribute = TrophyApiClient::AchievementResponseEventAttribute.from_json(json_object: event_attribute)
+      end
       new(
         id: id,
         name: name,
@@ -113,6 +139,8 @@ module TrophyApiClient
         metric_id: metric_id,
         metric_value: metric_value,
         metric_name: metric_name,
+        user_attributes: user_attributes,
+        event_attribute: event_attribute,
         additional_properties: struct
       )
     end
@@ -136,11 +164,13 @@ module TrophyApiClient
       obj.trigger.is_a?(TrophyApiClient::AchievementResponseTrigger) != false || raise("Passed value for field obj.trigger is not the expected type, validation failed.")
       obj.description&.is_a?(String) != false || raise("Passed value for field obj.description is not the expected type, validation failed.")
       obj.badge_url&.is_a?(String) != false || raise("Passed value for field obj.badge_url is not the expected type, validation failed.")
-      obj.key.is_a?(String) != false || raise("Passed value for field obj.key is not the expected type, validation failed.")
+      obj.key&.is_a?(String) != false || raise("Passed value for field obj.key is not the expected type, validation failed.")
       obj.streak_length&.is_a?(Integer) != false || raise("Passed value for field obj.streak_length is not the expected type, validation failed.")
       obj.metric_id&.is_a?(String) != false || raise("Passed value for field obj.metric_id is not the expected type, validation failed.")
       obj.metric_value&.is_a?(Float) != false || raise("Passed value for field obj.metric_value is not the expected type, validation failed.")
       obj.metric_name&.is_a?(String) != false || raise("Passed value for field obj.metric_name is not the expected type, validation failed.")
+      obj.user_attributes&.is_a?(Array) != false || raise("Passed value for field obj.user_attributes is not the expected type, validation failed.")
+      obj.event_attribute.nil? || TrophyApiClient::AchievementResponseEventAttribute.validate_raw(obj: obj.event_attribute)
     end
   end
 end

data/lib/trophy_api_client/types/{achievement_with_stats_response_event_attribute.rb → achievement_response_event_attribute.rb}

@@ -6,7 +6,7 @@ require "json"
 module TrophyApiClient
   # Event attribute filter that must be met for this achievement to be completed.
   #  Only present if the achievement has an event filter configured.
-  class AchievementWithStatsResponseEventAttribute
+  class AchievementResponseEventAttribute
     # @return [String] The key of the event attribute.
     attr_reader :key
     # @return [String] The value of the event attribute.
@@ -22,7 +22,7 @@ module TrophyApiClient
     # @param key [String] The key of the event attribute.
     # @param value [String] The value of the event attribute.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
-    # @return [TrophyApiClient::AchievementWithStatsResponseEventAttribute]
+    # @return [TrophyApiClient::AchievementResponseEventAttribute]
     def initialize(key:, value:, additional_properties: nil)
       @key = key
       @value = value
@@ -30,11 +30,10 @@ module TrophyApiClient
       @_field_set = { "key": key, "value": value }
     end
 
-    # Deserialize a JSON object to an instance of
-    #  AchievementWithStatsResponseEventAttribute
+    # Deserialize a JSON object to an instance of AchievementResponseEventAttribute
     #
     # @param json_object [String]
-    # @return [TrophyApiClient::AchievementWithStatsResponseEventAttribute]
+    # @return [TrophyApiClient::AchievementResponseEventAttribute]
     def self.from_json(json_object:)
       struct = JSON.parse(json_object, object_class: OpenStruct)
       parsed_json = JSON.parse(json_object)
@@ -47,8 +46,7 @@ module TrophyApiClient
       )
     end
 
-    # Serialize an instance of AchievementWithStatsResponseEventAttribute to a JSON
-    #  object
+    # Serialize an instance of AchievementResponseEventAttribute to a JSON object
     #
     # @return [String]
     def to_json(*_args)

data/lib/trophy_api_client/types/{achievement_with_stats_response_user_attributes_item.rb → achievement_response_user_attributes_item.rb}

@@ -4,7 +4,7 @@ require "ostruct"
 require "json"
 
 module TrophyApiClient
-  class AchievementWithStatsResponseUserAttributesItem
+  class AchievementResponseUserAttributesItem
     # @return [String] The key of the user attribute.
     attr_reader :key
     # @return [String] The value of the user attribute.
@@ -20,7 +20,7 @@ module TrophyApiClient
     # @param key [String] The key of the user attribute.
     # @param value [String] The value of the user attribute.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
-    # @return [TrophyApiClient::AchievementWithStatsResponseUserAttributesItem]
+    # @return [TrophyApiClient::AchievementResponseUserAttributesItem]
     def initialize(key:, value:, additional_properties: nil)
       @key = key
       @value = value
@@ -29,10 +29,10 @@ module TrophyApiClient
     end
 
     # Deserialize a JSON object to an instance of
-    #  AchievementWithStatsResponseUserAttributesItem
+    #  AchievementResponseUserAttributesItem
     #
     # @param json_object [String]
-    # @return [TrophyApiClient::AchievementWithStatsResponseUserAttributesItem]
+    # @return [TrophyApiClient::AchievementResponseUserAttributesItem]
     def self.from_json(json_object:)
       struct = JSON.parse(json_object, object_class: OpenStruct)
       parsed_json = JSON.parse(json_object)
@@ -45,8 +45,7 @@ module TrophyApiClient
       )
     end
 
-    # Serialize an instance of AchievementWithStatsResponseUserAttributesItem to a
-    #  JSON object
+    # Serialize an instance of AchievementResponseUserAttributesItem to a JSON object
     #
     # @return [String]
     def to_json(*_args)

data/lib/trophy_api_client/types/achievement_with_stats_response.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "achievement_with_stats_response_user_attributes_item"
-require_relative "achievement_with_stats_response_event_attribute"
 require_relative "achievement_response_trigger"
+require_relative "achievement_response_user_attributes_item"
+require_relative "achievement_response_event_attribute"
 require "ostruct"
 require "json"
 
@@ -12,12 +12,6 @@ module TrophyApiClient
     attr_reader :completions
     # @return [Float] The percentage of all users who have completed this achievement.
     attr_reader :rarity
-    # @return [Array<TrophyApiClient::AchievementWithStatsResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
-    #  Only present if the achievement has user attribute filters configured.
-    attr_reader :user_attributes
-    # @return [TrophyApiClient::AchievementWithStatsResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
-    #  Only present if the achievement has an event filter configured.
-    attr_reader :event_attribute
     # @return [String] The unique ID of the achievement.
     attr_reader :id
     # @return [String] The name of this achievement.
@@ -43,6 +37,12 @@ module TrophyApiClient
     # @return [String] The name of the metric associated with this achievement (only applicable if
     #  trigger = 'metric')
     attr_reader :metric_name
+    # @return [Array<TrophyApiClient::AchievementResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
+    #  Only present if the achievement has user attribute filters configured.
+    attr_reader :user_attributes
+    # @return [TrophyApiClient::AchievementResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
+    #  Only present if the achievement has an event filter configured.
+    attr_reader :event_attribute
     # @return [OpenStruct] Additional properties unmapped to the current class definition
     attr_reader :additional_properties
     # @return [Object]
@@ -53,10 +53,6 @@ module TrophyApiClient
 
     # @param completions [Integer] The number of users who have completed this achievement.
     # @param rarity [Float] The percentage of all users who have completed this achievement.
-    # @param user_attributes [Array<TrophyApiClient::AchievementWithStatsResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
-    #  Only present if the achievement has user attribute filters configured.
-    # @param event_attribute [TrophyApiClient::AchievementWithStatsResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
-    #  Only present if the achievement has an event filter configured.
     # @param id [String] The unique ID of the achievement.
     # @param name [String] The name of this achievement.
     # @param trigger [TrophyApiClient::AchievementResponseTrigger] The trigger of the achievement.
@@ -72,30 +68,32 @@ module TrophyApiClient
     #  trigger = 'metric')
     # @param metric_name [String] The name of the metric associated with this achievement (only applicable if
     #  trigger = 'metric')
+    # @param user_attributes [Array<TrophyApiClient::AchievementResponseUserAttributesItem>] User attribute filters that must be met for this achievement to be completed.
+    #  Only present if the achievement has user attribute filters configured.
+    # @param event_attribute [TrophyApiClient::AchievementResponseEventAttribute] Event attribute filter that must be met for this achievement to be completed.
+    #  Only present if the achievement has an event filter configured.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
     # @return [TrophyApiClient::AchievementWithStatsResponse]
-    def initialize(completions:, rarity:, id:, name:, trigger:, key:, user_attributes: OMIT, event_attribute: OMIT,
-                   description: OMIT, badge_url: OMIT, streak_length: OMIT, metric_id: OMIT, metric_value: OMIT, metric_name: OMIT, additional_properties: nil)
+    def initialize(completions:, rarity:, id:, name:, trigger:, description: OMIT, badge_url: OMIT, key: OMIT,
+                   streak_length: OMIT, metric_id: OMIT, metric_value: OMIT, metric_name: OMIT, user_attributes: OMIT, event_attribute: OMIT, additional_properties: nil)
       @completions = completions
       @rarity = rarity
-      @user_attributes = user_attributes if user_attributes != OMIT
-      @event_attribute = event_attribute if event_attribute != OMIT
       @id = id
       @name = name
       @trigger = trigger
       @description = description if description != OMIT
       @badge_url = badge_url if badge_url != OMIT
-      @key = key
+      @key = key if key != OMIT
       @streak_length = streak_length if streak_length != OMIT
       @metric_id = metric_id if metric_id != OMIT
       @metric_value = metric_value if metric_value != OMIT
       @metric_name = metric_name if metric_name != OMIT
+      @user_attributes = user_attributes if user_attributes != OMIT
+      @event_attribute = event_attribute if event_attribute != OMIT
       @additional_properties = additional_properties
       @_field_set = {
         "completions": completions,
         "rarity": rarity,
-        "userAttributes": user_attributes,
-        "eventAttribute": event_attribute,
         "id": id,
         "name": name,
         "trigger": trigger,
@@ -105,7 +103,9 @@ module TrophyApiClient
         "streakLength": streak_length,
         "metricId": metric_id,
         "metricValue": metric_value,
-        "metricName": metric_name
+        "metricName": metric_name,
+        "userAttributes": user_attributes,
+        "eventAttribute": event_attribute
       }.reject do |_k, v|
         v == OMIT
       end
@@ -120,16 +120,6 @@ module TrophyApiClient
       parsed_json = JSON.parse(json_object)
       completions = parsed_json["completions"]
       rarity = parsed_json["rarity"]
-      user_attributes = parsed_json["userAttributes"]&.map do |item|
-        item = item.to_json
-        TrophyApiClient::AchievementWithStatsResponseUserAttributesItem.from_json(json_object: item)
-      end
-      if parsed_json["eventAttribute"].nil?
-        event_attribute = nil
-      else
-        event_attribute = parsed_json["eventAttribute"].to_json
-        event_attribute = TrophyApiClient::AchievementWithStatsResponseEventAttribute.from_json(json_object: event_attribute)
-      end
       id = parsed_json["id"]
       name = parsed_json["name"]
       trigger = parsed_json["trigger"]
@@ -140,11 +130,19 @@ module TrophyApiClient
       metric_id = parsed_json["metricId"]
       metric_value = parsed_json["metricValue"]
       metric_name = parsed_json["metricName"]
+      user_attributes = parsed_json["userAttributes"]&.map do |item|
+        item = item.to_json
+        TrophyApiClient::AchievementResponseUserAttributesItem.from_json(json_object: item)
+      end
+      if parsed_json["eventAttribute"].nil?
+        event_attribute = nil
+      else
+        event_attribute = parsed_json["eventAttribute"].to_json
+        event_attribute = TrophyApiClient::AchievementResponseEventAttribute.from_json(json_object: event_attribute)
+      end
       new(
         completions: completions,
         rarity: rarity,
-        user_attributes: user_attributes,
-        event_attribute: event_attribute,
         id: id,
         name: name,
         trigger: trigger,
@@ -155,6 +153,8 @@ module TrophyApiClient
         metric_id: metric_id,
         metric_value: metric_value,
         metric_name: metric_name,
+        user_attributes: user_attributes,
+        event_attribute: event_attribute,
         additional_properties: struct
       )
     end
@@ -175,18 +175,18 @@ module TrophyApiClient
     def self.validate_raw(obj:)
       obj.completions.is_a?(Integer) != false || raise("Passed value for field obj.completions is not the expected type, validation failed.")
       obj.rarity.is_a?(Float) != false || raise("Passed value for field obj.rarity is not the expected type, validation failed.")
-      obj.user_attributes&.is_a?(Array) != false || raise("Passed value for field obj.user_attributes is not the expected type, validation failed.")
-      obj.event_attribute.nil? || TrophyApiClient::AchievementWithStatsResponseEventAttribute.validate_raw(obj: obj.event_attribute)
       obj.id.is_a?(String) != false || raise("Passed value for field obj.id is not the expected type, validation failed.")
       obj.name.is_a?(String) != false || raise("Passed value for field obj.name is not the expected type, validation failed.")
       obj.trigger.is_a?(TrophyApiClient::AchievementResponseTrigger) != false || raise("Passed value for field obj.trigger is not the expected type, validation failed.")
       obj.description&.is_a?(String) != false || raise("Passed value for field obj.description is not the expected type, validation failed.")
       obj.badge_url&.is_a?(String) != false || raise("Passed value for field obj.badge_url is not the expected type, validation failed.")
-      obj.key.is_a?(String) != false || raise("Passed value for field obj.key is not the expected type, validation failed.")
+      obj.key&.is_a?(String) != false || raise("Passed value for field obj.key is not the expected type, validation failed.")
       obj.streak_length&.is_a?(Integer) != false || raise("Passed value for field obj.streak_length is not the expected type, validation failed.")
       obj.metric_id&.is_a?(String) != false || raise("Passed value for field obj.metric_id is not the expected type, validation failed.")
       obj.metric_value&.is_a?(Float) != false || raise("Passed value for field obj.metric_value is not the expected type, validation failed.")
       obj.metric_name&.is_a?(String) != false || raise("Passed value for field obj.metric_name is not the expected type, validation failed.")
+      obj.user_attributes&.is_a?(Array) != false || raise("Passed value for field obj.user_attributes is not the expected type, validation failed.")
+      obj.event_attribute.nil? || TrophyApiClient::AchievementResponseEventAttribute.validate_raw(obj: obj.event_attribute)
     end
   end
 end