From 818869d249d4e5ebdf1945f454968a0ebcd8c78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Mon, 21 Sep 2020 11:46:42 +0300
Subject: [PATCH] Remove incidents count from bounced mails

---
 app/views/admin/bounced_mail_addresses/show.html.erb     | 5 -----
 ...84356_remove_incidents_from_bounced_mail_addresses.rb | 9 +++++++++
 db/structure.sql                                         | 4 ++--
 test/fixtures/bounced_mail_addresses.yml                 | 1 -
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20200921084356_remove_incidents_from_bounced_mail_addresses.rb

diff --git a/app/views/admin/bounced_mail_addresses/show.html.erb b/app/views/admin/bounced_mail_addresses/show.html.erb
index 9b0b5919f..98eeabcd2 100644
--- a/app/views/admin/bounced_mail_addresses/show.html.erb
+++ b/app/views/admin/bounced_mail_addresses/show.html.erb
@@ -7,11 +7,6 @@
   <%= @bounced_mail_address.bounce_reason %>
 </p>
 
-<p>
-  <strong>Incidents:</strong>
-  <%= @bounced_mail_address.incidents %>
-</p>
-
 <p>
   <strong>Bounced recipient JSON:</strong>
   <pre><%= JSON.pretty_generate(@bounced_mail_address.recipient_json) %></pre>
diff --git a/db/migrate/20200921084356_remove_incidents_from_bounced_mail_addresses.rb b/db/migrate/20200921084356_remove_incidents_from_bounced_mail_addresses.rb
new file mode 100644
index 000000000..0704795df
--- /dev/null
+++ b/db/migrate/20200921084356_remove_incidents_from_bounced_mail_addresses.rb
@@ -0,0 +1,9 @@
+class RemoveIncidentsFromBouncedMailAddresses < ActiveRecord::Migration[6.0]
+  def up
+    remove_column :bounced_mail_addresses, :incidents
+  end
+
+  def down
+    add_column :bounced_mail_addresses, :incidents, :integer, null: false, default: 1
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 23669c665..74e784408 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -483,7 +483,6 @@ CREATE TABLE public.bounced_mail_addresses (
     id bigint NOT NULL,
     email character varying NOT NULL,
     bounce_reason character varying NOT NULL,
-    incidents integer DEFAULT 1 NOT NULL,
     response_json jsonb,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
@@ -4958,6 +4957,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200910085157'),
 ('20200910102028'),
 ('20200916125326'),
-('20200917104213');
+('20200917104213'),
+('20200921084356');
 
 
diff --git a/test/fixtures/bounced_mail_addresses.yml b/test/fixtures/bounced_mail_addresses.yml
index 1261f1429..345b2ef22 100644
--- a/test/fixtures/bounced_mail_addresses.yml
+++ b/test/fixtures/bounced_mail_addresses.yml
@@ -1,7 +1,6 @@
 one:
   email: bounced@registry.test
   bounce_reason: failed (5.1.1 smtp; 550 5.1.1 user unknown)
-  incidents: 1
   recipient_json: {
     "action": "failed",
     "status": "5.1.1",