Apple Delegated Delivery UI updates

app/controllers/feeds_controller.rb

@@ -9,8 +9,9 @@ def index
 
   # GET /feeds/1
   def show
-    @feed.assign_attributes(feed_params_with_apple)
+    @feed.assign_attributes(feed_params)
     authorize @feed
+    @apple_show_options = get_apple_show_options(@feed)
   end
 
   # GET /feeds/new
@@ -22,19 +23,25 @@ def new
     @feed.clear_attribute_changes(%i[file_name podcast_id private slug])
   end
 
+  def get_apple_show_options(feed)
+    if !feed.edit_locked? && feed.apple? && feed.apple_show_id.blank? && feed.apple_config
+      feed.apple_show_options
+    end
+  end
+
   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_with_apple)
+    @feed.assign_attributes(feed_params)
     render "new"
   end
 
   # POST /feeds
   def create
-    @feed = @podcast.feeds.new(feed_params_with_apple)
+    @feed = @podcast.feeds.new(feed_params)
     @feed.slug = "" if @feed.slug.nil?
     authorize @feed
 
@@ -114,10 +121,6 @@ def feed_params
     params.fetch(:feed, {}).permit(:slug).merge(nilified_feed_params)
   end
 
-  def feed_params_with_apple
-    params.fetch(:feed, {}).permit(:slug).merge(nilified_feed_params).merge(apple_params)
-  end
-
   def nilified_feed_params
     nilify params.fetch(:feed, {}).permit(
       :lock_version,
@@ -144,20 +147,13 @@ def nilified_feed_params
       :paid,
       :sonic_id,
       :type,
+      :apple_show_id,
       itunes_category: [],
       itunes_subcategory: [],
       feed_tokens_attributes: %i[id label token _destroy],
       feed_images_attributes: %i[id original_url size alt_text caption credit _destroy _retry],
-      itunes_images_attributes: %i[id original_url size alt_text caption credit _destroy _retry]
-    )
-  end
-
-  def apple_params
-    nilify params.fetch(:feed, {}).permit(
-      apple_config_attributes: {
-        id: :id,
-        key_attributes: %i[id provider_id key_id key_pem_b64]
-      }
+      itunes_images_attributes: %i[id original_url size alt_text caption credit _destroy _retry],
+      apple_config_attributes: [:id, :publish_enabled, :sync_blocks_rss, {key_attributes: %i[id provider_id key_id key_pem_b64]}]
     )
   end
 end

app/models/apple/show.rb

@@ -8,18 +8,29 @@ class Show
       :private_feed,
       :api
 
+    def self.apple_shows_json(api)
+      api.get_paged_collection("shows")
+    end
+
     def self.apple_episode_json(api, show_id)
       api.get_paged_collection("shows/#{show_id}/episodes")
     end
 
     def self.connect_existing(apple_show_id, apple_config)
-      api = Apple::Api.from_apple_config(apple_config)
+      if (sl = SyncLog.find_by(feeder_id: apple_config.public_feed.id, feeder_type: :feeds))
+        if apple_show_id.blank?
+          sl.destroy!
+        elsif sl.external_id != apple_show_id
+          sl.update!(external_id: apple_show_id)
+        end
+      end
 
       SyncLog.log!(feeder_id: apple_config.public_feed.id,
         feeder_type: :feeds,
         sync_completed_at: Time.now.utc,
         external_id: apple_show_id)
 
+      api = Apple::Api.from_apple_config(apple_config)
       new(api: api,
         public_feed: apple_config.public_feed,
         private_feed: apple_config.private_feed)

app/models/feeds/apple_subscription.rb

@@ -14,6 +14,8 @@ class Feeds::AppleSubscription < Feed
 
   after_create :republish_public_feed
 
+  after_save_commit :update_apple_show
+
   has_one :apple_config, class_name: "::Apple::Config", dependent: :destroy, autosave: true, validate: true, inverse_of: :feed
 
   accepts_nested_attributes_for :apple_config, allow_destroy: true, reject_if: :all_blank
@@ -35,6 +37,25 @@ def set_defaults
     super
   end
 
+  def update_apple_show
+    if previous_changes[:apple_show_id]
+      Apple::Show.connect_existing(apple_show_id, apple_config)
+    end
+  end
+
+  def apple_show_options
+    used_ids = Feed.apple.distinct.where("id != ?", id).pluck(:apple_show_id).compact
+    api = Apple::Api.from_apple_config(apple_config)
+    shows_json = Apple::Show.apple_shows_json(api) || []
+    shows_json.map do |sj|
+      if used_ids.include?(sj["id"])
+        nil
+      else
+        ["#{sj["id"]} (#{sj["attributes"]["title"]})", sj["id"]]
+      end
+    end.compact
+  end
+
   def guess_audio_format
     default_feed_audio_format || episode_audio_format || DEFAULT_AUDIO_FORMAT
   end

