fix: enforce required conversation attributes on resolve for macros (#15232)

enterprise/app/services/enterprise/macros/execution_service.rb

@@ -0,0 +1,32 @@
+module Enterprise::Macros::ExecutionService
+  def resolve_conversation(_params)
+    return if required_attributes_missing?
+
+    super
+  end
+
+  def change_status(status)
+    return if resolved_status?(status.first) && required_attributes_missing?
+
+    super
+  end
+
+  private
+
+  # Action params are stored as raw JSON, so the status arrives either as the enum
+  # name or as its integer value depending on how the macro was created.
+  def resolved_status?(status)
+    ['resolved', Conversation.statuses['resolved']].include?(status)
+  end
+
+  def required_attributes_missing?
+    return false unless @account.feature_enabled?('conversation_required_attributes')
+
+    defined_keys = @account.custom_attribute_definitions.conversation_attribute.pluck(:attribute_key)
+    required_keys = @account.conversation_required_attributes.to_a & defined_keys
+    return false if required_keys.blank?
+
+    custom_attributes = @conversation.custom_attributes || {}
+    required_keys.any? { |key| custom_attributes[key].to_s.blank? }
+  end
+end