From 4fad3416c0f19cb0115f68fdbcbaffa1b6a992f3 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Fri, 11 Sep 2015 12:07:39 +0200
Subject: [PATCH] fix general retartedness on my side

---
 app/controllers/concerns/data_table.rb         | 7 +++----
 app/controllers/concerns/transactions_query.rb | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/concerns/data_table.rb b/app/controllers/concerns/data_table.rb
index 6498fc1..5a3a74e 100644
--- a/app/controllers/concerns/data_table.rb
+++ b/app/controllers/concerns/data_table.rb
@@ -31,10 +31,9 @@ class DataTable
   end
 
   def query
-    return @query if @query # Do not build query twice
-    @query = @transactions.query
-    @query.where(predicate) if predicate
-    @query
+    q = @transactions.query
+    q.where(predicate) if predicate
+    q
   end
 
   def predicate
diff --git a/app/controllers/concerns/transactions_query.rb b/app/controllers/concerns/transactions_query.rb
index 3276d57..bd87edc 100644
--- a/app/controllers/concerns/transactions_query.rb
+++ b/app/controllers/concerns/transactions_query.rb
@@ -60,10 +60,10 @@ class TransactionsQuery
   def incoming
     @user.incoming_transactions.arel
     @transactions
-      .where(@transactions[:debtor_id].eq(@user.id))
+      .where(@transactions[:creditor_id].eq(@user.id))
       .project(
         @transactions[:amount],
-        @transactions[:creditor_id].as('peer_id'),
+        @transactions[:debtor_id].as('peer_id'),
         @transactions[:created_at].as('time'),
         @transactions[:issuer_id],
         @transactions[:issuer_type],