app/policies/apple/config_policy.rb

@@ -12,6 +12,6 @@ def create?
   end
 
   def update?
-    false
+    FeedPolicy.new(token, resource.feed).update?
   end
 end

app/policies/feed_policy.rb

@@ -12,11 +12,11 @@ def create?
   end
 
   def new_apple?
-    create?
+    update?
   end
 
   def update?
-    PodcastPolicy.new(token, resource.podcast).update?
+    PodcastPolicy.new(token, resource.podcast).update? && !resource.edit_locked?
   end
 
   def destroy?

app/views/feeds/_form.html.erb

@@ -6,6 +6,14 @@
 <%= form_with(url: url, model: model, method: method, html: {autocomplete: "off"}, data: data) do |form| %>
   <div class="row my-4 mx-2" data-controller="feed-tokens" data-feed-tokens-unsaved-outlet="form">
     <div class="col-lg-8">
+    <% if feed.edit_locked? %>
+      <div class="col-12">
+        <div class="alert alert-danger" role="alert">
+          <b><%= t(".title.warning") %></b>
+          <%= t(".help.locked").html_safe %>
+        </div>
+      </div>
+    <% end %>
       <div class="row" data-controller="feed-link">
         <% if feed.default? %>
           <%= render "form_main", podcast: podcast, feed: feed, form: form %>

app/views/feeds/_form_apple_config.html.erb

@@ -27,9 +27,34 @@
           <%= key_fields.hidden_field :provider_id, data: {apple_key_target: "provider"} %>
           <%= key_fields.hidden_field :key_id, data: {apple_key_target: "key"} %>
         <% end %>
-      <% end %>
 
-      <%= form.hidden_field :type, value: "Feeds::AppleSubscription" %>
+        <div class="col-12 mt-4">
+          <div class="form-check">
+            <%= config_form.check_box :publish_enabled %>
+            <div class="d-flex align-items-center">
+              <%= config_form.label :publish_enabled %>
+              <%= help_text t(".help.publish_enabled") %>
+            </div>
+          </div>
+          <div class="form-check">
+            <%= config_form.check_box :sync_blocks_rss %>
+            <div class="d-flex align-items-center">
+              <%= config_form.label :sync_blocks_rss %>
+              <%= help_text t(".help.sync_blocks_rss") %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+      <div class="col-12 mt-4">
+        <div class="form-floating">
+          <% if !@apple_show_options.blank? %>
+            <%= form.select :apple_show_id, @apple_show_options, {include_blank: true} %>
+          <% else %>
+            <%= form.text_field :apple_show_id %>
+          <% end %>
+          <%= form.label :apple_show_id, "Apple Show ID" %>
+        </div>
+      </div>
 
       <div class="col-6 mt-4">
         <div class="form-floating input-group">
@@ -38,6 +63,9 @@
           <%= field_help_text t(".help.display_episodes_count") %>
         </div>
       </div>
+
+      <%= form.hidden_field :type, value: "Feeds::AppleSubscription" %>
+
     </div>
   </div>
 </div>

app/views/feeds/_tabs.html.erb

@@ -12,8 +12,7 @@
     <div class="fixed-bottom col-sm-12 col-md-3 col-xl-2">
       <div class="btn-group dropup d-flex sticky-md-bottom m-4 shadow">
         <%= link_to "Add a Feed", new_podcast_feed_path(podcast), class: "btn btn-success flex-grow-1" %>
-        <%# FIXME  %>
-        <% if false && @feeds.none?(&:apple?) %>
+        <% if @feeds.none?(&:apple?) %>
           <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split flex-grow-0 px-3 border-0 border-start" data-bs-toggle="dropdown" aria-expanded="false">
             <span class="visually-hidden">Toggle Dropdown</span>
           </button>

config/locales/en.yml

@@ -330,6 +330,9 @@ en:
     application:
       field_copy_tooltip: Copied!
     label:
+      apple/config:
+        publish_enabled: Enable publishing to Apple Podcasts Connect
+        sync_blocks_rss: Episodes must publish to Apple before the public feed
       episode:
         ad_breaks: Ad Breaks
         author_email: Author Email
