fix MR comments

.env.sample

@@ -16,10 +16,9 @@ REDIS_URL=
 # Required for Zoom.us integration
 ZOOM_API_KEY=
 ZOOM_API_SECRET=
-ZOOM_ACCOUNT_NUMBER=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
+ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
@@ -28,3 +27,6 @@ MUX_TOKEN_ID=
 MUX_TOKEN_SECRET=
 MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
 MUX_TEST_MODE_DISABLED=
+
+# Required for creating user through API
+CUSTOM_API_TOKEN=

app/controllers/admin/accounts_controller.rb

@@ -20,7 +20,6 @@ class Admin::AccountsController < Admin::ApplicationController
 
   def show
     @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
-    @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
   end
 
   def edit
@@ -71,8 +70,4 @@ class Admin::AccountsController < Admin::ApplicationController
       @account.videos
     end
   end
-
-  def account_broadcasts
-    @account.broadcasts
-  end
 end

app/controllers/admin/broadcasts_controller.rb

@@ -1,24 +0,0 @@
-class Admin::BroadcastsController < Admin::ApplicationController
-  before_action :set_broadcast, only: [:edit, :update]
-
-  def edit
-  end
-
-  def update
-    if @broadcast.update(broadcast_update_params)
-      redirect_to [:admin, @broadcast.project.account], notice: t(".notice")
-    else
-      render :edit
-    end
-  end
-
-  private
-
-  def set_broadcast
-    @broadcast = authorize policy_scope(Broadcast).find(params[:id])
-  end
-
-  def broadcast_update_params
-    params.require(:broadcast).permit(:stream_url_override, :stream_key_override, :director_mode_video_embed)
-  end
-end

app/controllers/api/users_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::UsersController < Api::ApiController
+  skip_before_action :authenticate_user
+  before_action :verify_custom_token, only: :create
+
+  def create
+    if user_params[:email].nil? || user_params[:password].nil?
+      raise ActionController::ParameterMissing.new 'Missing email or password'
+    end
+
+    user = Oath::Services::SignUp.new(user_params).perform
+    render json: user.slice(:email, :created_at, :first_name, :last_name)
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(%i[
+                                   email
+                                   password
+                                   first_name
+                                   last_name
+                                 ])
+  end
+
+  def verify_custom_token
+    if token.blank? || token != ENV['CUSTOM_API_TOKEN']
+      unauthorized_entity(:user)
+    end
+  end
+
+end

app/controllers/broadcast_recordings_controller.rb

@@ -1,26 +0,0 @@
-class BroadcastRecordingsController < ApplicationController
-  layout "project"
-
-  before_action :set_project
-  before_action :set_broadcast
-  before_action :set_recording
-
-  def destroy
-    @recording.update(hidden: true)
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-
-  private
-
-  def set_project
-    @project = policy_scope(Project).find(params[:project_id])
-  end
-
-  def set_broadcast
-    @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id])
-  end
-
-  def set_recording
-    @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:id])
-  end
-end

app/controllers/broadcasts_controller.rb

@@ -27,7 +27,7 @@ class BroadcastsController < ApplicationController
 
   def show
     @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
     render layout: 'application'
   end

app/controllers/public/broadcasts_controller.rb

@@ -5,7 +5,7 @@ class Public::BroadcastsController < Public::BaseController
   def show
     @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
     @multi_view_broadcasts = multi_view_broadcasts
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
 
     render 'broadcasts/show'

app/controllers/stream_notifications_controller.rb

@@ -35,7 +35,7 @@ class StreamNotificationsController < ApplicationController
       duration = notification.dig(:data, :duration)
 
       recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
-      recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
       message = "Your recent live stream has been recorded and is available for download here: #{link}"

app/models/account.rb

@@ -5,7 +5,6 @@ class Account < ApplicationRecord
   has_many :users, through: :account_auths
   has_many :projects, dependent: :destroy
   has_many :videos, through: :projects
-  has_many :broadcasts, through: :projects
   has_many :contract_templates, through: :projects
 
   validates :name, presence: true

app/models/appearance_release.rb

@@ -17,7 +17,6 @@ class AppearanceRelease < ApplicationRecord
   include SecondGuardianName
   include CsvExportable
   include Approvable
-  include Amendmenable
 
   class << self
     def custom_csv_exportable_headers

app/models/broadcast.rb

@@ -35,11 +35,7 @@ class Broadcast < ApplicationRecord
   end
 
   def stream_server_url
-    stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"]
-  end
-
-  def stream_server_key
-    stream_key_override.presence || stream_key
+    ENV['MUX_BROADCAST_SERVER_URL']
   end
 
   def zoom_meeting_url

app/models/broadcast_recording.rb

@@ -5,8 +5,6 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
-  scope :visible, -> { where(hidden: false) }
-
   def download_url
     "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
   end

app/policies/appearance_release_policy.rb

@@ -34,8 +34,4 @@ class AppearanceReleasePolicy < ReleasePolicy
   def approve?
     review?
   end
-
-  def sign_amendment?
-    user.manager? || user.account_manager?
-  end
 end

app/policies/broadcast_recording_policy.rb

@@ -1,9 +0,0 @@
-class BroadcastRecordingPolicy < ApplicationPolicy
-  def destroy?
-    if user.nil? || user.user.nil?
-      return false
-    end
-    
-    user.manager? || user.account_manager?
-  end
-end

app/views/admin/accounts/_broadcast.html.erb

@@ -1,13 +0,0 @@
-<tr>
-  <td><%= broadcast.project.name %></td>
-  <td><%= broadcast.name %></td>
-  <td class="text-right">
-    <div class="btn-group">
-      <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
-      <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to "View on Mux", "#{ENV['MUX_LIVE_STREAM_DASHBOARD_URL']}/#{broadcast.stream_uid}", class: "dropdown-item", target: "_blank" %>
-        <%= link_to "Edit", [:edit, :admin, broadcast, locale: I18n.locale], class: "dropdown-item" %>
-      </div>
-    </div>
-  </td>
-</tr>

app/views/admin/accounts/show.html.erb

@@ -34,25 +34,5 @@
         <%= will_paginate @videos %>
       </div>
     <% end %>
