Refactor Page upsert methods

Author: rossta

app/jobs/pages/batch_upsert_pages_job.rb

@@ -3,7 +3,7 @@ class BatchUpsertPagesJob < ApplicationJob
     queue_as :default
 
     def perform(limit: nil)
-      Page.upsert_from_sitepress!(limit: limit)
+      Page.upsert_collection_from_sitepress!(limit: limit)
     end
   end
 end

app/models/page.rb

@@ -44,18 +44,22 @@ def self.as_published_articles
     SitepressArticle.take_published(all.map { |page| SitepressArticle.new(page.resource) })
   end
 
-  def self.upsert_from_sitepress!(limit: nil)
+  def self.upsert_collection_from_sitepress!(limit: nil)
     # Targeting specific Sitepress models until we have a better way to make
     # Page model aware of published state
     enum = [
       SitepressArticle,
       SitepressSlashPage
     ].lazy.flat_map { |model| model.all.resources }
 
-    enum = enum.filter do |sitepress_resource|
-      Page.find_by(request_path: sitepress_resource.request_path).nil?
-    end.map do |sitepress_resource|
-      Page.create!(request_path: sitepress_resource.request_path)
+    if limit
+      enum = enum.filter do |sitepress_resource|
+        Page.find_by(request_path: sitepress_resource.request_path).nil?
+      end
+    end
+
+    enum = enum.map do |sitepress_resource|
+      upsert_page_from_sitepress!(sitepress_resource)
     end
 
     if limit

spec/system/articles_spec.rb

@@ -8,7 +8,7 @@
   end
 
   it "displays a single article" do
-    Page.upsert_from_sitepress!(limit: 1)
+    Page.upsert_collection_from_sitepress!(limit: 1)
 
     article = Page.first
     article.topics << FactoryBot.create_list(:topic, 2, :approved)

spec/system/topics_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe "Topics", type: :system do
   it "displays the topics and provides navigation links" do
-    Page.upsert_from_sitepress!(limit: 3)
+    Page.upsert_collection_from_sitepress!(limit: 3)
 
     expect(Page.count).to eq(3)