diff --git a/app/controllers/repp/v1/accounts_controller.rb b/app/controllers/repp/v1/accounts_controller.rb index 89c14808f..1e0fde466 100644 --- a/app/controllers/repp/v1/accounts_controller.rb +++ b/app/controllers/repp/v1/accounts_controller.rb @@ -4,8 +4,28 @@ module Repp def balance resp = { balance: current_user.registrar.cash_account.balance, currency: current_user.registrar.cash_account.currency } + resp[:transactions] = activities if params[:detailed] == 'true' render_success(data: resp) end + + def activities + arr = [] + registrar_activities.each do |a| + arr << { created_at: a.created_at, description: a.description, + type: a.activity_type == 'add_credit' ? 'credit' : 'debit', + sum: a.sum, balance: a.new_balance } + end + + arr + end + + def registrar_activities + activities = current_user.registrar.cash_account.activities.order(created_at: :desc) + activities = activities.where('created_at >= ?', params[:from]) if params[:from] + activities = activities.where('created_at <= ?', params[:until]) if params[:until] + + activities + end end end end diff --git a/app/models/account_activity.rb b/app/models/account_activity.rb index d8e6be4d4..9df64209a 100644 --- a/app/models/account_activity.rb +++ b/app/models/account_activity.rb @@ -13,6 +13,9 @@ class AccountActivity < ApplicationRecord def update_balance account.balance += sum account.save + + self.new_balance = account.balance + save end class << self diff --git a/app/views/registrar/account_activities/index.html.erb b/app/views/registrar/account_activities/index.html.erb index c5eaf2063..aefcdd47f 100644 --- a/app/views/registrar/account_activities/index.html.erb +++ b/app/views/registrar/account_activities/index.html.erb @@ -14,7 +14,7 @@
+ | <%= sort_link(@q, 'description') %> | @@ -26,6 +26,9 @@ | <%= sort_link(@q, 'sum') %> | ++ <%= sort_link(@q, 'new_balance', 'New balance') %> + | <%= s %> | ++ <%= x.new_balance.present? ? "#{currency(x.new_balance)} EUR" : 'N/A' %> + | <% end %> diff --git a/db/migrate/20210215101019_add_new_balance_to_account_activity.rb b/db/migrate/20210215101019_add_new_balance_to_account_activity.rb new file mode 100644 index 000000000..64c829833 --- /dev/null +++ b/db/migrate/20210215101019_add_new_balance_to_account_activity.rb @@ -0,0 +1,5 @@ +class AddNewBalanceToAccountActivity < ActiveRecord::Migration[6.0] + def change + add_column :account_activities, :new_balance, :decimal, precision: 10, scale: 2, null: true + end +end diff --git a/db/structure.sql b/db/structure.sql index acf134a55..de2243597 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -226,7 +226,8 @@ CREATE TABLE public.account_activities ( creator_str character varying, updator_str character varying, activity_type character varying, - price_id integer + price_id integer, + new_balance numeric(10,2) ); @@ -4959,6 +4960,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200908131554'), ('20200910085157'), ('20200910102028'), -('20200916125326'); +('20200916125326'), +('20210215101019'); diff --git a/test/integration/repp/v1/accounts/balance_test.rb b/test/integration/repp/v1/accounts/balance_test.rb index 785e0aee8..4b711bd05 100644 --- a/test/integration/repp/v1/accounts/balance_test.rb +++ b/test/integration/repp/v1/accounts/balance_test.rb @@ -2,6 +2,7 @@ require 'test_helper' class ReppV1BalanceTest < ActionDispatch::IntegrationTest def setup + travel_to Time.zone.parse('2010-07-05') @registrar = users(:api_bestnames) token = Base64.encode64("#{@registrar.username}:#{@registrar.plain_text_password}") token = "Basic #{token}" @@ -19,4 +20,32 @@ class ReppV1BalanceTest < ActionDispatch::IntegrationTest assert_equal @registrar.registrar.cash_account.balance.to_s, json[:data][:balance] assert_equal @registrar.registrar.cash_account.currency, json[:data][:currency] end + + def test_can_query_balance_with_details + # Create new billable action to get activity + post "/repp/v1/domains/renew/bulk", headers: @auth_headers, params: { domains: ['shop.test'], renew_period: '1y' } + + started_from = "2010-07-05" + end_to = DateTime.current.to_date.to_s(:db) + + get "/repp/v1/accounts/balance?detailed=true", headers: @auth_headers + json = JSON.parse(response.body, symbolize_names: true) + + assert_response :ok + assert_equal 1000, json[:code] + assert_equal 'Command completed successfully', json[:message] + assert_equal @registrar.registrar.cash_account.balance.to_s, json[:data][:balance] + assert_equal @registrar.registrar.cash_account.currency, json[:data][:currency] + entry = json[:data][:transactions].last + assert_equal @registrar.registrar.cash_account.account_activities.last.created_at, entry[:created_at] + assert_equal @registrar.registrar.cash_account.account_activities.last.description, entry[:description] + assert_equal 'debit', entry[:type] + assert_equal @registrar.registrar.cash_account.account_activities.last.sum.to_s, entry[:sum] + assert_equal @registrar.registrar.cash_account.account_activities.last.new_balance.to_s, entry[:balance] + + json[:data][:transactions].map do |trans| + assert trans[:created_at].to_date.to_s(:db) >= started_from + assert trans[:created_at].to_date.to_s(:db) >= end_to + end + end end
---|