Handle feed inclusion delegated delivery UI

app/assets/stylesheets/app/badge.scss

@@ -26,6 +26,11 @@
   color: $black;
 }
 
+.prx-badge-not_publishable {
+  background: $gray-400;
+  color: $black;
+}
+
 .prx-badge-incomplete-published,
 .prx-badge-invalid,
 .prx-badge-not_found,

app/helpers/episodes_helper.rb

@@ -16,19 +16,22 @@ def episode_explicit_options
   end
 
   def episode_integration_status(integration, episode)
+    return "not_publishable" unless episode.integration_feed_episode?(integration)
+
     status = episode.episode_delivery_status(integration, true)
+
     if !status
       "not_found"
     elsif status.new_record?
       "new"
     elsif !status.uploaded?
       "incomplete"
+    elsif episode.integration_error_state?(integration)
+      "error"
     elsif !status.delivered?
       "processing"
-    elsif status.delivered?
-      "complete"
     else
-      "not_found"
+      "complete"
     end
   end
 
@@ -38,31 +41,6 @@ def episode_integration_updated_at(integration, episode)
       episode.updated_at
   end
 
-  def episode_apple_status(episode)
-    apple_episode = episode.apple_episode
-    if !apple_episode
-      "not_found"
-    elsif apple_episode.apple_new?
-      "new"
-    elsif apple_episode.needs_delivery?
-      "incomplete"
-    elsif apple_episode.waiting_for_asset_state?
-      "processing"
-    elsif apple_episode.audio_asset_state_error?
-      "error"
-    elsif apple_episode.synced_with_apple?
-      "complete"
-    else
-      "not_found"
-    end
-  end
-
-  def episode_apple_updated_at(episode)
-    episode.apple_sync_log&.updated_at ||
-      episode.apple_status&.created_at ||
-      episode.updated_at
-  end
-
   def episode_status_class(episode)
     case episode.publishing_status_was
     when "draft"

app/models/apple/episode.rb

@@ -478,6 +478,14 @@ def audio_asset_state_error?
       audio_asset_state == AUDIO_ASSET_FAILURE
     end
 
+    def delivery_file_errors?
+      podcast_delivery_files.any?(&:processed_errors?)
+    end
+
+    def error_state?
+      audio_asset_state_error? || delivery_file_errors?
+    end
+
     def audio_asset_state_success?
       audio_asset_state == AUDIO_ASSET_SUCCESS
     end

app/models/apple/publisher.rb

@@ -91,18 +91,15 @@ def publish!
 
     def upload_and_process!(eps)
       Rails.logger.tagged("Apple::Publisher#upload_and_process!") do
-        eps.filter(&:apple_needs_upload?).each_slice(PUBLISH_CHUNK_LEN) do |eps|
-          upload_media!(eps)
+        eps.filter(&:apple_needs_upload?).each_slice(PUBLISH_CHUNK_LEN) do |batch|
+          upload_media!(batch)
         end
 
-        eps.filter(&:apple_needs_delivery?).each_slice(PUBLISH_CHUNK_LEN) do |eps|
-          process_delivery!(eps)
+        eps.filter(&:apple_needs_delivery?).each_slice(PUBLISH_CHUNK_LEN) do |batch|
+          process_delivery!(batch)
         end
 
-        eps.each_slice(PUBLISH_CHUNK_LEN) do |eps|
-          publish_drafting!(eps)
-          raise_delivery_processing_errors(eps)
-        end
+        raise_delivery_processing_errors(eps)
       end
     end
 
@@ -145,9 +142,11 @@ def process_delivery!(eps)
         wait_for_upload_processing(eps)
 
         # Wait for the audio asset to be processed by Apple
-        # Mark episodes as delivered as they are processed
         wait_for_asset_state(eps) do |ready_eps|
           log_asset_wait_duration!(ready_eps)
+          # Publish the ready episodes
+          publish_drafting!(ready_eps)
+          # Then mark them as delivered
           mark_as_delivered!(ready_eps)
         end
       end

app/models/concerns/apple_delivery.rb → app/models/concerns/apple_integration.rb

@@ -1,6 +1,6 @@
 require "active_support/concern"
 