-    <hr>
-    <%= card_field_set_tag "Broadcasts" do %>
-      <div class="table-responsive-sm">
-        <table class="table table-striped tr-px-4 align-all-middle">
-          <thead class="thead-light">
-            <tr>
-              <th>Project</th>
-              <th>Name</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody id="broadcasts">
-            <%= render partial: "admin/accounts/broadcast", collection: @broadcasts %>
-          </tbody>
-        </table>
-      </div>
-      <div id="broadcasts_pagination">
-        <%= will_paginate @broadcasts %>
-      </div>
-    <% end %>
   </div>
 </div>

app/views/admin/broadcasts/_form.html.erb

@@ -1,14 +0,0 @@
-<%= errors_summary_for broadcast %>
-
-<%= bootstrap_form_with model: model, local: true do |form| %>
-  <%= form.text_field :stream_url_override %>
-  <%= form.text_field :stream_key_override %>
-  <%= form.text_area :director_mode_video_embed %>
-
-  <div class="row align-items-center text-center mt-4">
-    <%= link_to t("shared.cancel"), [:admin, broadcast.project.account], class: "col-3 text-reset" %>
-    <div class="col-9">
-      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => broadcast.new_record?), data: { disable_with: t("shared.disable_with") } %>
-    </div>
-  </div>
-<% end %>

app/views/admin/broadcasts/edit.html.erb

@@ -1,6 +0,0 @@
-<div class="card shadow-sm">
-  <%= card_header text: t(".heading"), close_action_path: [:admin, @broadcast.project.account] %>
-  <div class="card-body">
-    <%= render "form", model: [:admin, @broadcast], broadcast: @broadcast %>
-  </div>
-</div>

app/views/appearance_releases/_appearance_release.html.erb

@@ -34,17 +34,6 @@
    <td>
     <%= appearance_release.signed_on %>
   </td>
-  <td class="text-center">
-    <% if appearance_release.amendment_signed? %>
-      <i class="fa fa-check-square-o text-dark"
-         data-toggle="tooltip"
-         title="<%= t '.messages.amendment_signed_tooltip' %>"></i>
-    <% elsif appearance_release.amendment_signable? %>
-      <i class="fa fa-square-o"
-         data-toggle="tooltip"
-         title="<%= t '.messages.amendment_not_signed_tooltip' %>"></i>
-    <% end %>
-  </td>
   <td class="text-right">
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
@@ -55,9 +44,6 @@
         <% if policy(appearance_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, appearance_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
-        <% if policy(appearance_release).sign_amendment? && appearance_release.amendment_signable? && !appearance_release.amendment_signed? %>
-          <%= link_to fa_icon("file-text fw", text: t('.actions.sign_amendment')), [:new, appearance_release.project.account, appearance_release.project, appearance_release.contract_template, appearance_release, :amendment], class: "dropdown-item", target: "_blank" %>
-        <% end %>
         <% if policy(Contract).show? && (appearance_release.contract.attached? || appearance_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [appearance_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>

app/views/appearance_releases/index.html.erb

@@ -51,7 +51,6 @@
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>
-        <th><%= t '.table_headers.amendment_signed' %></th>
         <th></th>
       </tr>
     </thead>

app/views/broadcast_recordings/destroy.js.erb

@@ -1,6 +0,0 @@
-var dom_id = "<%= dom_id(@recording) %>"
-$('[data-id="' + dom_id + '"]').remove();
-<% if @recordings.empty? %>
-  $("#broadcast_recordings_nav").append('<p class="dropdown-item text-muted">Recordings will appear here</p>')
-<% end %>
-$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>");

app/views/broadcasts/_broadcast.html.erb

@@ -16,8 +16,8 @@
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
       <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), broadcast.stream_server_url, class: "dropdown-item", data: { behavior: "clipboard" } %>
-        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_server_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), ENV['MUX_BROADCAST_SERVER_URL'], class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
         <% if policy(broadcast).show? %>
           <%= link_to fa_icon("file-video-o fw", text: "View"), [broadcast.project, broadcast], class: "dropdown-item", target: '_blank' %>
         <% end %>

app/views/broadcasts/_broadcast_recording_nav.html.erb

@@ -1,3 +1,2 @@
-<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url, id: dom_id(broadcast_recording) } %>
-
+<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url } %>
 

app/views/broadcasts/_broadcast_recordings.html.erb

@@ -2,12 +2,7 @@
   <p>Click below to download the recordings of the live stream.</p>
   <ul class="mt-2">
     <% recordings.each do |recording| %>
-      <li>
-        <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %> 
-        <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %>
-          <%= link_to "Hide", [broadcast.project, broadcast, recording], class: "btn-sm btn-primary ml-1 text-decoration-none", remote: true, method: :delete, data: { confirm: t('.confirm_hide') } %>
-        <% end %>
-      </li>
+      <li><%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %></li>
     <% end %>
   </ul>
   <div id="recordings_pagination" class="row mt-5 justify-content-center">

app/views/broadcasts/_video.html.erb

@@ -1,9 +1,5 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
-<% elsif broadcast.director_mode_video_embed.present? && params[:director_mode] == "true" %>
-  <div class="embed-responsive-item" data-video-type="stream">
-    <%= raw broadcast.director_mode_video_embed %>
-  </div>
 <% else %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
@@ -16,4 +12,4 @@
       </tbody>
     </table>
   </div>
-<% end %>
+<% end %>

app/views/broadcasts/show.html.erb

@@ -39,15 +39,6 @@
                   <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% end %>
-              <% if @broadcast.director_mode_video_embed.present? %>
-                <h5 class="dropdown-header">Director Mode</h5>
-                <% unless params[:director_mode] %>
-                  <%= link_to "Enable Director Mode", url_for(params.permit!.merge(director_mode: true)), class: "dropdown-item" %>
-                <% else %>
-                  <%= link_to "Disable Director Mode", url_for(params.permit!.except(:director_mode)), class: "dropdown-item" %>
-
-                <% end %>
-              <% end %>
               <h5 class="dropdown-header">Previous Sessions</h5>
               <div id="broadcast_recordings_nav">
                 <% if @recordings.any? %>

app/views/contract_templates/_form.html.erb

@@ -2,7 +2,7 @@
   <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
     <div class="form-row">
       <%= form.text_field :name, wrapper_class: "col-sm-6" %>
-      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent material misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(appearance location) } }, class: "form-control custom-select" %>
+      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent material misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
     </div>
     <div class="form-row mb-3">
       <%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %>

app/views/location_releases/_location_release.html.erb

