Merge pull request #1495 from dmitry-sinina/customer_api_fix_uuid_fil…

…ters customer API: services and transactions filter by UUID
yeti-switch · Jul 1, 2024 · 83887ad · 83887ad
2 parents ee0b554 + a763add
commit 83887ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/billing/service_type.rb b/app/models/billing/service_type.rb
@@ -58,7 +58,7 @@ def validate_provisioning_class
       return
     end
 
-    if persisted? && services.any?
+    if persisted? && services.any? && attribute_changed?(:provisioning_class)
       errors.add(:provisioning_class, "can't be changed because have linked services")
     end
   end

diff --git a/app/resources/api/rest/customer/v1/service_resource.rb b/app/resources/api/rest/customer/v1/service_resource.rb
@@ -18,7 +18,7 @@ class Api::Rest::Customer::V1::ServiceResource < Api::Rest::Customer::V1::BaseRe
 
   ransack_filter :created_at, type: :datetime
   ransack_filter :name, type: :string
-  ransack_filter :account_id, type: :foreign_key
+  association_uuid_filter :account_id, class_name: 'Account'
   ransack_filter :initial_price, type: :number
   ransack_filter :renew_price, type: :number
   ransack_filter :renew_at, type: :datetime

diff --git a/app/resources/api/rest/customer/v1/transaction_resource.rb b/app/resources/api/rest/customer/v1/transaction_resource.rb
@@ -12,12 +12,12 @@ class Api::Rest::Customer::V1::TransactionResource < Api::Rest::Customer::V1::Ba
   has_one :service, class_name: 'Service', relation_name: :type, foreign_key_on: :related
 
   ransack_filter :created_at, type: :datetime
-  ransack_filter :account_id, type: :foreign_key
+  association_uuid_filter :account_id, class_name: 'Account'
   ransack_filter :service_id, type: :foreign_key
   ransack_filter :amount, type: :number
   ransack_filter :description, type: :string
 
   def self.sortable_fields(_ctx = nil)
-    %i[id created_at account_id service_id amount]
+    %i[id created_at service_id amount]
   end
 end