trophy_api_client 1.0.38 → 1.0.40

data/lib/trophy_api_client/types/metric_response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "metric_status"
-require_relative "completed_achievement_response"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -17,7 +17,7 @@ module TrophyApiClient
     attr_reader :status
     # @return [Float] The user's current total for the metric.
     attr_reader :current
-    # @return [Array<TrophyApiClient::CompletedAchievementResponse>] A list of the metric's achievements and the user's progress towards each.
+    # @return [Array<TrophyApiClient::UserAchievementResponse>] A list of the metric's achievements and the user's progress towards each.
     attr_reader :achievements
     # @return [OpenStruct] Additional properties unmapped to the current class definition
     attr_reader :additional_properties
@@ -32,7 +32,7 @@ module TrophyApiClient
     # @param name [String] The name of the metric.
     # @param status [TrophyApiClient::MetricStatus] The status of the metric.
     # @param current [Float] The user's current total for the metric.
-    # @param achievements [Array<TrophyApiClient::CompletedAchievementResponse>] A list of the metric's achievements and the user's progress towards each.
+    # @param achievements [Array<TrophyApiClient::UserAchievementResponse>] A list of the metric's achievements and the user's progress towards each.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
     # @return [TrophyApiClient::MetricResponse]
     def initialize(id:, key:, name:, status:, current:, achievements:, additional_properties: nil)
@@ -67,7 +67,7 @@ module TrophyApiClient
       current = parsed_json["current"]
       achievements = parsed_json["achievements"]&.map do |item|
         item = item.to_json
-        TrophyApiClient::CompletedAchievementResponse.from_json(json_object: item)
+        TrophyApiClient::UserAchievementResponse.from_json(json_object: item)
       end
       new(
         id: id,

data/lib/trophy_api_client/types/user.rb

@@ -51,13 +51,13 @@ module TrophyApiClient
     # @param updated [DateTime] The date and time the user was last updated, in ISO 8601 format.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
     # @return [TrophyApiClient::User]
-    def initialize(id:, device_tokens:, subscribe_to_emails:, attributes:, control:, created:, updated:, email: OMIT,
-                   name: OMIT, tz: OMIT, additional_properties: nil)
+    def initialize(id:, subscribe_to_emails:, attributes:, control:, created:, updated:, email: OMIT, name: OMIT,
+                   tz: OMIT, device_tokens: OMIT, additional_properties: nil)
       @id = id
       @email = email if email != OMIT
       @name = name if name != OMIT
       @tz = tz if tz != OMIT
-      @device_tokens = device_tokens
+      @device_tokens = device_tokens if device_tokens != OMIT
       @subscribe_to_emails = subscribe_to_emails
       @attributes = attributes
       @control = control
@@ -130,7 +130,7 @@ module TrophyApiClient
       obj.email&.is_a?(String) != false || raise("Passed value for field obj.email 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.tz&.is_a?(String) != false || raise("Passed value for field obj.tz is not the expected type, validation failed.")
-      obj.device_tokens.is_a?(Array) != false || raise("Passed value for field obj.device_tokens is not the expected type, validation failed.")
+      obj.device_tokens&.is_a?(Array) != false || raise("Passed value for field obj.device_tokens is not the expected type, validation failed.")
       obj.subscribe_to_emails.is_a?(Boolean) != false || raise("Passed value for field obj.subscribe_to_emails is not the expected type, validation failed.")
       obj.attributes.is_a?(Hash) != false || raise("Passed value for field obj.attributes is not the expected type, validation failed.")
       obj.control.is_a?(Boolean) != false || raise("Passed value for field obj.control is not the expected type, validation failed.")

data/lib/trophy_api_client/types/{achievement_completion_response_achievement.rb → user_achievement_response.rb}

@@ -1,30 +1,17 @@
 # frozen_string_literal: true
 
-require_relative "metric_event_streak_response"
 require "date"
-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"
 
 module TrophyApiClient
-  class AchievementCompletionResponseAchievement
-    # @return [TrophyApiClient::MetricEventStreakResponse] The user's current streak for the metric, if the metric has streaks enabled.
-    attr_reader :current_streak
+  class UserAchievementResponse
     # @return [DateTime] The date and time the achievement was completed, in ISO 8601 format. Null if the
     #  achievement has not been completed.
     attr_reader :achieved_at
-    # @return [Integer] The number of users who have completed this achievement.
-    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.
@@ -50,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]
@@ -58,15 +51,8 @@ module TrophyApiClient
 
     OMIT = Object.new
 
-    # @param current_streak [TrophyApiClient::MetricEventStreakResponse] The user's current streak for the metric, if the metric has streaks enabled.
     # @param achieved_at [DateTime] The date and time the achievement was completed, in ISO 8601 format. Null if the
     #  achievement has not been completed.
-    # @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.
@@ -82,34 +68,30 @@ 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::AchievementCompletionResponseAchievement]
-    def initialize(completions:, rarity:, id:, name:, trigger:, key:, current_streak: OMIT, achieved_at: OMIT, 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)
-      @current_streak = current_streak if current_streak != OMIT
+    # @return [TrophyApiClient::UserAchievementResponse]
+    def initialize(id:, name:, trigger:, achieved_at: OMIT, 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)
       @achieved_at = achieved_at if achieved_at != OMIT