@@ -16,10 +16,10 @@
     <% end %>
   </td>
   <td>
-    <%= contact_info(name: location_release.name, address: location_release.address) %>
+    <%= location_release.name %>
   </td>
   <td>
-    <%= contact_info_for(location_release.contact_person) %>
+    <%= contact_info address: location_release.address %>
   </td>
   <td>
     <%= notes_preview location_release.notes.order_by_recent %>

app/views/location_releases/index.html.erb

@@ -28,8 +28,8 @@
         <th data-behavior="all-selectable"><%= check_box_tag "location_release_ids[]", false, false %></th>
         <th><%= t '.table_headers.approved'%></th>
         <th></th>
-        <th><%= t(".table_headers.location_info") %></th>
-        <th><%= t(".table_headers.owner_info") %>
+        <th><%= t(".table_headers.name") %></th>
+        <th><%= t(".table_headers.address") %>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>

app/views/public/amendments/new.html.erb

@@ -8,10 +8,6 @@
   <div class="card-body">
     <%= errors_summary_for @release %>
     <%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
-      <%= card_field_set_tag t('.signed_contract_preview') do %>
-        <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for([@release, :contracts, format: "pdf"]) %>" width="80%" height="1200" />
-      <% end %>
-
       <%= card_field_set_tag t(".amendment.heading") do %>
         <p><%= @contract_template.amendment_clause %></p>
       <% end %>

config/locales/en.yml

@@ -111,11 +111,6 @@ en:
     application:
       header:
         sign_out: Sign Out
-    broadcasts:
-      edit:
-        heading: Edit Broadcast
-      update:
-        notice: The broadcast has been updated
     task_requests:
       index:
         empty: Task requests will appear here
@@ -140,10 +135,7 @@ en:
       actions:
         manage: Manage
         review: Review
-        sign_amendment: Sign Additional Clause
       messages:
-        amendment_not_signed_tooltip: Secondary Clause Not Yet Signed
-        amendment_signed_tooltip: Secondary Clause Signed
         approved_tooltip: Approved by %{user} on %{timestamp}
       no_photos: Needs Photo
     create:
@@ -176,7 +168,6 @@ en:
       empty: Appearance Releases will appear here
       imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release
       table_headers:
-        amendment_signed: Additional Clause
         approved: Approved
         contact_info: Contact info
         name: Name
@@ -227,8 +218,6 @@ en:
     broadcast:
       actions:
         manage: Manage
-    broadcast_recordings:
-      confirm_hide: Are you sure you want to hide this recording from everyone?
     create:
       notice: A live stream has been created
     destroy:
@@ -353,7 +342,7 @@ en:
         amendment_clause: Amendment Clause
         amendment_signature: Amendment Signature
         amendment_signer_name: Amendment Signer Name
-      heading: Secondary Clause
+      heading: Amendment
     for_office_use_only:
       description_labels:
         date_issued: Date Issued
@@ -522,8 +511,6 @@ en:
         person_last_name: Last name
         person_name: Name
         person_phone: Phone number
-      contract_template:
-        amendment_clause: Secondary Clause
       location_release:
         address_city: City
         address_country: Country
@@ -854,11 +841,11 @@ en:
         search: Search
       empty: Location Releases will appear here
       table_headers:
+        address: Address
         amendment_signed: Amendment
         approved: Approved
-        location_info: Location Info
+        name: Location Name
         notes: Notes
-        owner_info: Owner Info
         signed_at: Date Signed
         tags: Tags
     location_release:
@@ -1151,7 +1138,6 @@ en:
         copy_url: Copy sign amendment URL
         signature:
           heading: Signature
-        signed_contract_preview: Signed Contract Preview
     appearance_releases:
       create: 
         notice: Your release has been signed. Thank you!

config/locales/es.yml

@@ -45,13 +45,6 @@ es:
     models:
       appearance_release: Autorización de Aparacimiento
   appearance_releases:
-    appearance_release:
-      actions:
-        sign_amendment: Sign Additional Clause (ES)
-        manage: Manage (ES)
-      messages:
-        amendment_not_signed_tooltip: Amendment not yet signed (ES)
-        amendment_signed_tooltip: Amendment signed (ES)
     create:
       failed_import: Failed to create appearance release for files listed below (ES)
       matching_started: Matching started (ES)
@@ -71,7 +64,6 @@ es:
     index:
       imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release (ES)
       table_headers:
-        amendment_signed: Additional Clause (ES)
         contact_info: ""
         name: ""
         notes: ""
@@ -177,7 +169,7 @@ es:
         amendment_clause: Amendment Clause (ES)
         amendment_signature: Amendment Signature (ES)
         amendment_signer_name: Amendment Signer Name (ES)
-      heading: Secondary Clause (ES)
+      heading: Amendment (ES)
     for_office_use_only:
       description_labels:
         date_issued: Date Issued (ES)
@@ -512,7 +504,6 @@ es:
         copy_url: Copy sign amendment URL (ES)
         signature:
           heading: Signature (ES)
-        signed_contract_preview: Signed Contract Preview (ES)
     appearance_releases:
       create:
         notice: La autorización está firmada. ¡Gracias!

config/routes.rb

@@ -35,7 +35,6 @@ Rails.application.routes.draw do
         resource :masquerade, only: :create
       end
       resources :task_requests, only: [:index, :edit, :update, :show]
-      resources :broadcasts, only: [:edit, :update]
 
       root to: "accounts#index", as: :signed_in_root
     end
@@ -101,7 +100,6 @@ Rails.application.routes.draw do
           delete :destroy_file
         end
         resource :zoom_meeting, only: [:show]
-        resources :broadcast_recordings, only: :destroy
       end
       resources :directories, except: [:index] do
         member do
@@ -131,9 +129,7 @@ Rails.application.routes.draw do
         resources :projects, only: [] do
           resources :contract_templates, only: [:index] do
             resources :talent_releases, only: [:new, :create]
-            resources :appearance_releases, only: [:new, :create] do
-              resources :amendments, only: [:new, :create]
-            end
+            resources :appearance_releases, only: [:new, :create]
             resources :acquired_media_releases, only: [:new, :create]
             resources :location_releases, only: [:new, :create] do
               resources :amendments, only: [:new, :create]
@@ -162,6 +158,7 @@ Rails.application.routes.draw do
       scope 'v1' do
         get 'sync' => 'sync#index'
         post 'user_token' => 'user_token#create'
