borutus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed73fe6e709a22d33f2a11f0360c57c0df95b940fe3b67ba97ea22171b941fc
-  data.tar.gz: 23ededc317f6e6373938e23bc4225bb96685fcb4bc240474147ed951f2b7d449
+  metadata.gz: f0c526c5aff61f0ae1cf18cb178c35f83a21e41115084095c80c7f9a7062e34e
+  data.tar.gz: 3b482a97d3b010795f27ec03ef91015d2b8540c36185d394c2e92648ea297167
 SHA512:
-  metadata.gz: 9eed73e765fbac8b03d41792381c8ced5c8c6e97dec7351ad52fed8c4f6d6aaeb8cf06744fff475590941d5f85050aebe8fa7afb40cfb4c67a3a4edd3ef2d879
-  data.tar.gz: 3935d58c029083d95125f2e2d5aed927b718c16c6d457d232f86434b2ac4c968c6d287df9e4c0c5781eb74b72c6b2e894b965b5c2d2a70b7d3fab6a91d4e1ad4
+  metadata.gz: 1d306a22f425827597905f4bdc519fde1c65830b9d011cebc12191adde8b39c864b1e410ac50ccb8f7c91052e3f90864efef0829b445fcccd944258000285f92
+  data.tar.gz: 44ec323985e18ac5f3b98d3a437da159557559188765366c04f00c31c1b8bafd78953fcd6fce62d4c3d544b7e0448d3fec584c3670d882f33d4ba03d0791f556

data/app/models/borutus/account.rb

@@ -53,25 +53,21 @@ module Borutus
           %{ SUM("borutus_amounts".amount) AS amount }
         ).group(:entry_id, :id)
 
-        select_statement = if account.normal_credit_balance
-                             %{ COALESCE("credit_table"."amount", 0) - coalesce("debit_table"."amount", 0) }
-                           else
-                             %{ COALESCE("debit_table"."amount", 0) - coalesce("credit_table"."amount", 0) }
-                           end
+        sum_statement = if account.normal_credit_balance
+                          %{ COALESCE("credit_table"."amount", 0) - COALESCE("debit_table"."amount", 0) }
+                        else
+                          %{ COALESCE("debit_table"."amount", 0) - COALESCE("credit_table"."amount", 0) }
+                        end
 
         joins(%{
           LEFT OUTER JOIN (#{credit_table.to_sql}) AS "credit_table" ON "credit_table".entry_id = "borutus_entries".id
           LEFT OUTER JOIN (#{debit_table.to_sql}) AS "debit_table" ON "debit_table".entry_id = "borutus_entries".id
         }).select(%{
           "borutus_entries".*,
-          SUM(#{select_statement}) OVER(ORDER BY "borutus_entries"."created_at") AS balance
-        }).group(
-          :id,
-          %{
-            "debit_table".amount,
-            "credit_table".amount
-          }
-        ).order(created_at: :asc)
+          SUM(#{sum_statement}) OVER(ORDER BY "borutus_entries"."created_at") AS balance,
+          #{sum_statement} AS change_amount
+        }).group(:id, %{ "debit_table".amount, "credit_table".amount })
+          .order(created_at: :asc)
       end
     end
     has_many :credit_entries, :through => :credit_amounts, :source => :entry, :class_name => 'Borutus::Entry'

data/lib/borutus/version.rb

@@ -1,3 +1,3 @@
 module Borutus
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/models/account_spec.rb

@@ -58,7 +58,7 @@ module Borutus
         })
       end
 
-      it "returns entries for only the account with a balance column" do
+      it "returns entries for only the account with a balance and change_amount columns" do
         entry_1.save
         entry_2.save
         entry_3.save
@@ -66,15 +66,21 @@ module Borutus
         receivable_entries = accounts_receivable.entries.with_running_balance
         expect(receivable_entries.to_a.count).to eq 3
         expect(receivable_entries.first.balance).to eq 50 # inital 50
+        expect(receivable_entries.first.change_amount).to eq 50 # inital 50
         expect(receivable_entries.second.balance).to eq 20 # deduct 30 due to entry_2
+        expect(receivable_entries.second.change_amount).to eq -30 # deduct 30 due to entry_2
         expect(receivable_entries.last.balance).to eq 5 # deduct 5 due to entry_3
+        expect(receivable_entries.last.change_amount).to eq -15 # deduct 5 due to entry_3
 
         payable_entries = sales_tax_payable.entries.with_running_balance
           .order(created_at: :asc)
         expect(payable_entries.to_a.count).to eq 3
         expect(payable_entries.first.balance).to eq 5
+        expect(payable_entries.first.change_amount).to eq 5
         expect(payable_entries.second.balance).to eq 0 # deduct 5 due to entry_2
+        expect(payable_entries.second.change_amount).to eq -5
         expect(payable_entries.last.balance).to eq -15 # deduct 15 due to entry_3
+        expect(payable_entries.last.change_amount).to eq -15
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borutus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ramon Tayag