From 7a1035742d62aed89a1b3430d5e37b133168f2f9 Mon Sep 17 00:00:00 2001
From: YarekTenko <yarektenko@gmail.com>
Date: Thu, 23 Mar 2017 15:44:05 -0700
Subject: [PATCH 1/2] Add ability to resolve debts

---
 app/controllers/debts_controller.rb |  7 ++++-
 app/views/debts/_debt.html.erb      | 43 +++++++++++++++++------------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/controllers/debts_controller.rb b/app/controllers/debts_controller.rb
index 97ad838..ec8324d 100644
--- a/app/controllers/debts_controller.rb
+++ b/app/controllers/debts_controller.rb
@@ -3,5 +3,10 @@ def index
     @debts = current_user.debts
   end
 
-  def update; end
+  def update
+    @debt = Debt.find(params[:id])
+    @bet = Bet.find(params[:bet_id])
+    @debt.update(payment_date: DateTime.current)
+    redirect_to @bet
+  end
 end
diff --git a/app/views/debts/_debt.html.erb b/app/views/debts/_debt.html.erb
index d4166e9..71343ea 100644
--- a/app/views/debts/_debt.html.erb
+++ b/app/views/debts/_debt.html.erb
@@ -1,23 +1,32 @@
 <tbody class="thead-default">
   <tr>
-    <% if current_user == debt.debtor %>
-      <td class="col-md-3 text-danger"><h4>Me</h4></td>
-    <% else %>
-      <td class="col-md-3 text-muted"><%= debt.debtor.username %></td>
-    <% end %>
+    <td class="col-md-3"><%= debt.debtor.username %></td>
     <td class="col-md-3">
-      <span class="debt-amount">$<%= debt.amount %></span>
-      <div><i class="underarrow text-danger fa fa-long-arrow-right"></i></div>
+      <span>$<%= debt.amount %></span>
+      <span><i class="fa fa-long-arrow-right"></i></span>
     </td>
-    <td class="col-md-3 text-muted"><%= debt.creditor.username %></td>
-    <% if debt.payment_date.nil? %>
-      <td class="col-md-3 text-danger">
-        Not paid
-      </td>
-    <% else %>
-      <td class="col-md-3 text-success">
-        Paid on <%= debt.payment_date %>
-      </td>
-    <% end %>
+    <td class="col-md-3">
+      <% if debt.creditor == current_user %>
+        <h4 class="text-primary">Me</h4>
+      <% else %>
+        <%= debt.creditor.username %>
+      <% end %>
+    </td>
+      <% if debt.creditor == current_user && debt.payment_date.nil?%>
+        <td class="col-md-3">
+          <%= link_to 'Resolve', user_debt_path(debt.debtor, debt, bet_id: @bet), method: :patch,
+                class: 'btn btn-primary', role: 'button' %>
+        </td>
+      <% else %>
+        <% if debt.payment_date.nil? %>
+          <td class="col-md-3 text-danger">
+            Not paid
+          </td>
+        <% else %>
+          <td class="col-md-3 text-success">
+            Paid on <%= debt.payment_date.strftime('%A, %B %d %Y, %l:%M %P') %>
+          </td>
+        <% end %>
+      <% end %>
   </tr>
 </tbody>

From 85716f225a143160b4c21fa44321e66d482075d1 Mon Sep 17 00:00:00 2001
From: YarekTenko <yarektenko@gmail.com>
Date: Fri, 24 Mar 2017 11:00:25 -0700
Subject: [PATCH 2/2] Add rspec for DebtsController

---
 spec/controllers/debts_controller_spec.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/spec/controllers/debts_controller_spec.rb b/spec/controllers/debts_controller_spec.rb
index 1ebbca2..8e6de8d 100644
--- a/spec/controllers/debts_controller_spec.rb
+++ b/spec/controllers/debts_controller_spec.rb
@@ -12,5 +12,28 @@
   end
 
   describe('PATCH #update') do
+    subject(:patch_update) do
+      patch :update, params: { user_id: debtor.id, bet_id: bet.id,
+                               id: debt.id }
+    end
+    let(:debtor) do
+      User.create(username: 'Pete', email: 'pete@mail.com',
+                  password: '321')
+    end
+    let(:creditor) do
+      User.create(username: 'Jack', email: 'jack@mail.com',
+                  password: 'j4cK')
+    end
+    let(:bet) do
+      Bet.create(description: 'Test bet', status: '1', creator_id: creditor.id,
+                 expires_at: DateTime.tomorrow)
+    end
+    let(:debt) do
+      Debt.create(debtor: debtor, creditor: creditor, amount: 50, bet: bet)
+    end
+    it { is_expected.to redirect_to bet }
+    it 'changes the payment date for the debt' do
+      expect { patch_update }.to change { debt.reload.payment_date }.from(nil)
+    end
   end
 end