-module AppleDelivery
+module AppleIntegration
   extend ActiveSupport::Concern
 
   included do

app/models/episode.rb

@@ -12,7 +12,7 @@ class Episode < ApplicationRecord
   include PublishingStatus
   include TextSanitizer
   include EmbedPlayerHelper
-  include AppleDelivery
+  include AppleIntegration
   include ReleaseEpisodes
 
   MAX_SEGMENT_COUNT = 10

app/models/integrations/base/episode.rb

@@ -15,6 +15,10 @@ def archived?
         raise NotImplementedError, "Subclasses must implement archived?"
       end
 
+      def error_state?
+        false
+      end
+
       def ad_free?
         feeder_episode.categories.include?("adfree")
       end

app/models/integrations/episode_integrations.rb

@@ -23,11 +23,36 @@ module Integrations::EpisodeIntegrations
     end
   end
 
+  def integration_episode(integration)
+    integration_episode_method = "#{integration}_episode"
+    if respond_to?(integration_episode_method)
+      send(integration_episode_method)
+    end
+  end
+
   def publish_to_integration?(integration)
     # see if there is an integration
     podcast.feeds.any? { |f| f.integration_type == integration && f.publish_integration? }
   end
 
+  def integration_feed_episode?(integration)
+    feed = integration_feed(integration)
+    publish_to_integration?(integration) && feed&.feed_episode_ids&.include?(id)
+  end
+
+  def integration_feed(integration)
+    podcast.feeds.find { |f| f.integration_type == integration }
+  end
+
+  def integration_error_state?(integration)
+    integration_episode_method = "#{integration}_episode"
+    if respond_to?(integration_episode_method)
+      send(integration_episode_method)&.error_state? || false
+    else
+      false
+    end
+  end
+
   def sync_log(integration)
     sync_logs.send(integration.intern).order(updated_at: :desc).first
   end

app/views/episodes/_form_status.html.erb

@@ -35,33 +35,22 @@
       <%= render "form_feeds", form: form, episode: episode %>
     </div>
 
-    <% if episode.persisted? && episode.publish_to_apple? %>
-      <div class="col-12 mt-4">
-        <p class="status-text">
-          <strong><%= t(".apple_status") %>:</strong>
-          <span class="badge rounded-pill prx-badge-<%= episode_apple_status(episode) %>">
-            <%= t("helpers.label.episode.media_statuses.#{episode_apple_status(episode)}") %>
-          </span>
-          <br>
-          <%= local_time_ago(episode_apple_updated_at(episode)) %>
-        </p>
-      </div>
-    <% end %>
-    <% if episode.persisted? && episode.publish_to_integration?(:megaphone) %>
-      <% integration = :megaphone %>
-      <% integration_status = episode_integration_status(integration, episode) %>
-      <div class="col-12 mt-4">
-        <p class="status-text">
-          <strong><%= "#{integration.to_s.titleize} Status" %>:</strong>
-          <span class="badge rounded-pill prx-badge-<%= integration_status %>">
-            <%= t("helpers.label.episode.media_statuses.#{integration_status}") %>
-          </span>
-          <br>
-          <strong><%= t(".last_updated") %></strong>
-          <br>
-          <%= local_time_ago(episode_integration_updated_at(integration, episode)) %>
-        </p>
-      </div>
+    <% [:apple, :megaphone].each do |integration| %>
+      <% if episode.persisted? && episode.publish_to_integration?(integration) %>
+        <% integration_status = episode_integration_status(integration, episode) %>
+        <div class="col-12 mt-4">
+          <p class="status-text">
+            <strong><%= integration.to_s.titleize %> Status:</strong>
+            <span class="badge rounded-pill prx-badge-<%= integration_status %>">
+              <%= t("helpers.label.episode.media_statuses.#{integration_status}") %>
+            </span>
+            <br>
+            <strong><%= integration.to_s.titleize %> <%= t(".last_updated") %></strong>
+            <br>
+            <%= local_time_ago(episode_integration_updated_at(integration, episode)) %>
+          </p>
+        </div>
+      <% end %>
     <% end %>
   </div>
 

