From 78941e506822354f965014a4d69ef36bef6f3aec Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 1 May 2025 09:58:23 +0200
Subject: [PATCH] Address PR feedback

---
 app/models/card/closeable.rb              | 11 +++++------
 app/views/cards/display/_preview.html.erb |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index 5b7ab98af..2fec6ba6f 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -2,7 +2,7 @@ module Card::Closeable
   extend ActiveSupport::Concern
 
   AUTO_CLOSE_AFTER = 30.days
-  AUTO_CLOSE_REMINDER = 7.days
+  AUTO_CLOSE_REMINDER_BEFORE = 7.days
 
   included do
     has_one :closure, dependent: :destroy
@@ -26,13 +26,12 @@ module Card::Closeable
     last_active_at + AUTO_CLOSE_AFTER if last_active_at
   end
 
-  def auto_close_days_until
-    return false unless auto_close_at
-    (auto_close_at.to_date - Date.today).to_i
+  def days_until_close
+    (auto_close_at.to_date - Date.current).to_i if auto_close_at
   end
 
-  def auto_close_remind?
-    auto_close_days_until <= AUTO_CLOSE_REMINDER / 1.day
+  def closing_soon?
+    considering? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE
   end
 
   def closed?
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 0b7c8ebcf..cdfe91764 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -23,8 +23,8 @@
 
     <%= render "cards/display/common/background", card: card %>
 
-    <% if card.considering? && card.auto_close_remind? %>
-      <%= render "cards/display/preview/badge", label: "Closes in", days: card.auto_close_days_until %>
+    <% if card.closing_soon? %>
+      <%= render "cards/display/preview/badge", label: "Closes in", days: card.days_until_close %>
     <% end %>
   <% end %>
 <% end %>