From b23374e737e1d96f2fc9b0b64e2d6ca1c0f6cd3d Mon Sep 17 00:00:00 2001
From: Molly Struve <mollylbs@gmail.com>
Date: Tue, 25 Aug 2020 14:57:33 -0500
Subject: [PATCH] [deploy] Revert "Refactor:Move RssReader Fetch Article task
 to Sidekiq (#9976)" (#9998)

---
 app/assets/stylesheets/internal/layout.scss   | 10 +++----
 .../articles/components/SaveButton.jsx        |  4 +--
 app/services/rss_reader.rb                    |  1 -
 app/views/admin/profile_fields/index.html.erb | 30 ++++++++++---------
 app/workers/articles/rss_reader_worker.rb     | 12 --------
 config/schedule.yml                           |  3 --
 lib/tasks/fetch.rake                          |  7 +++++
 .../articles/rss_reader_worker_spec.rb        | 15 ----------
 8 files changed, 29 insertions(+), 53 deletions(-)
 delete mode 100644 app/workers/articles/rss_reader_worker.rb
 create mode 100644 lib/tasks/fetch.rake
 delete mode 100644 spec/workers/articles/rss_reader_worker_spec.rb

diff --git a/app/assets/stylesheets/internal/layout.scss b/app/assets/stylesheets/internal/layout.scss
index 026306f8c..ef971cb4b 100644
--- a/app/assets/stylesheets/internal/layout.scss
+++ b/app/assets/stylesheets/internal/layout.scss
@@ -86,11 +86,11 @@ body {
 
 .site-config__required {
   background: #dc3545;
-  border-radius: 19px;
-  padding: 5px 15px;
-  color: white;
-  text-align: right;
-  margin-left: 10px;
+    border-radius: 19px;
+    padding: 5px 15px;
+    color: white;
+    text-align: right;
+    margin-left: 10px;
 }
 
 .site-config__label {
diff --git a/app/javascript/articles/components/SaveButton.jsx b/app/javascript/articles/components/SaveButton.jsx
index fba764b3e..386eb5c70 100644
--- a/app/javascript/articles/components/SaveButton.jsx
+++ b/app/javascript/articles/components/SaveButton.jsx
@@ -38,9 +38,7 @@ export class SaveButton extends Component {
         <button
           type="button"
           className={`crayons-btn crayons-btn--s ${
-            isBookmarked
-              ? 'crayons-btn--ghost-dimmed'
-              : 'crayons-btn--secondary'
+            isBookmarked ? 'crayons-btn--ghost-dimmed' : 'crayons-btn--secondary'
           }`}
           data-initial-feed
           data-reactable-id={article.id}
diff --git a/app/services/rss_reader.rb b/app/services/rss_reader.rb
index cf381d205..f7c2a406e 100644
--- a/app/services/rss_reader.rb
+++ b/app/services/rss_reader.rb
@@ -32,7 +32,6 @@ class RssReader
   def create_articles_for_user(user)
     user.update_column(:feed_fetched_at, Time.current)
     feed = fetch_rss(user.feed_url.strip)
-    return [] unless feed.url
 
     articles = []
 
diff --git a/app/views/admin/profile_fields/index.html.erb b/app/views/admin/profile_fields/index.html.erb
index 80462c02a..0c1aa74ba 100644
--- a/app/views/admin/profile_fields/index.html.erb
+++ b/app/views/admin/profile_fields/index.html.erb
@@ -2,13 +2,14 @@
   <article class="crayons-card grid p-6 mb-6 gap-1">
     <%= form_for [:admin, ProfileField.new], html: { class: "inline-form" } do |form| %>
       <%= render "group_form",
-                 form: form,
-                 select_option_tags: options_for_select(ProfileField.distinct.pluck(:group)),
-                 select_options: {
-                   include_blank: "Choose an existing group",
-                   class: "form-control selectpicker profile__group-dropdown"
-                 },
-                 toggle_text: "or create a new group" %>
+        form: form,
+        select_option_tags: options_for_select(ProfileField.distinct.pluck(:group)),
+        select_options: {
+          include_blank: "Choose an existing group",
+          class: "form-control selectpicker profile__group-dropdown"
+        },
+        toggle_text: "or create a new group"
+      %>
       <div class="form-group">
         <%= render "form", form: form %>
         <%= form.submit "Create New Profile Field", class: "btn btn-primary" %>
@@ -42,13 +43,14 @@
                 <div class="form-group grid p-6 mb-6 gap-1">
                   <%= form_for [:admin, field] do |form| %>
                     <%= render "group_form",
-                               form: form,
-                               select_option_tags: options_for_select(ProfileField.distinct.pluck(:group), selected: field[:group]),
-                               select_options: {
-                                 class: "form-control selectpicker profile__group-dropdown"
-                               },
-                               toggle_text: "or create a new group" %>
-                    <%= render "form", form: form %>
+                      form: form,
+                      select_option_tags: options_for_select(ProfileField.distinct.pluck(:group),  selected: field[:group]),
+                      select_options: {
+                        class: "form-control selectpicker profile__group-dropdown"
+                      },
+                      toggle_text: "or create a new group"
+                    %>
+                    <%= render "form", form: form  %>
                     <%= form.submit class: "btn btn-primary" %>
                   <% end %>
                   <%= button_to "Delete Profile Field", admin_profile_field_path(field), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-secondary" %>
diff --git a/app/workers/articles/rss_reader_worker.rb b/app/workers/articles/rss_reader_worker.rb
deleted file mode 100644
index f464acb4c..000000000
--- a/app/workers/articles/rss_reader_worker.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Articles
-  class RssReaderWorker
-    include Sidekiq::Worker
-
-    sidekiq_options queue: :medium_priority, retry: 10
-
-    def perform
-      # don't force fetch. Fetch "random" subset instead of all of them.
-      RssReader.get_all_articles(force: false)
-    end
-  end
-end
diff --git a/config/schedule.yml b/config/schedule.yml
index 5e8ef25e9..7f1c3316e 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -1,6 +1,3 @@
-fetch_all_rss:
-  cron: "20 * * * *" # every hour, 20 min after the hour
-  class: "Articles::RssReaderWorker"
 log_worker_queue_stats:
   cron: "*/10 * * * *" # every 10 minutes
   class: "Metrics::RecordBackgroundQueueStatsWorker"
diff --git a/lib/tasks/fetch.rake b/lib/tasks/fetch.rake
new file mode 100644
index 000000000..09530d121
--- /dev/null
+++ b/lib/tasks/fetch.rake
@@ -0,0 +1,7 @@
+desc "This task is called by the Heroku scheduler add-on"
+
+task fetch_all_rss: :environment do
+  Rails.application.eager_load!
+
+  RssReader.get_all_articles(force: false) # don't force fetch. Fetch "random" subset instead of all of them.
+end
diff --git a/spec/workers/articles/rss_reader_worker_spec.rb b/spec/workers/articles/rss_reader_worker_spec.rb
deleted file mode 100644
index d8f814261..000000000
--- a/spec/workers/articles/rss_reader_worker_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Articles::RssReaderWorker, type: :worker do
-  let(:worker) { subject }
-
-  include_examples "#enqueues_on_correct_queue", "medium_priority"
-
-  describe "#perform" do
-    it "updates RssReader articles" do
-      allow(RssReader).to receive(:get_all_articles)
-      worker.perform
-      expect(RssReader).to have_received(:get_all_articles).with(force: false)
-    end
-  end
-end