From e1aee89be00d035c3630e2b1d55ed2ed34760126 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Sun, 12 Feb 2023 19:18:17 +0100
Subject: [PATCH] remove expired service connection notifications

---
 app/models/notification/service_token_expired.rb          | 4 ----
 app/models/notification/twitter_token_expired.rb          | 4 ----
 app/models/user/expired_service_connection.rb             | 5 -----
 app/models/user/expired_twitter_service_connection.rb     | 4 ----
 .../type/_expiredtwitterserviceconnection.html.haml       | 8 --------
 config/locales/views.en.yml                               | 4 ----
 ...044_remove_expired_service_connection_notifications.rb | 7 +++++++
 db/schema.rb                                              | 2 +-
 8 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 app/models/notification/service_token_expired.rb
 delete mode 100644 app/models/notification/twitter_token_expired.rb
 delete mode 100644 app/models/user/expired_service_connection.rb
 delete mode 100644 app/models/user/expired_twitter_service_connection.rb
 delete mode 100644 app/views/notifications/type/_expiredtwitterserviceconnection.html.haml
 create mode 100644 db/migrate/20230212181044_remove_expired_service_connection_notifications.rb

diff --git a/app/models/notification/service_token_expired.rb b/app/models/notification/service_token_expired.rb
deleted file mode 100644
index bc61a820..00000000
--- a/app/models/notification/service_token_expired.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Notification::ServiceTokenExpired < Notification
-end
diff --git a/app/models/notification/twitter_token_expired.rb b/app/models/notification/twitter_token_expired.rb
deleted file mode 100644
index 9ddb8447..00000000
--- a/app/models/notification/twitter_token_expired.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Notification::TwitterTokenExpired < Notification::ServiceTokenExpired
-end
diff --git a/app/models/user/expired_service_connection.rb b/app/models/user/expired_service_connection.rb
deleted file mode 100644
index 110dd896..00000000
--- a/app/models/user/expired_service_connection.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# stub model for notifying about expired service connections
-class User::ExpiredServiceConnection < User
-end
diff --git a/app/models/user/expired_twitter_service_connection.rb b/app/models/user/expired_twitter_service_connection.rb
deleted file mode 100644
index bb39250e..00000000
--- a/app/models/user/expired_twitter_service_connection.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class User::ExpiredTwitterServiceConnection < User::ExpiredServiceConnection
-end
diff --git a/app/views/notifications/type/_expiredtwitterserviceconnection.html.haml b/app/views/notifications/type/_expiredtwitterserviceconnection.html.haml
deleted file mode 100644
index fd941e2f..00000000
--- a/app/views/notifications/type/_expiredtwitterserviceconnection.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.d-flex.notification
-  .flex-shrink-0.notification__icon
-    %i.fa.fa-2x.fa-fw.fa-twitter
-  .flex-grow-1
-    %h6.notification__user
-      = t(".heading")
-    .notification__text
-      = t(".text_html", settings_sharing: link_to(t(".settings_services"), services_path))
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index ea82b1dc..6dfef2d3 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -359,10 +359,6 @@ en:
         heading: "Push notifications are failing to send to one of your devices."
         text_html: "Please check the %{settings_push} if you still want to be notified."
         settings_push: "push notification settings"
-      expiredtwitterserviceconnection:
-        heading: "Twitter connection expired"
-        text_html: "If you would like to continue automatically sharing your answers to Twitter, head to %{settings_sharing} and re-connect your account."
-        settings_services: "Sharing Settings"
   settings:
     account:
       email_confirm: "Currently awaiting confirmation for %{resource}"
diff --git a/db/migrate/20230212181044_remove_expired_service_connection_notifications.rb b/db/migrate/20230212181044_remove_expired_service_connection_notifications.rb
new file mode 100644
index 00000000..3f306f39
--- /dev/null
+++ b/db/migrate/20230212181044_remove_expired_service_connection_notifications.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveExpiredServiceConnectionNotifications < ActiveRecord::Migration[6.1]
+  def up = Notification.where(type: "Notification::ServiceTokenExpired").delete_all
+
+  def down = raise ActiveRecord::IrreversibleMigration
+end
diff --git a/db/schema.rb b/db/schema.rb
index 79160ab2..0d70a9eb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_05_162800) do
+ActiveRecord::Schema.define(version: 2023_02_12_181044) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"