add log when broadcast is ignored

app/controllers/stream_notifications_controller.rb

@@ -60,10 +60,16 @@ class StreamNotificationsController < ApplicationController
   def set_broadcast
     if notification_type == "video.asset.static_renditions.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
-      @broadcast = Broadcast.find_by!(stream_uid: live_stream_id)
+      @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
     else
-      @broadcast = Broadcast.find_by!(stream_uid: notification_object_id)
+      @broadcast = Broadcast.find_by(stream_uid: notification_object_id)
     end
+
+    if @broadcast.nil?
+      logger.info "Ignoring broadcast from other environment. Type = #{notification_type}. Id = #{live_stream_id} / #{notification_object_id}"
+      head :ok
+    end
+    head :ok if @broadcast.nil?
   end
 
   def notify_users

app/policies/acquired_media_release_policy.rb

@@ -12,7 +12,7 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def tag_multiple?

app/policies/appearance_release_policy.rb

@@ -16,7 +16,7 @@ class AppearanceReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def tag_multiple?

app/policies/location_release_policy.rb

@@ -16,7 +16,7 @@ class LocationReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def edit_photos?

app/policies/material_release_policy.rb

@@ -16,7 +16,7 @@ class MaterialReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def edit_photos?

app/policies/medical_release_policy.rb

@@ -12,7 +12,7 @@ class MedicalReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def edit_photos?

app/policies/misc_release_policy.rb

@@ -12,7 +12,7 @@ class MiscReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def edit_photos?

app/policies/music_release_policy.rb

@@ -12,7 +12,7 @@ class MusicReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def tag_multiple?

app/policies/talent_release_policy.rb

@@ -12,7 +12,7 @@ class TalentReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    true
+    user.manager? || user.account_manager?
   end
 
   def edit_photos?

app/views/contracts/_medical_questionnaire.html.erb

@@ -0,0 +1,8 @@
+<p class="heading"><strong><u><%= t ".heading" %></u></strong></p>
+  
+<% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
+  <% if contract_template.public_send("question_#{n}_text").present? %>
+    <p><strong><%= contract_template.public_send("question_#{n}_text") %></strong></p>
+    <p><%= releasable.public_send("question_#{n}_answer") %></p>
+  <% end %>
+<% end %>

app/views/contracts/_signature_page.html.erb

@@ -39,15 +39,6 @@
   <% end %>
 </dl>
 
-<% if releasable.model_name == "MedicalRelease" %>
-  <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
-    <% if contract_template.public_send("question_#{n}_text").present? %>
-      <p><strong><%= contract_template.public_send("question_#{n}_text") %></strong></p>
-      <p><%= releasable.public_send("question_#{n}_answer") %></p>
-    <% end %>
-  <% end %>
-<% end %>
-
 <% if releasable.minor? %>
   <br/>
   <p class="text-left"><strong>Guardian Information</strong></p>

app/views/contracts/pdf.html.erb

@@ -15,6 +15,13 @@
   <p class="text-left"><strong>Guardian Clause</strong></p>
   <%= contract_template.guardian_clause %>
 <% end %>
+
+<% if releasable.model_name == "MedicalRelease" %>
+  <div class="page">
+    <%= render "contracts/medical_questionnaire", releasable: releasable, contract_template: contract_template, preview: preview %>
+  </div>  
+<% end %>
+
 <div class="page">
   <%= render "contracts/signature_page", releasable: releasable, contract_template: contract_template, preview: preview %>
 </div>

config/locales/en.yml

@@ -246,6 +246,8 @@ en:
     new:
       heading: New Release Template
   contracts:
+    medical_questionnaire:
+      heading: Medical Questionnaire
     photos:
       guardian_2_photo_heading: Second guardian photo
       guardian_photo_heading: Guardian photo

spec/controllers/stream_notifications_controller_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe StreamNotificationsController, type: :controller do
   let(:active_status) { {type: "video.live_stream.active", object: { id: "mux_stream" }} }
   let(:disconnected_status) { {type: "video.live_stream.disconnected", object: { id: "mux_stream" }} }
   let(:idle_status) { {type: "video.live_stream.idle", object: { id: "mux_stream" }} }
+  let(:idle_status_for_unknown_broadcast) { {type: "video.live_stream.idle", object: { id: "unknown-id" }} }
   let(:asset_ready) { {
     type: "video.asset.static_renditions.ready",
     object: { id: "asset_uid" },
@@ -59,6 +60,12 @@ RSpec.describe StreamNotificationsController, type: :controller do
 
       expect(BroadcastsChannel).to have_received(:stream_recording_ready)
     end
+
+    it "returns OK response even for non-existing broadcast" do
+      post :create, params: idle_status_for_unknown_broadcast
+
+      expect(response).to be_successful
+    end
   end
 
   after do

spec/policies/acquired_media_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe AcquiredMediaReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -24,6 +25,14 @@ describe AcquiredMediaReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
   end
 end

spec/policies/appearance_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe AppearanceReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -24,6 +25,14 @@ describe AppearanceReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
   end
 end

spec/policies/location_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe LocationReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -23,10 +24,6 @@ describe LocationReleasePolicy do
     end
   end
 
-  permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
-  end
-
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -34,4 +31,16 @@ describe LocationReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
+
+  permissions :destroy? do
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
+  end
 end

spec/policies/material_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe MaterialReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -23,10 +24,6 @@ describe MaterialReleasePolicy do
     end
   end
 
-  permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
-  end
-
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -34,4 +31,16 @@ describe MaterialReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
+
+  permissions :destroy? do
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
+  end
 end

spec/policies/medical_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe MedicalReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -23,10 +24,6 @@ describe MedicalReleasePolicy do
     end
   end
 
-  permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
-  end
-
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -34,4 +31,16 @@ describe MedicalReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
+
+  permissions :destroy? do
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
+  end
 end

spec/policies/misc_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe MiscReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -19,10 +20,6 @@ describe MiscReleasePolicy do
     end
   end
 
-  permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
-  end
-
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -30,4 +27,16 @@ describe MiscReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
+
+  permissions :destroy? do
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
+  end
 end

spec/policies/music_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 RSpec.describe MusicReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -18,6 +19,14 @@ RSpec.describe MusicReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
   end
 end

spec/policies/talent_release_policy_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 describe TalentReleasePolicy do
-  let(:user_context) { build(:user_context) }
+  let(:user) { create(:user, :manager) }
+  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
 
   subject { described_class }
 
@@ -23,10 +24,6 @@ describe TalentReleasePolicy do
     end
   end
 
-  permissions :destroy? do
-    it { is_expected.to permit(:destroy) }
-  end
-
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -34,4 +31,16 @@ describe TalentReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
+
+  permissions :destroy? do
+    it { is_expected.to permit(user_context, :destroy) }
+  end
+
+  context "for an associate" do
+    let(:user) { create(:user, :associate) }
+
+    permissions :destroy? do
+      it { is_expected.not_to permit(user_context, :destroy) }
+    end
+  end
 end