-      @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 = {
-        "currentStreak": current_streak,
         "achievedAt": achieved_at,
-        "completions": completions,
-        "rarity": rarity,
-        "userAttributes": user_attributes,
-        "eventAttribute": event_attribute,
         "id": id,
         "name": name,
         "trigger": trigger,
@@ -119,39 +101,22 @@ 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
     end
 
-    # Deserialize a JSON object to an instance of
-    #  AchievementCompletionResponseAchievement
+    # Deserialize a JSON object to an instance of UserAchievementResponse
     #
     # @param json_object [String]
-    # @return [TrophyApiClient::AchievementCompletionResponseAchievement]
+    # @return [TrophyApiClient::UserAchievementResponse]
     def self.from_json(json_object:)
       struct = JSON.parse(json_object, object_class: OpenStruct)
       parsed_json = JSON.parse(json_object)
-      if parsed_json["currentStreak"].nil?
-        current_streak = nil
-      else
-        current_streak = parsed_json["currentStreak"].to_json
-        current_streak = TrophyApiClient::MetricEventStreakResponse.from_json(json_object: current_streak)
-      end
       achieved_at = (DateTime.parse(parsed_json["achievedAt"]) unless parsed_json["achievedAt"].nil?)
-      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"]
@@ -162,13 +127,18 @@ 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(
-        current_streak: current_streak,
         achieved_at: achieved_at,
-        completions: completions,
-        rarity: rarity,
-        user_attributes: user_attributes,
-        event_attribute: event_attribute,
         id: id,
         name: name,
         trigger: trigger,
@@ -179,12 +149,13 @@ 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
 
-    # Serialize an instance of AchievementCompletionResponseAchievement to a JSON
-    #  object
+    # Serialize an instance of UserAchievementResponse to a JSON object
     #
     # @return [String]
     def to_json(*_args)
@@ -198,22 +169,19 @@ module TrophyApiClient
     # @param obj [Object]
     # @return [Void]
     def self.validate_raw(obj:)
-      obj.current_streak.nil? || TrophyApiClient::MetricEventStreakResponse.validate_raw(obj: obj.current_streak)
       obj.achieved_at&.is_a?(DateTime) != false || raise("Passed value for field obj.achieved_at is not the expected type, validation failed.")
-      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

data/lib/trophy_api_client/types/{completed_achievement_response.rb → user_achievement_with_stats_response.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require "date"
-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"
 
 module TrophyApiClient
-  class CompletedAchievementResponse
+  class UserAchievementWithStatsResponse
     # @return [DateTime] The date and time the achievement was completed, in ISO 8601 format. Null if the
     #  achievement has not been completed.
     attr_reader :achieved_at
@@ -16,12 +16,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.
@@ -47,6 +41,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]
@@ -59,10 +59,6 @@ module TrophyApiClient
     #  achievement has not been completed.
     # @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.
@@ -78,32 +74,34 @@ 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::CompletedAchievementResponse]
-    def initialize(completions:, rarity:, id:, name:, trigger:, key:, achieved_at: OMIT, 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)
+    # @return [TrophyApiClient::UserAchievementWithStatsResponse]
+    def initialize(completions:, rarity:, id:, name:, trigger:, achieved_at: OMIT, 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)
       @achieved_at = achieved_at if achieved_at != OMIT
       @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 = {
         "achievedAt": achieved_at,
         "completions": completions,
         "rarity": rarity,
-        "userAttributes": user_attributes,
-        "eventAttribute": event_attribute,
         "id": id,
         "name": name,
         "trigger": trigger,
@@ -113,32 +111,24 @@ 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
     end
 
-    # Deserialize a JSON object to an instance of CompletedAchievementResponse
+    # Deserialize a JSON object to an instance of UserAchievementWithStatsResponse
     #
     # @param json_object [String]
-    # @return [TrophyApiClient::CompletedAchievementResponse]
+    # @return [TrophyApiClient::UserAchievementWithStatsResponse]
     def self.from_json(json_object:)
       struct = JSON.parse(json_object, object_class: OpenStruct)
       parsed_json = JSON.parse(json_object)
       achieved_at = (DateTime.parse(parsed_json["achievedAt"]) unless parsed_json["achievedAt"].nil?)
       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"]
@@ -149,12 +139,20 @@ 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(
         achieved_at: achieved_at,
         completions: completions,
         rarity: rarity,
-        user_attributes: user_attributes,
-        event_attribute: event_attribute,
         id: id,
         name: name,
         trigger: trigger,
@@ -165,11 +163,13 @@ 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
 
-    # Serialize an instance of CompletedAchievementResponse to a JSON object
+    # Serialize an instance of UserAchievementWithStatsResponse to a JSON object
     #
     # @return [String]
     def to_json(*_args)
@@ -186,18 +186,18 @@ module TrophyApiClient
       obj.achieved_at&.is_a?(DateTime) != false || raise("Passed value for field obj.achieved_at is not the expected type, validation failed.")
       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

data/lib/trophy_api_client/types/webhooks_achievement_completed_payload.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "user"
-require_relative "completed_achievement_response"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -11,7 +11,7 @@ module TrophyApiClient
     attr_reader :type
     # @return [TrophyApiClient::User] The user who completed the achievement.
     attr_reader :user
-    # @return [TrophyApiClient::CompletedAchievementResponse] The achievement completion that occurred.
+    # @return [TrophyApiClient::UserAchievementResponse] The achievement completion that occurred.
     attr_reader :achievement
     # @return [OpenStruct] Additional properties unmapped to the current class definition
     attr_reader :additional_properties
@@ -23,7 +23,7 @@ module TrophyApiClient
 
     # @param type [String] The webhook event type.
     # @param user [TrophyApiClient::User] The user who completed the achievement.
-    # @param achievement [TrophyApiClient::CompletedAchievementResponse] The achievement completion that occurred.
+    # @param achievement [TrophyApiClient::UserAchievementResponse] The achievement completion that occurred.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
     # @return [TrophyApiClient::WebhooksAchievementCompletedPayload]
     def initialize(type:, user:, achievement:, additional_properties: nil)
@@ -52,7 +52,7 @@ module TrophyApiClient
         achievement = nil
       else
         achievement = parsed_json["achievement"].to_json
-        achievement = TrophyApiClient::CompletedAchievementResponse.from_json(json_object: achievement)
+        achievement = TrophyApiClient::UserAchievementResponse.from_json(json_object: achievement)
       end
       new(
         type: type,
@@ -78,7 +78,7 @@ module TrophyApiClient
     def self.validate_raw(obj:)
       obj.type.is_a?(String) != false || raise("Passed value for field obj.type is not the expected type, validation failed.")
       TrophyApiClient::User.validate_raw(obj: obj.user)
-      TrophyApiClient::CompletedAchievementResponse.validate_raw(obj: obj.achievement)
+      TrophyApiClient::UserAchievementResponse.validate_raw(obj: obj.achievement)
     end
   end
 end

data/lib/trophy_api_client/types/wrapped_activity_period.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "completed_achievement_response"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -11,7 +11,7 @@ module TrophyApiClient
     attr_reader :metrics
     # @return [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
     attr_reader :points
-    # @return [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @return [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     attr_reader :achievements
     # @return [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
@@ -26,7 +26,7 @@ module TrophyApiClient
 
     # @param metrics [Hash{String => TrophyApiClient::WrappedMetric}] The user's metrics during this period, keyed by metric key.
     # @param points [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
-    # @param achievements [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @param achievements [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     # @param leaderboards [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
@@ -57,7 +57,7 @@ module TrophyApiClient
       end
       achievements = parsed_json["achievements"]&.map do |item|
         item = item.to_json
-        TrophyApiClient::CompletedAchievementResponse.from_json(json_object: item)
+        TrophyApiClient::UserAchievementResponse.from_json(json_object: item)
       end
       leaderboards = parsed_json["leaderboards"]&.transform_values do |value|
         value = value.to_json

data/lib/trophy_api_client/types/wrapped_entire_year.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "wrapped_streak"
-require_relative "completed_achievement_response"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -14,7 +14,7 @@ module TrophyApiClient
     attr_reader :metrics
     # @return [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
     attr_reader :points
-    # @return [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @return [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     attr_reader :achievements
     # @return [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
@@ -30,7 +30,7 @@ module TrophyApiClient
     # @param longest_streak [TrophyApiClient::WrappedStreak] The user's longest streak during the year.
     # @param metrics [Hash{String => TrophyApiClient::WrappedMetric}] The user's metrics during this period, keyed by metric key.
     # @param points [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
-    # @param achievements [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @param achievements [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     # @param leaderboards [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
@@ -74,7 +74,7 @@ module TrophyApiClient
       end
       achievements = parsed_json["achievements"]&.map do |item|
         item = item.to_json
-        TrophyApiClient::CompletedAchievementResponse.from_json(json_object: item)
+        TrophyApiClient::UserAchievementResponse.from_json(json_object: item)
       end
       leaderboards = parsed_json["leaderboards"]&.transform_values do |value|
         value = value.to_json

data/lib/trophy_api_client/types/wrapped_most_active_day.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "completed_achievement_response"
+require_relative "user_achievement_response"
 require "ostruct"
 require "json"
 
@@ -13,7 +13,7 @@ module TrophyApiClient
     attr_reader :metrics
     # @return [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
     attr_reader :points
-    # @return [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @return [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     attr_reader :achievements
     # @return [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
@@ -29,7 +29,7 @@ module TrophyApiClient
     # @param date [String] The date of the most active day in YYYY-MM-DD format.
     # @param metrics [Hash{String => TrophyApiClient::WrappedMetric}] The user's metrics during this period, keyed by metric key.
     # @param points [Hash{String => TrophyApiClient::WrappedPoints}] The user's points during this period, keyed by points system key.
-    # @param achievements [Array<TrophyApiClient::CompletedAchievementResponse>] Achievements completed during this period.
+    # @param achievements [Array<TrophyApiClient::UserAchievementResponse>] Achievements completed during this period.
     # @param leaderboards [Hash{String => TrophyApiClient::UserLeaderboardResponse}] The user's best leaderboard rankings during this period, keyed by leaderboard
     #  key.
     # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
@@ -68,7 +68,7 @@ module TrophyApiClient
       end
       achievements = parsed_json["achievements"]&.map do |item|
         item = item.to_json
-        TrophyApiClient::CompletedAchievementResponse.from_json(json_object: item)
+        TrophyApiClient::UserAchievementResponse.from_json(json_object: item)
       end
       leaderboards = parsed_json["leaderboards"]&.transform_values do |value|
         value = value.to_json