Merge pull request #1550 from senid231/fix-customer-api-service-trans…

…action

fix customer api service and transactions

app/resources/api/rest/customer/v1/service_resource.rb

@@ -38,4 +38,13 @@ def self.sortable_fields(_ctx = nil)
   def self.required_model_includes(_ctx = nil)
     [:type]
   end
+
+  def self.apply_allowed_accounts(records, options)
+    context = options[:context]
+    if context[:allowed_account_ids].present?
+      records.where(account_id: context[:allowed_account_ids])
+    else
+      records.joins(:account).where(accounts: { contractor_id: context[:customer_id] })
+    end
+  end
 end

app/resources/api/rest/customer/v1/transaction_resource.rb

@@ -20,4 +20,13 @@ class Api::Rest::Customer::V1::TransactionResource < Api::Rest::Customer::V1::Ba
   def self.sortable_fields(_ctx = nil)
     %i[id created_at service_id amount]
   end
+
+  def self.apply_allowed_accounts(records, options)
+    context = options[:context]
+    if context[:allowed_account_ids].present?
+      records.where(account_id: context[:allowed_account_ids])
+    else
+      records.joins(:account).where(accounts: { contractor_id: context[:customer_id] })
+    end
+  end
 end

spec/requests/api/rest/customer/v1/services_controller_spec.rb

@@ -3,9 +3,15 @@
 RSpec.describe Api::Rest::Customer::V1::ServicesController, type: :request do
   include_context :json_api_customer_v1_helpers, type: :services
 
-  let!(:service) { FactoryBot.create(:service, uuid: SecureRandom.uuid) }
+  let(:account) { create(:account, contractor: customer) }
+  let!(:service) { FactoryBot.create(:service, uuid: SecureRandom.uuid, account:) }
   let(:json_api_request_query) { { include: :transactions } }
 
+  before do
+    # other customer's service
+    FactoryBot.create(:service)
+  end
+
   describe 'GET /api/rest/customer/v1/services?include=transactions' do
     subject { get json_api_request_path, params: json_api_request_query, headers: json_api_request_headers }
 

spec/requests/api/rest/customer/v1/transactions_controller_spec.rb

@@ -3,9 +3,15 @@
 RSpec.describe Api::Rest::Customer::V1::TransactionsController, type: :request do
   include_context :json_api_customer_v1_helpers, type: :transactions
 
-  let!(:service) { FactoryBot.create(:service, uuid: SecureRandom.uuid) }
+  let(:account) { create(:account, contractor: customer) }
+  let!(:service) { FactoryBot.create(:service, account:, uuid: SecureRandom.uuid) }
   let(:json_api_request_query) { { include: :service } }
 
+  before do
+    # other customer's service with transaction
+    FactoryBot.create(:service)
+  end
+
   describe 'GET /api/rest/customer/v1/transactions?include=service' do
     subject { get json_api_request_path, params: json_api_request_query, headers: json_api_request_headers }