Merge pull request #657 from ChicagoWorldcon/stag-diff-dropped-people

ignore declined to drop (and vice versa) in the drop report (2.0.1)
PlanoramaEvents · Aug 19, 2022 · 10f7999 · 10f7999
2 parents 209b8f0 + 2fb45cf
commit 10f7999
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/services/change_service.rb b/app/services/change_service.rb
@@ -21,6 +21,9 @@ def self.dropped_people(from:, to: nil)
     changes = get_changes(clazz: Audit::PersonVersion, type: Person, from: from, to: to)
     changes.each do |id, change|
       if change[:changes]['con_state'] && ['declined', 'rejected'].include?(change[:changes]['con_state'][1] )
+        # do not count a "dropped" state to another dropped state
+        next if ['declined', 'rejected'].include?(change[:changes]['con_state'][0]
+
         res.append [change[:object].published_name]
       end
     end