+        post 'users' => 'users#create'
         resource :profiles, only: [:show]
         resources :projects, only: [:index] do
           resources :broadcasts, only: [:index, :show, :update]

db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb

@@ -1,5 +0,0 @@
-class AddHiddenFieldToBroadcastRecordings < ActiveRecord::Migration[6.0]
-  def change
-    add_column :broadcast_recordings, :hidden, :boolean, default: false
-  end
-end

db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb

@@ -1,7 +0,0 @@
-class AddStreamAndKeyOverrideToBroadcasts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :broadcasts, :stream_url_override, :string
-    add_column :broadcasts, :stream_key_override, :string
-    add_column :broadcasts, :youtube_uid, :string
-  end
-end

db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb

@@ -1,5 +0,0 @@
-class RemoveYoutubeUidFromBroadcasts < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :broadcasts, :youtube_uid, :string
-  end
-end

db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb

@@ -1,5 +0,0 @@
-class AddDirectorModeVideoEmbedToBroadcasts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :broadcasts, :director_mode_video_embed, :text
-  end
-end

db/migrate/20200804093409_add_amendment_signer_details_to_appearance_releases.rb

@@ -1,5 +0,0 @@
-class AddAmendmentSignerDetailsToAppearanceReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :appearance_releases, :amendment_signer_name, :string
-  end
-end

db/structure.sql

@@ -365,8 +365,7 @@ CREATE TABLE public.appearance_releases (
     guardian_2_address_country character varying,
     approved_by_user_name text,
     approved_by_user_email text,
-    approved_at timestamp without time zone,
-    amendment_signer_name character varying
+    approved_at timestamp without time zone
 );
 
 
@@ -523,8 +522,7 @@ CREATE TABLE public.broadcast_recordings (
     file_name character varying NOT NULL,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
-    duration double precision,
-    hidden boolean DEFAULT false
+    duration double precision
 );
 
 
@@ -564,10 +562,7 @@ CREATE TABLE public.broadcasts (
     token character varying,
     streamer_status integer DEFAULT 0,
     shoot_location_time_zone character varying DEFAULT 'UTC'::character varying,
-    full_live_stream_playback_uid character varying,
-    stream_url_override character varying,
-    stream_key_override character varying,
-    director_mode_video_embed text
+    full_live_stream_playback_uid character varying
 );
 
 
@@ -3992,12 +3987,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200720051634'),
 ('20200720131309'),
 ('20200721140821'),
-('20200724084722'),
 ('20200725231419'),
-('20200727143209'),
-('20200730050903'),
-('20200803145912'),
-('20200803150138'),
-('20200804093409');
+('20200727143209');
 
 

spec/channels/broadcasts_channel_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
   describe '#stream_recording_ready' do
     it 'broadcasts to the channel with the right data' do
       create_list(:broadcast_recording, 1, broadcast: broadcast) 
-      recordings = broadcast.broadcast_recordings.visible.paginate(page: 1)
+      recordings = broadcast.broadcast_recordings.paginate(page: 1)
       flash_message = OpenStruct.new(notice: 'Hello world', alert: nil)
       flash_content = ApplicationController.render partial: 'application/flash', locals: { flash: flash_message }
       recordings_content = ApplicationController.render partial: 'broadcasts/broadcast_recordings', locals: { recordings: recordings, broadcast: broadcast }

spec/controllers/admin/accounts_controller_spec.rb

@@ -116,16 +116,6 @@ RSpec.describe Admin::AccountsController, type: :controller do
       expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2))
     end
 
-    it "paginates the broadcast list" do
-      allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
-      project = create(:project, account: current_user.primary_account)
-      create_list(:broadcast, 20, project: project )
-
-      get :show, params: { id: current_user.primary_account }
-
-      expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2))
-    end
-
     it "filters the videos by a query param" do
       project = create(:project, account: current_user.primary_account)
       create(:video, project: project, name: "First video")

spec/controllers/admin/broadcasts_controller_spec.rb

@@ -1,77 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Admin::BroadcastsController, type: :controller do
-  render_views
-
-  let!(:current_user) { create(:user, :admin) }
-
-  before do
-    sign_in(current_user)
-    allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
-  end
-
-  describe "#edit" do
-    let(:broadcast) { create(:broadcast) }
-
-    it "returns a successful response" do
-      get :edit, params: { id: broadcast }
-
-      expect(response).to be_successful
-    end
-
-    it "assigns broadcast" do
-      get :edit, params: { id: broadcast }
-
-      expect(assigns(:broadcast)).to eq broadcast
-    end
-  end
-
-  describe "#update" do
-    let(:broadcast) { create(:broadcast) }
-  
-    it "redirects to broadcasts page" do
-      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
-  
-      expect(response).to be_redirect
-      expect(response).to redirect_to [:admin, broadcast.project.account]
-    end
-  
-    it "sets a flash notice" do
-      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
-  
-      expect(flash.notice).to eq "The broadcast has been updated"
-    end
-  
-    it "updates the broadcast record" do
-      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
-  
-      expect(assigns(:broadcast)).to have_attributes(
-                                      stream_url_override: "https://example.com/streams/abcd",
-                                      stream_key_override: "abcdef",
-                                    )
-    end
-  
-    context "when record cannot be saved" do
-      before do
-        allow_any_instance_of(Broadcast).to receive(:update).and_return(false)
-      end
-  
-      it "re-displays the form" do
-        patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
-  
-        expect(response).to be_successful
-        expect(flash.notice).to be_nil
-      end
-    end
-  end
-
-  private
-
-  def broadcast_update_params
-    {
-      stream_url_override: "https://example.com/streams/abcd",
-      stream_key_override: "abcdef",
-      director_mode_video_embed: "<iframe>Video player</iframe>",
-    }
-  end
-end

