the object that owns the data should operate on the date.

2 files changed, 6 insertions, 3 deletions

diff --git a/app/models/license.rb b/app/models/license.rb
index b7e1dff..d207fee 100644
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -8,10 +8,14 @@ class License < ActiveRecord::Base
     LicenseStatus.status_for(self)
   end
 
+  def active_on?(date)
+    issued_at < date && expired_at > date
+  end
+
   def self.most_recent(page: 1, per_page: 10)
     offset = (page - 1) * per_page
     offset = offset >= 0 ? offset : 0
-    License.order(created_at: :desc).offset(offset).limit(per_page)
+    order(created_at: :desc).offset(offset).limit(per_page)
   end
 
   def self.township(township)
diff --git a/app/models/license_status/active.rb b/app/models/license_status/active.rb
index 512fff9..63a9b00 100644
--- a/app/models/license_status/active.rb
+++ b/app/models/license_status/active.rb
@@ -9,8 +9,7 @@ class LicenseStatus::Active
   end
 
   def best_represents?(license)
-    now = DateTime.now
-    license.issued_at < now && license.expired_at > now
+    license.active_on?(DateTime.now)
   end
 
   def to_s