Merge pull request #1450 from PRX/fix/replace_apple_config

Allow the key or apple config to be added if missing after create

Author: kookster

app/controllers/feeds_controller.rb

@@ -9,7 +9,7 @@ def index
 
   # GET /feeds/1
   def show
-    @feed.assign_attributes(feed_params)
+    init_config
     authorize @feed
     @apple_show_options = get_apple_show_options(@feed)
   end
@@ -33,20 +33,15 @@ def get_apple_show_options(feed)
 
   def new_apple
     @feed = Feeds::AppleSubscription.new(podcast: @podcast, private: true)
-    @feed.build_apple_config
-    @feed.apple_config.build_key
     authorize @feed
-
-    @feed.assign_attributes(feed_params)
+    init_config
     render "new"
   end
 
   def new_megaphone
     @feed = Feeds::MegaphoneFeed.new(podcast: @podcast, private: true)
-    @feed.build_megaphone_config
     authorize @feed
-
-    @feed.assign_attributes(feed_params)
+    init_config
     render "new"
   end
 
@@ -109,6 +104,16 @@ def destroy
 
   private
 
+  def init_config
+    @feed.assign_attributes(feed_params)
+    if @feed.is_a? Feeds::AppleSubscription
+      @feed.build_apple_config unless @feed.apple_config
+      @feed.apple_config.build_key unless @feed.apple_config.key
+    elsif @feed.is_a? Feeds::MegaphoneFeed
+      @feed.megaphone_config || @feed.build_megaphone_config
+    end
+  end
+
   def set_podcast
     @podcast =
       if @feed