spec/controllers/api/users_controller_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::UsersController, type: :controller do
+  before do
+    ENV['CUSTOM_API_TOKEN'] = "custom_token"
+  end
+  describe '#create' do
+    context 'Invalid token' do
+      it 'Returns 401 (Unauthorized) status if token is not valid' do
+
+        post :create
+
+        expect(response).not_to be_successful
+        expect(response).to have_http_status(401)
+      end
+    end
+
+    context 'Valid token' do
+      before :each do
+        controller.request.env['HTTP_AUTHORIZATION'] = 'Bearer custom_token'
+      end
+
+      it 'Returns Server error if user param is missing' do
+        user_count = User.all.count
+
+        expect do
+          post :create
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Returns Server Error if email or password is missing' do
+        user_count = User.all.count
+
+        expect do
+          post :create, params: { user: { email: "a@b.com" } }
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect do
+          post :create, params: { user: { password: "123" } }
+        end.to raise_exception ActionController::ParameterMissing
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Returns Server Error if body contains not permitted params' do
+        user_count = User.all.count
+
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123", admin: true } }
+        end.to raise_exception ActionController::UnpermittedParameters
+
+        expect(User.all.count).to eq user_count
+      end
+
+      it 'Creates user if body contains correct params' do
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123" } }
+        end.to change(User, :count).by(1)
+
+        expect(response).to be_successful
+      end
+
+      it 'Nothing changes if existing email is used' do
+        create(:user, email: "a@b.com")
+
+        expect do
+          post :create, params: { user: { email: "a@b.com", password: "123" } }
+        end.not_to change(User, :count)
+
+        expect(response).to be_successful
+      end
+    end
+  end
+end

spec/controllers/broadcast_recordings_controller_spec.rb

@@ -1,30 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe BroadcastRecordingsController, type: :controller do
-  render_views
-
-  let(:user) { create(:user) }
-  let(:account) { user.primary_account }
-  let(:project) { create(:project, account: user.primary_account) }
-
-  before do
-    sign_in user
-  end
-
-  describe "#destroy" do
-    let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") }
-    let(:recording) { create(:broadcast_recording, broadcast: broadcast) }
-
-    before do
-      allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
-    end
-
-    it "hides the broadcast recording" do
-      expect(recording.hidden).to be false
-
-      post :destroy, params: { project_id: project, broadcast_id: broadcast, id: recording }, xhr: true
-      
-      expect(recording.reload.hidden).to be true
-    end
-  end
-end

spec/controllers/broadcasts_controller_spec.rb

@@ -184,35 +184,6 @@ RSpec.describe BroadcastsController, type: :controller do
         expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: recording.download_file_name)
       end
     end
-
-    context "when virtual director video embed is available" do
-      let(:broadcast) { create(:broadcast, project: project, name: "Another Broadcast",
-                               director_mode_video_embed: "<iframe>video player</iframe>") }
-
-      it "renders the view dropdown with a director mode enable option" do
-        get :show, params: { project_id: project, id: broadcast }
-
-        expect(response.body).to have_content "Switch View"
-        expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode")
-        expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Enable Director Mode")
-      end
-
-      context "when director mode is enabled" do
-        it "shows the video embed" do
-          get :show, params: { project_id: project, id: broadcast, director_mode: true }
-
-          expect(response.body).to have_selector("iframe", text: "video player")
-        end
-
-        it "renders the view dropdown with a director mode disable option" do
-          get :show, params: { project_id: project, id: broadcast, director_mode: true }
-
-          expect(response.body).to have_content "Switch View"
-          expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode")
-          expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Disable Director Mode")
-        end
-      end
-    end
   end
 
   describe "#update" do

spec/controllers/public/amendments_controller_spec.rb

@@ -4,108 +4,96 @@ RSpec.describe Public::AmendmentsController, type: :controller do
   let(:user) { create(:user) }
   let(:account) { user.primary_account }
   let(:project) { create(:project, account: account) }
+  let(:contract_template) { create(:location_release_contract_template, :with_amendment_clause, project: project) }
+  let(:location_release) { create(:location_release, contract_template: contract_template, project: project) }
 
   render_views
 
-  shared_examples "amendments signing controller" do
-    describe "#new" do
-      it "shows amendment signing form for non-signed amendment of a release" do
-        expect(subject.amendment_signed?).to be_falsey
+  describe "#new" do
+    it "shows amendment signing form for non-signed amendment of a release" do
+      expect(location_release.amendment_signed?).to be_falsey
 
-        get :new, params: {
-          account_id: account,
-          project_id: project,
-          contract_template_id: subject.contract_template,
-          "#{subject.model_name.param_key}_id": subject
-        }
+      get :new, params: {
+        account_id: account,
+        project_id: project,
+        contract_template_id: location_release.contract_template,
+        location_release_id: location_release
+      }
 
-        expect(response).to be_successful
+      expect(response).to be_successful
 
-        body = CGI.unescape_html(response.body)
-        expect(body).not_to match already_signed_message
-      end
-
-      it "shows already signed message for signed amendment of a release" do
-        expect(signed_release.amendment_signed?).to be_truthy
-
-        get :new, params: {
-          account_id: account,
-          project_id: project,
-          contract_template_id: signed_release.contract_template,
-          "#{signed_release.model_name.param_key}_id": signed_release
-        }
-
-        expect(response).to be_successful
-
-        body = CGI.unescape_html(response.body)
-        expect(body).to match already_signed_message
-      end
+      body = CGI.unescape_html(response.body)
+      expect(body).not_to match already_signed_message
     end
 
-    describe "#create" do
-      it "signs amendment" do
-        expect(subject.amendment_signed?).to be_falsey
+    it "shows already signed message for signed amendment of a release" do
+      signed_release = create(:location_release, :amendment_signed, contract_template: contract_template, project: project)
 
-        post :create, params: {
-          account_id: account,
-          project_id: project,
-          contract_template_id: subject.contract_template,
-          "#{subject.model_name.param_key}_id": subject,
-          "#{subject.model_name.param_key}": {
-            amendment_signer_name: "Signer Name",
-            amendment_signature_base64: signature_base64
-          }
-        }
+      expect(signed_release.amendment_signed?).to be_truthy
 
-        expect(response).to be_successful
+      get :new, params: {
+        account_id: account,
+        project_id: project,
+        contract_template_id: location_release.contract_template,
+        location_release_id: signed_release
+      }
 
-        body = CGI.unescape_html(response.body)
-        expect(body).not_to match already_signed_message
-        expect(body).to match signed_successfully_message
+      expect(response).to be_successful
 