@@ -783,6 +786,8 @@ en:
       guide_link: Check out our guide to step you through the setup.
       help:
         display_episodes_count: You can optionally limit the number of episodes that Paid Subscribers will see in Apple Podcasts. Leave this field blank to include all.
+        publish_enabled: Enable automatically publishing and updating episodes in this feed to Apple?
+        sync_blocks_rss: Block publishing to the default feed RSS until the Apple episode is published?
     form_audio_format:
       title: Audio Format
       help:
@@ -831,6 +836,8 @@ en:
       title: Feed Status
     form:
       <<: *form
+      help:
+        locked: This feed is locked, to make changes please <a href="https://help.prx.org/hc/en-us">contact PRX support.</a>
     helper:
       episode_offset_options:
         "-300": 5 minutes early

db/migrate/20241023012600_add_apple_show_id_to_feeds.rb

@@ -0,0 +1,6 @@
+class AddAppleShowIdToFeeds < ActiveRecord::Migration[7.2]
+  def change
+    add_column :feeds, :apple_show_id, :string
+    add_index :feeds, :apple_show_id
+  end
+end

db/migrate/20241023211041_add_edit_locked_to_feeds.rb

@@ -0,0 +1,5 @@
+class AddEditLockedToFeeds < ActiveRecord::Migration[7.2]
+  def change
+    add_column :feeds, :edit_locked, :boolean
+  end
+end

test/controllers/feeds_controller_test.rb

@@ -3,6 +3,7 @@
 class FeedsControllerTest < ActionDispatch::IntegrationTest
   let(:podcast) { create(:podcast, prx_account_uri: "/api/v1/accounts/123") }
   let(:feed) { create(:feed, podcast: podcast, private: false) }
+  let(:locked_feed) { create(:feed, podcast: podcast, private: false, edit_locked: true) }
   let(:private_feed) { create(:private_feed, podcast: podcast) }
   let(:update_params) { {url: "https://prx.org/a_public_url", display_episodes_count: 5} }
   let(:create_params) { {podcast: podcast, slug: "new_feed", title: "new title", private: false} }
@@ -60,6 +61,10 @@ class FeedsControllerTest < ActionDispatch::IntegrationTest
     patch podcast_feed_url(podcast, feed), params: {feed: update_params}
     assert_response :forbidden
   end
+  test "should block update on locked feed" do
+    patch podcast_feed_url(podcast, locked_feed), params: {feed: update_params}
+    assert_response :forbidden
+  end
 
   test "should update feed" do
     patch podcast_feed_url(podcast, feed), params: {feed: update_params}

test/models/apple/show_test.rb

@@ -172,6 +172,15 @@
       apple_publisher = Apple::Publisher.from_apple_config(apple_config.reload)
       assert_equal apple_publisher.show.apple_id, "some_apple_id"
     end
+
+    it "should take in a new apple show id" do
+      apple_config.save!
+      apple_show = Apple::Show.connect_existing("some_apple_id", apple_config)
+      assert_equal apple_show.apple_id, "some_apple_id"
+      apple_show = Apple::Show.connect_existing("another_apple_id", apple_config)
+      apple_show.public_feed.reload
+      assert_equal apple_show.apple_id, "another_apple_id"
+    end
   end
 
   describe "#apple_id" do
@@ -220,9 +229,8 @@
       apple_show.public_feed.reload
 
       apple_show.stub(:create_or_update_show, raises_exception) do
-        sync = nil
         assert_raises(Apple::ApiError) do
-          sync = apple_show.sync!
+          apple_show.sync!
         end
         assert_nil apple_show.sync_log
       end

test/models/feed/apple_subscription_test.rb

@@ -124,6 +124,12 @@
       apple_feed.save!
       assert_equal default_feed, apple_feed.apple_config.public_feed
     end
+
+    it "can return a list of possible apple shows" do
+      body = {data: [{id: "1", attributes: {title: "t1"}}, {id: "2", attributes: {title: "t2"}}], links: {}}.to_json
+      stub_request(:get, "https://api.podcastsconnect.apple.com/v1/shows").to_return(status: 200, body: body)
+      assert_equal apple_feed.apple_show_options, [["1 (t1)", "1"], ["2 (t2)", "2"]]
+    end
   end
 
   describe "#publish_to_apple?" do

test/policies/feed_policy_test.rb

@@ -19,6 +19,11 @@
     it "returns true if token is a member of the account" do
       assert FeedPolicy.new(member_token, feed).update?
     end
+
+    it "returns false if the feed is edit_locked" do
+      feed.edit_locked = true
+      refute FeedPolicy.new(member_token, feed).update?
+    end
   end
 
   describe "#destroy?" do