From 6707ca17bfd8a26e9e08e4c3c9d6b10fdb095ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 3 Sep 2020 12:22:59 +0300 Subject: [PATCH] Improve determining archivable contacts --- app/models/concerns/contact/archivable.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/contact/archivable.rb b/app/models/concerns/contact/archivable.rb index 1968ed9f1..185290339 100644 --- a/app/models/concerns/contact/archivable.rb +++ b/app/models/concerns/contact/archivable.rb @@ -27,9 +27,11 @@ module Concerns 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