-        expect(subject.class.last.amendment_signed?).to be_truthy
-        expect(subject.class.last.amendment_signer_name).to eq "Signer Name"
-      end
-
-      it "shows already signed message for signed amendment of a release" do
-        expect(signed_release.amendment_signed?).to be_truthy
-
-        post :create, params: {
-          account_id: account,
-          project_id: project,
-          contract_template_id: signed_release.contract_template,
-          "#{signed_release.model_name.param_key}_id": signed_release,
-          "#{signed_release.model_name.param_key}": {
-            amendment_signer_name: "Signer Who",
-            amendment_signature_base64: signature_base64
-          }
-        }
-
-        expect(response).to be_successful
-
-        body = CGI.unescape_html(response.body)
-        expect(body).to match already_signed_message
-
-        expect(signed_release.amendment_signed?).to be_truthy
-        expect(signed_release.amendment_signer_name).to eq "Amendment Signer"
-      end
+      body = CGI.unescape_html(response.body)
+      expect(body).to match already_signed_message
     end
   end
 
-  context "for location release" do
-    let(:contract_template) { create(:location_release_contract_template, :with_amendment_clause, project: project) }
-    let(:signed_release) { create(:location_release, :amendment_signed, contract_template: contract_template, project: project) }
-    subject { create(:location_release, contract_template: contract_template, project: project) }
+  describe "#create" do
+    it "signs amendment" do
+      expect(location_release.amendment_signed?).to be_falsey
 
-    it_behaves_like "amendments signing controller"
-  end
+      post :create, params: {
+        account_id: account,
+        project_id: project,
+        contract_template_id: location_release.contract_template,
+        location_release_id: location_release,
+        location_release: {
+          amendment_signer_name: "Signer Name",
+          amendment_signature_base64: signature_base64
+        }
+      }
 
-  context "for location release" do
-    let(:contract_template) { create(:appearance_release_contract_template, :with_amendment_clause, project: project) }
-    let(:signed_release) { create(:appearance_release, :amendment_signed, contract_template: contract_template, project: project) }
-    subject { create(:appearance_release, contract_template: contract_template, project: project) }
+      expect(response).to be_successful
 
-    it_behaves_like "amendments signing controller"
+      body = CGI.unescape_html(response.body)
+      expect(body).not_to match already_signed_message
+      expect(body).to match signed_successfully_message
+
+      expect(LocationRelease.last.amendment_signed?).to be_truthy
+      expect(LocationRelease.last.amendment_signer_name).to eq "Signer Name"
+    end
+
+    it "shows already signed message for signed amendment of a release" do
+      signed_release = create(:location_release, :amendment_signed, name: "Test Loc", amendment_signer_name: "Big Signer", contract_template: contract_template, project: project)
+
+      expect(signed_release.amendment_signed?).to be_truthy
+
+      post :create, params: {
+        account_id: account,
+        project_id: project,
+        contract_template_id: location_release.contract_template,
+        location_release_id: signed_release,
+        location_release: {
+          amendment_signer_name: "Signer Who",
+          amendment_signature_base64: signature_base64
+        }
+      }
+
+      expect(response).to be_successful
+
+      body = CGI.unescape_html(response.body)
+      expect(body).to match already_signed_message
+
+      expect(signed_release.amendment_signed?).to be_truthy
+      expect(signed_release.amendment_signer_name).to eq "Big Signer"
+    end
   end
 
   private
@@ -121,4 +109,4 @@ RSpec.describe Public::AmendmentsController, type: :controller do
   def signature_base64
     @signature_base64 ||= Base64Image.from_image(file_fixture('signature.png')).data_uri
   end
-end
+end

spec/factories/appearance_releases.rb

@@ -32,14 +32,6 @@ FactoryBot.define do
       end
     end
 
-    trait :amendment_signed do
-      amendment_signature do
-        path = Rails.root.join("spec", "fixtures", "files", "signature.png")
-        Rack::Test::UploadedFile.new(path, "image/png")
-      end
-      amendment_signer_name "Amendment Signer"
-    end
-
     trait :minor do
       minor true
       guardian_first_name "Jamie"

spec/factories/broadcast_recordings.rb

@@ -3,7 +3,6 @@ FactoryBot.define do
     association :broadcast
     file_name "high.mp4"
     asset_uid "asset_uid"
-    asset_playback_uid "asset_playback_uid"
-    hidden { false }
+    asset_playback_uid "asset_playback_uid"    
   end
 end

spec/factories/broadcasts.rb

@@ -16,17 +16,6 @@ FactoryBot.define do
       streamer_status "idle"
     end
 
-    trait :with_overriden_stream do
-      stream_uid "mux_stream"
-      stream_key "mux_key"
-      stream_playback_uid "mux_playback_id"
-      full_live_stream_playback_uid "full_live_stream_playback_uid"
-      status "created"
-      streamer_status "idle"
-      stream_url_override "overriden_stream_url"
-      stream_key_override "overriden_stream_key"
-    end
-
     trait :with_files do
       files do
         [

spec/features/user_manages_contract_templates_spec.rb

@@ -66,18 +66,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(ContractTemplate.last.amendment_clause.body.to_s).to match /Amendment clause text/
   end
 
-  scenario 'appearance release template has a amendment clause field' do
-    visit new_project_contract_template_path(project)
-
-    fill_in 'Name', with: 'My Release Template'
-    select 'Appearance Release', from: 'Release type'
-    fill_hidden amendment_clause_field, with: 'Amendment clause text'
-    click_on create_release_template_button
-
-    expect(page).to have_content(create_contract_template_success_message)
-    expect(ContractTemplate.last.amendment_clause.body.to_s).to match /Amendment clause text/
-  end
-
   scenario 'medical release template has a guardian clause field' do
     visit new_project_contract_template_path(project)
 

spec/features/user_managing_appearance_releases_spec.rb

@@ -144,49 +144,6 @@ feature 'User managing appearance releases' do
 
       expect(page).to have_content dummy_signature_legal_text
     end
-
-    scenario "signing amendment for a not-signed amendment release", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_falsey
-
-      visit new_account_project_contract_template_appearance_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content amendments_heading
-
-      fill_in amendment_signer_name_field, with: 'Big Signer'
-      draw_signature file_fixture("signature.png"), amendment_signature_field
-
-      click_button sign_amendment_button
-
-      expect(page).to have_content signed_successfully_message
-      expect(AppearanceRelease.find(release.id).amendment_signed?).to be_truthy
-    end
-
-    scenario "opening signing amendment page for a signed amendment release shows already signed message", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, :amendment_signed, contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_truthy
-
-      visit new_account_project_contract_template_appearance_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).not_to have_content amendments_heading
-      expect(page).not_to have_content signed_successfully_message
-      expect(page).to have_content already_signed_message
-    end
-
-    scenario "amendment signing form has copy URL button" do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, contract_template: contract_template, project: project)
-
-      visit new_account_project_contract_template_appearance_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content copy_url_button
-    end
-
-
   end
 
   context 'when signed in' do
