SRCH-2260 fix affiliate rss feed urls (#745)

* SRCH-2260 Update affiliate.rss_feed_urls for MySQL 5.7
GSA · Jul 6, 2021 · ebbfb6d · ebbfb6d
1 parent d21539b
commit ebbfb6d
Show file tree

Hide file tree

Showing 8 changed files with 199 additions and 177 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,7 @@ executors:
         environment:
           RAILS_ENV: test
 
-      - image: circleci/mysql:5.6
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_HOST: "%"

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -25,6 +25,9 @@ Metrics/BlockLength:
     # Exclude ActiveScaffold-based controllers
     - app/controllers/admin/**/*
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/LambdaCall:
   Exclude:
     # Exclude files relying on Jbuilder DSL

diff --git a/app/controllers/sites/rss_feeds_controller.rb b/app/controllers/sites/rss_feeds_controller.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class Sites::RssFeedsController < Sites::SetupSiteController
   include ActionView::Helpers::TextHelper
   before_action :setup_rss_feed, only: [:show, :edit, :update]
   before_action :setup_non_managed_rss_feed, only: [:destroy]
 
   def index
-    @rss_feeds = @site.rss_feeds
+    @rss_feeds = @site.rss_feeds.order(:name)
   end
 
   def new
@@ -23,30 +25,27 @@ def create
       assign_rss_feed_urls(rss_feed_params[:rss_feed_urls_attributes])
       if @rss_feed.save
         redirect_to site_rss_feeds_path(@site),
-                    flash: { success: "You have added #{@rss_feed.name} to this site." }
+          flash: { success: "You have added #{@rss_feed.name} to this site." }
       else
         build_url
         render action: :new
       end
     end
   end
 
-  def show
-  end
+  def show; end
 
   def edit
     build_url
   end
 
   def update
     RssFeed.transaction do
-      @rss_feed.assign_attributes rss_feed_params.except(:rss_feed_urls_attributes)
-      unless @rss_feed.is_managed?
-        assign_rss_feed_urls(rss_feed_params[:rss_feed_urls_attributes])
-      end
+      @rss_feed.assign_attributes(rss_feed_params.except(:rss_feed_urls_attributes))
+      assign_rss_feed_urls(rss_feed_params[:rss_feed_urls_attributes]) unless @rss_feed.is_managed?
       if @rss_feed.save
         redirect_to site_rss_feeds_path(@site),
-                    flash: { success: "You have updated #{@rss_feed.name}." }
+          flash: { success: "You have updated #{@rss_feed.name}." }
       else
         build_url
         render action: :edit
@@ -57,7 +56,7 @@ def update
   def destroy
     @rss_feed.destroy
     redirect_to site_rss_feeds_path(@site),
-                flash: { success: "You have removed #{@rss_feed.name} from this site." }
+      flash: { success: "You have removed #{@rss_feed.name} from this site." }
   end
 
   private
@@ -74,7 +73,8 @@ def assign_rss_feed_urls(attributes)
     rss_feed_urls_attributes.each_value do |url_attributes|
       url = url_attributes[:url]
       next if url.blank?
-      rss_feed_url = RssFeedUrl.rss_feed_owned_by_affiliate.find_existing_or_initialize url
+
+      rss_feed_url = RssFeedUrl.rss_feed_owned_by_affiliate.find_existing_or_initialize(url)
       if rss_feed_url.new_record?
         new_urls << rss_feed_url.url
       else
@@ -89,7 +89,7 @@ def assign_rss_feed_urls(attributes)
   end
 
   def setup_rss_feed
-    @rss_feed = @site.rss_feeds.find_by_id(params[:id])
+    @rss_feed = @site.rss_feeds.find_by(id: params[:id])
     redirect_to site_rss_feeds_path(@site) unless @rss_feed
   end
 
@@ -100,7 +100,7 @@ def rss_feed_params
   end
 
   def setup_non_managed_rss_feed
-    @rss_feed = @site.rss_feeds.non_managed.find_by_id(params[:id])
+    @rss_feed = @site.rss_feeds.non_managed.find_by(id: params[:id])
     redirect_to site_rss_feeds_path(@site) unless @rss_feed
   end
 end