Improve determining archivable contacts

internetee · Sep 3, 2020 · 6707ca1 · 6707ca1
1 parent 821c52a
commit 6707ca1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/models/concerns/contact/archivable.rb b/app/models/concerns/contact/archivable.rb
@@ -27,9 +27,11 @@ def archive
       private
 
       def inactive?
-        return (created_at <= inactivity_period.ago) unless DomainVersion.was_contact_linked?(id)
+        if DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
+          return true
+        end
 
-        DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
+        DomainVersion.was_contact_linked?(id) ? false : created_at <= inactivity_period.ago
       end
     end
   end