@@ -335,81 +292,7 @@ feature 'User managing appearance releases' do
       expect(page).to have_content('New Name')
     end
 
-    scenario "signing amendment for a not-signed amendment release", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, person_first_name: "First", contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_falsey
-
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_content "First"
-
-      click_on manage_button
-
-      expect(page).to have_link sign_amendment_link
-
-      new_window = window_opened_by { click_link sign_amendment_link }
-      within_window new_window do
-        expect(page).to have_content amendments_heading
-
-        fill_in amendment_signer_name_field, with: 'Big Signer'
-        draw_signature file_fixture("signature.png"), amendment_signature_field
-
-        click_button sign_amendment_button
-
-        expect(page).to have_content signed_successfully_message
-        expect(AppearanceRelease.find(release.id).amendment_signed?).to be_truthy
-      end
-    end
-
-    scenario "signed amendment release does not have sign amendment option in manage dropdown", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, :amendment_signed, person_first_name: "Firstn", contract_template: contract_template, project: project)
-
-      expect(release.amendment_signed?).to be_truthy
-
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_content "Firstn"
-
-      click_on manage_button
-
-      expect(page).not_to have_link sign_amendment_link
-    end
-
-    scenario "signed amendment release have checked box in appearance releases index table", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      not_signed_release = create(:appearance_release, person_first_name: "Firstn", contract_template: contract_template, project: project)
-      expect(not_signed_release.amendment_signed?).to be_falsey
-
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_content "Firstn"
-      expect(page).to have_css('i.fa.fa-square-o', count: 1)
-      expect(page).to have_css('i.fa.fa-check-square', count: 0)
-
-      signed_release = create(:appearance_release, :amendment_signed, person_first_name: "Signedn", contract_template: contract_template, project: project)
-      expect(signed_release.amendment_signed?).to be_truthy
-
-      visit project_appearance_releases_path(project)
-
-      expect(page).to have_content "Signedn"
-
-      expect(page).to have_css('i.fa.fa-square-o', count: 1)
-      expect(page).to have_css('i.fa.fa-check-square-o', count: 1)
-    end
-
-    scenario "amendment signing form has copy URL button when user is signed in", js: true do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      release = create(:appearance_release, contract_template: contract_template, project: project)
-
-      visit new_account_project_contract_template_appearance_release_amendment_path(project.account, project, contract_template, release)
-
-      expect(page).to have_content copy_url_button
-    end
-
-    scenario 'viewing the contract PDF when amendment is not yet signed' do
+    scenario 'viewing the contract PDF' do
       appearance_release = create(:appearance_release_with_contract_template,
                                   :native,
                                   project: project,
@@ -436,7 +319,6 @@ feature 'User managing appearance releases' do
       expect(content_type).to eq('application/pdf')
       expect(content_disposition).to include('inline')
       expect(pdf_filename).to include('doe-jane')
-      expect(pdf_body).not_to have_content amendment_page_heading
       expect(pdf_body).to have_content('Jane Doe')
       expect(pdf_body).to have_content('NOTES')
       expect(pdf_body).to have_content('Note 1')
@@ -451,35 +333,6 @@ feature 'User managing appearance releases' do
       expect(pdf_body).not_to have_content('Guardian Email')
     end
 
-    scenario "viewing the contract PDF when amendment is signed" do
-      contract_template = create(:appearance_release_contract_template, :with_amendment_clause, project: project)
-      appearance_release = create(:appearance_release,
-                                :amendment_signed,
-                                :native,
-                                contract_template: contract_template,
-                                project: project,
-                                person_first_name: "John",
-                                person_last_name: "Doe")
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq("application/pdf")
-      expect(content_disposition).to include("inline")
-      expect(pdf_filename).to include("doe-john")
-
-      expect(pdf_body).to have_content("John Doe")
-
-      expect(pdf_body).to have_content amendment_page_heading.upcase
-      expect(pdf_body).to have_content amendment_clause_label
-      expect(pdf_body).to have_content amendment_signer_name_label
-      expect(pdf_body).to have_content amendment_signature_label
-
-      expect(pdf_body).to have_content contract_template.amendment_clause.to_plain_text
-      expect(pdf_body).to have_content appearance_release.amendment_signer_name
-    end
-
     scenario 'viewing contract PDF for a minor without guardian photo' do
       appearance_release = create(:appearance_release_with_contract_template, :native, :minor, project: project)
 
@@ -520,7 +373,7 @@ feature 'User managing appearance releases' do
 
       visit project_appearance_releases_path(project)
 
-      click_on manage_button
+      click_on 'Manage'
       accept_alert do
         click_link *destroy_link_for(appearance_release)
       end
@@ -723,7 +576,7 @@ feature 'User managing appearance releases' do
       create(:appearance_release_with_contract_template, :native, project: project)
 
       visit project_appearance_releases_path(project)
-      click_on manage_button
+      click_on "Manage"
 
       expect(page).not_to have_link(review_action, exact: true)
     end
@@ -741,7 +594,7 @@ feature 'User managing appearance releases' do
 
       visit project_appearance_releases_path(project)
 
-      click_on manage_button
+      click_on 'Manage'
       expect(page).not_to have_link('Download', exact: true)
     end
 
@@ -749,7 +602,7 @@ feature 'User managing appearance releases' do
       create(:appearance_release_with_contract_template, :native, project: project)
 
       visit project_appearance_releases_path(project)
-      click_on manage_button
+      click_on "Manage"
 
       expect(page).not_to have_link(review_action, exact: true)
     end
@@ -1013,56 +866,4 @@ feature 'User managing appearance releases' do
   def date_issued
     t 'contracts.for_office_use_only.description_labels.date_issued'
   end
-
-  def amendments_heading
-    t 'public.amendments.new.amendment.heading'
-  end
-
-  def amendment_signer_name_field
-    'appearance_release[amendment_signer_name]'
-  end
-
-  def amendment_signature_field
-    'appearance_release_amendment_signature_base64'
-  end
-
-  def sign_amendment_button
-    t 'shared.submit_release_long'
-  end
-
-  def already_signed_message
-    t 'public.amendments.create.amendment_already_signed_message'
-  end
-
-  def signed_successfully_message
-    t 'public.amendments.create.amendment_signed_message'
-  end
-
-  def manage_button
-    t 'appearance_releases.appearance_release.actions.manage'
-  end
-
-  def sign_amendment_link
-    t 'appearance_releases.appearance_release.actions.sign_amendment'
-  end
-
-  def copy_url_button
-    t 'public.amendments.new.copy_url'
-  end
-
-  def amendment_page_heading
-    t 'contracts.amendment_page.heading'
-  end
-
-  def amendment_signer_name_label
-    t 'contracts.amendment_page.description_labels.amendment_signer_name'
-  end
-
-  def amendment_clause_label
-    t 'contracts.amendment_page.description_labels.amendment_clause'
-  end
-
-  def amendment_signature_label
-    t 'contracts.amendment_page.description_labels.amendment_signature'
-  end
 end

spec/features/user_managing_broadcasts_spec.rb

@@ -3,7 +3,6 @@
 require 'rails_helper'
 
 feature 'User managing broadcasts' do
-
   let(:current_user) { create(:user, :manager) }
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
@@ -51,7 +50,7 @@ feature 'User managing broadcasts' do
 
     scenario 'visit show page of broadcast', js: true do
       broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1")
+      recording = create(:broadcast_recording, broadcast: broadcast)
 
       visit project_broadcast_path(project, broadcast)
 
@@ -205,24 +204,6 @@ feature 'User managing broadcasts' do
       end
     end
 
-    scenario 'project manager can hide broadcast recordings', js: true do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid")
-
-      visit project_broadcast_path(project, broadcast)
-
-      click_on 'Previous Sessions'
-      expect(page).to have_content(recording.download_file_name)
-      expect(page).to have_content('Hide')
-      
-      accept_alert do
-        click_link "Hide"
-      end
-
-      expect(page).not_to have_content(recording.download_file_name)
-      expect(page).to have_content("Recording of the live stream will appear here")
-    end
-
     context 'When the user is associate' do
       let(:current_user) { create(:user, :associate) }
 
@@ -240,17 +221,6 @@ feature 'User managing broadcasts' do
 
         expect(page).to have_content delete_file_button, count: 0
       end
-
-      scenario 'associate does not see hide button in front of recording' do
-        broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-        recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid")
-  
-        visit project_broadcast_path(project, broadcast)
-  
-        click_on 'Previous Sessions'
-        expect(page).to have_content(recording.download_file_name)
-        expect(page).not_to have_content('Hide')
-      end
     end
 
     context 'When the user is account manager' do
@@ -277,24 +247,6 @@ feature 'User managing broadcasts' do
         expect(page).to have_content delete_file_button, count: 2
         expect(Broadcast.find(broadcast.id).files.count).to eq 2
       end
-
-      scenario 'account manager can hide broadcast recordings', js: true do
-        broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-        recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid")
-  
-        visit project_broadcast_path(project, broadcast)
-  
-        click_on 'Previous Sessions'
-        expect(page).to have_content(recording.download_file_name)
-        expect(page).to have_content('Hide')
-  
-        accept_alert do
-          click_link "Hide"
-        end
-  
-        expect(page).not_to have_content(recording.download_file_name)
-        expect(page).to have_content("Recording of the live stream will appear here")
-      end
     end
 
   end

spec/features/user_managing_location_releases_spec.rb

@@ -251,9 +251,6 @@ feature "User managing location releases" do
       new_window = window_opened_by { click_link sign_amendment_link }
       within_window new_window do
         expect(page).to have_content amendments_heading
-        expect(page).to have_content signed_contract_preview.upcase
-
-        expect(page).to have_selector 'embed'
 
         fill_in amendment_signer_name_field, with: 'Big Signer'
         draw_signature file_fixture("signature.png"), amendment_signature_field
@@ -376,7 +373,7 @@ feature "User managing location releases" do
 
     expect(pdf_body).to have_content("Test Loc")
 
-    expect(pdf_body).to have_content amendment_page_heading.upcase
+    expect(pdf_body).to have_content amendment_page_heading
     expect(pdf_body).to have_content amendment_clause_label
     expect(pdf_body).to have_content amendment_signer_name_label
     expect(pdf_body).to have_content amendment_signature_label
@@ -693,10 +690,6 @@ feature "User managing location releases" do
     t 'public.amendments.new.amendment.heading'
   end
 
-  def signed_contract_preview
-    t 'public.amendments.new.signed_contract_preview'
-  end
-
   def amendment_signer_name_field
     'location_release[amendment_signer_name]'
   end
@@ -748,8 +741,8 @@ feature "User managing location releases" do
   def table_headers
     [
       t('location_releases.index.table_headers.approved'),
-      t('location_releases.index.table_headers.location_info'),
-      t('location_releases.index.table_headers.owner_info'),
+      t('location_releases.index.table_headers.name'),
+      t('location_releases.index.table_headers.address'),
       t('location_releases.index.table_headers.notes'),
       t('location_releases.index.table_headers.tags'),
       t('location_releases.index.table_headers.signed_at'),

spec/models/broadcast_spec.rb

@@ -49,36 +49,6 @@ RSpec.describe Broadcast, type: :model do
         expect(broadcast).to have_received(:destroy_mux_live_stream)
       end
     end
-
-    context "#stream_server_url" do
-      it "returns mux stream url when overriden stream url is absent" do
-        ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream"
-        broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast")
-        
-        expect(broadcast.stream_server_url).to eq("mux_stream")
-      end
-
-      it "returns overriden stream url when it is present" do
-        ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream"
-        broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast")
-        
-        expect(broadcast.stream_server_url).to eq("overriden_stream_url")
-      end
-    end
-
-    context "#stream_server_key" do
-      it "returns mux stream key when overriden stream key is absent" do
-        broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast")
-        
-        expect(broadcast.stream_server_key).to eq("mux_key")
-      end
-
-      it "returns overriden stream key when it is present" do
-        broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast")
-        
-        expect(broadcast.stream_server_key).to eq("overriden_stream_key")
-      end
-    end
   end
 
   describe "#zoom_meeting_url" do