app/views/episodes/_overview.html.erb

@@ -47,8 +47,8 @@
               </li>
               <li class="list-group-item d-flex justify-content-between align-items-center">
                 <span><%= t(".apple") %></span>
-                <span class="badge rounded-pill prx-badge-<%= episode_apple_status(episode) %>">
-                  <%= t("helpers.label.episode.apple_statuses.#{episode_apple_status(episode)}") %>
+                <span class="badge rounded-pill prx-badge-<%= episode_integration_status(:apple, episode) %>">
+                  <%= t("helpers.label.episode.media_statuses.#{episode_integration_status(:apple, episode)}") %>
                 </span>
               </li>
               <li class="list-group-item"><%= t(".spotify") %></li>

config/locales/en.yml

@@ -383,6 +383,9 @@ en:
           incomplete: Incomplete
           incomplete_published: Incomplete
           invalid: Invalid
+          new: New
+          not_found: Unknown
+          not_publishable: Not Included for Publishing
           processing: Processing
         medium: File Format
         mediums:
@@ -401,12 +404,6 @@ en:
           draft: Draft
           published: Published
           scheduled: Scheduled
-        apple_statuses:
-          complete: Complete
-          error: Error
-          incomplete: Incomplete
-          not_found: Unknown
-          processing: Processing
         season_number: Season Number
         segment_count: Number of Segments
         subtitle: Subtitle
@@ -698,6 +695,7 @@ en:
       title_scheduled: Scheduled
       unpublish: Unpublish
       apple_status: Apple Status
+      last_updated: Last Updated
     form_tags:
       title: Categories
       help:

test/controllers/episodes_controller_test.rb

@@ -104,4 +104,50 @@ class EpisodesControllerTest < ActionDispatch::IntegrationTest
     delete episode_url(episode)
     assert_redirected_to podcast_episodes_url(podcast)
   end
+
+  # Error Handling Tests
+
+  test "shows apple integration error state when asset processing fails" do
+    _apple_feed = create(:apple_feed, podcast: podcast)
+    error_episode = create(:episode, podcast: podcast, published_at: 1.hour.ago, segment_count: 1)
+
+    # Create delivery status showing uploaded but not delivered (processing state)
+    create(:apple_episode_delivery_status, episode: error_episode, uploaded: true, delivered: false)
+
+    # Create apple episode with error state
+    api_response = build(:apple_episode_api_response,
+      item_guid: error_episode.item_guid,
+      apple_hosted_audio_state: Apple::Episode::AUDIO_ASSET_FAILURE)
+    create(:apple_episode, feeder_episode: error_episode, api_response: api_response)
+
+    get edit_episode_url(error_episode)
+    assert_response :success
+    assert_select ".prx-badge-error", text: /Error/
+  end
+
+  test "shows error badge when delivery file has validation errors" do
+    _apple_feed = create(:apple_feed, podcast: podcast)
+    error_episode = create(:episode, podcast: podcast, published_at: 1.hour.ago, segment_count: 1)
+
+    # Create delivery status
+    create(:apple_episode_delivery_status, episode: error_episode, uploaded: true, delivered: false)
+
+    # Create apple episode without audio asset state (still indeterminate since file failed validation)
+    api_response = build(:apple_episode_api_response,
+      item_guid: error_episode.item_guid)
+    _apple_episode = create(:apple_episode, feeder_episode: error_episode, api_response: api_response)
+
+    # Create podcast container, delivery, and delivery file with validation error
+    container = create(:apple_podcast_container, episode: error_episode)
+    delivery = create(:apple_podcast_delivery, episode: error_episode, podcast_container: container)
+    pdf = create(:apple_podcast_delivery_file, episode: error_episode, podcast_delivery: delivery)
+
+    # Update the sync log with validation error
+    pdf.apple_sync_log.update!(**build(:podcast_delivery_file_api_response, asset_processing_state: "VALIDATION_FAILED"))
+    error_episode.apple_episode.podcast_delivery_files.reset
+
+    get edit_episode_url(error_episode)
+    assert_response :success
+    assert_select ".prx-badge-error", text: /Error/
+  end
 end