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

---
 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, 53 insertions(+), 29 deletions(-)
 create mode 100644 app/workers/articles/rss_reader_worker.rb
 delete mode 100644 lib/tasks/fetch.rake
 create 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 ef971cb4b..026306f8c 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 386eb5c70..fba764b3e 100644
--- a/app/javascript/articles/components/SaveButton.jsx
+++ b/app/javascript/articles/components/SaveButton.jsx
@@ -38,7 +38,9 @@ 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 f7c2a406e..cf381d205 100644
--- a/app/services/rss_reader.rb
+++ b/app/services/rss_reader.rb
@@ -32,6 +32,7 @@ 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 0c1aa74ba..80462c02a 100644
--- a/app/views/admin/profile_fields/index.html.erb
+++ b/app/views/admin/profile_fields/index.html.erb
@@ -2,14 +2,13 @@
   <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" %>
@@ -43,14 +42,13 @@
                 <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
new file mode 100644
index 000000000..f464acb4c
--- /dev/null
+++ b/app/workers/articles/rss_reader_worker.rb
@@ -0,0 +1,12 @@
+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 7f1c3316e..5e8ef25e9 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -1,3 +1,6 @@
+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
deleted file mode 100644
index 09530d121..000000000
--- a/lib/tasks/fetch.rake
+++ /dev/null
@@ -1,7 +0,0 @@
-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
new file mode 100644
index 000000000..d8f814261
--- /dev/null
+++ b/spec/workers/articles/rss_reader_worker_spec.rb
@@ -0,0 +1,15 @@
+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