add specs and use i18n

.env.sample

@@ -7,6 +7,8 @@ AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
 BRAYNIAC_AI_API_ENDPOINT=https://z99cprg2eg.execute-api.us-east-1.amazonaws.com/dev/v0.0.1
+SOURCE_AUDIO_API_ENDPOINT=https://bigmedia.sourceaudio.com/api
+SOURCE_AUDIO_TOKEN=
 
 # Optional
 REDIS_URL=
@@ -14,6 +16,7 @@ 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)
@@ -26,9 +29,10 @@ 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=
 
-# Required for simulcasting to Millicast for director mode
-MILLICAST_API_SECRET=
-MILLICAST_ACCOUNT_ID=
+# Required for Microsoft Azure AD Auth
+AZURE_CLIENT_ID     = Client App ID
+AZURE_CLIENT_SECRET = Client App Secret
+AZURE_TENANT_ID     = Client App Tenant ID
+AZURE_REDIRECT_URI  = where microsoft will redirect after login, eg. http://localhost:3000/auth/azure_ad/callback
+AZURE_SCOPES        = Scopes required for Application, eg. 'openid email profile User.Read offline_access OnlineMeetings.ReadWrite'

Gemfile

@@ -139,6 +139,15 @@ gem 'rack-cors'
 # Ruby wrappers for the HubSpot REST API
 gem "hubspot-ruby"
 
+# OAuth
+gem 'omniauth-oauth2', '~> 1.6'
+# OmniAuth CSRF protection
+gem 'omniauth-rails_csrf_protection', '~> 0.1.2'
+
+# authenticate via Microsoft 
+# gem 'omniauth-microsoft_graph', git: 'https://github.com/m4c3/omniauth-microsoft_graph'
+# gem 'omniauth-microsoft_graph'
+
 group :development, :test, :review do
   # Call "byebug" anywhere in the code to stop execution and get a debugger console
   gem "byebug", "~> 11.0.1", platforms: [:mri, :mingw, :x64_mingw]

Gemfile.lock

@@ -220,6 +220,7 @@ GEM
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
     hashery (2.1.2)
+    hashie (4.1.0)
     hexapdf (0.9.3)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.2)
@@ -297,6 +298,7 @@ GEM
       money (~> 6.13.2)
       railties (>= 3.0)
     msgpack (1.3.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
@@ -308,6 +310,21 @@ GEM
       warden
     oath-generators (1.0.1)
       oath (>= 0.0.12)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
+    omniauth-rails_csrf_protection (0.1.2)
+      actionpack (>= 4.2)
+      omniauth (>= 1.3.1)
     parallel (1.19.1)
     parity (3.2.0)
     parser (2.6.5.0)
@@ -552,6 +569,8 @@ DEPENDENCIES
   mux_ruby!
   oath (~> 1.1.0)
   oath-generators (~> 1.0.1)
+  omniauth-oauth2 (~> 1.6)
+  omniauth-rails_csrf_protection (~> 0.1.2)
   parity (~> 3.2.0)
   pdf-reader (~> 2.1.0)
   pdfkit (~> 0.8.2)

app/assets/javascripts/bs_component_init.js

@@ -1,7 +0,0 @@
-$(document).on("turbolinks:load", function() {
-  bsCustomFileInput.init();
-})
-
-$(document).on("turbolinks:load", function() {
-  $(".toast").toast('show');
-})

app/assets/javascripts/channels/broadcasts.coffee.erb

@@ -24,8 +24,6 @@ $(document).on "turbolinks:load", ->
       stream_selected = $("#broadcast_video").data('videoType') == 'stream';
       if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
-        $("#recording_status").html data.recording_status_content
-
         new (Clappr.Player)(
           <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
@@ -37,13 +35,11 @@ $(document).on "turbolinks:load", ->
           hlsMinimumDvrSize: 1)
       if data.streamer_status == "idle" && data.status == "idle"
         $("#broadcast_video").html data.video_content
-        $("#recording_status").html data.recording_status_content
 
     showBroadcastRecordings: (data) ->
       $(".flash-message").html data.flash_content
       $("#broadcast_recordings").html data.recordings_content
       $("#broadcast_recordings_nav").html data.recordings_nav_content
-      $(".toast").toast('show')
 
     refreshBroadcastFilesTab: (data) ->
       $("#broadcast_file_list_#{data.broadcast_token}").html data.files_content

app/assets/javascripts/channels/projects.coffee

@@ -23,4 +23,3 @@ $(document).on "turbolinks:load", ->
 
     showDownloadStatusUpdate: (content) ->
       $(".flash-message").html content
-      $(".toast").toast('show')

app/assets/javascripts/custom_file_input.js

@@ -0,0 +1,3 @@
+$(document).on("turbolinks:load", function() {
+  bsCustomFileInput.init()
+})

app/assets/javascripts/directory_files_input.js

@@ -1,9 +0,0 @@
-$(document).on("turbolinks:load", function() {
-    $("#upload_directory_files").on('click', function(e){
-        const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length;
-
-        if (newFilesCount === 0){
-            e.preventDefault();
-        }
-    });
-});

app/assets/javascripts/download_releases.js

@@ -1,20 +0,0 @@
-$(document).on("click", "#download_releases", function(event) {
-    event.preventDefault();
-
-    const releasable_ids = JSON.parse($("#selected_releases_form").attr('data-releasable-ids'));
-    const total_entries = $('#total_entries').val();
-
-    const input_ids = $('<input>').attr({ type: 'hidden', name: 'release_ids', value: JSON.stringify(releasable_ids) });
-    const search_query = $('<input>').attr({ type: 'hidden', name: 'search_query', value: $("form input[type='search']").val() });
-    const type_filter = $('<input>').attr({ type: 'hidden', name: 'type_filter', value: $('#type_filter_value').val() });
-
-    const download_count = releasable_ids.length > 0 ? releasable_ids.length : total_entries;
-
-    $(this).parent().append(input_ids);
-    $(this).parent().append(search_query);
-    $(this).parent().append(type_filter);
-
-    if (confirm(`${download_count} release(s) will be downloaded. Is this correct?`)){
-        Rails.fire($(this).parent()[0], 'submit');
-    }
-});

app/assets/javascripts/stream_player.js.erb

@@ -1,6 +1,7 @@
 $(document).on("click", "[data-behavior=play_recording]", function() {
-    clearPlayingHighlight();
-    $(this).parent().parent().addClass('playing-highlight');
+    if ($(this).hasClass('active')){
+        return false;
+    }
 
     $("#broadcast_video").data('videoType', 'recording');
 
@@ -15,13 +16,13 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
         height: '100%',
         autoPlay: true
     });
+
+    $(".dropdown-menu").children().removeClass('active');
+    $(".dropdown-menu").children().children('i').remove();
+    $(this).siblings().removeClass('active');
+    $(this).siblings().children("i").remove();
+    $(this).addClass('active');
+    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
 });
 
-$(document).on("click", "[data-behavior=play_stream]", function() {
-//    clearPlayingHighlight();
-    $("#broadcast_video").data('videoType', 'stream');
-});
-
-function clearPlayingHighlight() {
-    $(".playing-highlight").removeClass("playing-highlight");
-}
+$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").data('videoType', 'stream'); });

app/assets/javascripts/switch_director_mode.js

@@ -1,4 +0,0 @@
-$(document).on("click", "#director_mode_switch", function() {
-  // JQuery click event trigger was not working.
-  document.getElementById("director_mode_link").click();
-});

app/assets/javascripts/trix.js

@@ -1,30 +1,4 @@
 // Do not allow file attachments in rich text content
 addEventListener("trix-file-accept", function(event) {
   event.preventDefault();
-});
-
-Trix.config.textAttributes.underline = {
-    style: { "textDecoration": "underline" },
-    inheritable: true,
-    parser: function (element) {
-        var style = window.getComputedStyle(element);
-        return style.textDecoration === "underline";
-    }
-}
-
-document.addEventListener('trix-initialize', function (e) {
-    const trix = e.target;
-    const toolBar = trix.toolbarElement;
-
-    // // Creation of the button
-    const button = document.createElement("button");
-    button.setAttribute("type", "button");
-    button.setAttribute("class", "trix-button trix-button--icon trix-button--icon-underline");
-    button.setAttribute("data-trix-attribute", "underline");
-    button.setAttribute("title", "underline");
-    button.setAttribute("tabindex", "-1");
-    button.innerText = "U";
-
-    // Attachment of the button to the toolBar
-    toolBar.querySelector('.trix-button-group--text-tools').appendChild(button);
-});
+})

app/assets/stylesheets/application.scss

@@ -412,16 +412,6 @@ a[data-behavior=seekable-timecode] {
   background-color: rgba($black, 0.05);
 }
 
-// Black background
-.bg-black {
-  background-color: $black;
-}
-
-// White background
-.bg-white {
-  background-color: $white;
-}
-
 // Custom width
 .w-65 {
   width: 65% !important;
@@ -432,93 +422,8 @@ a[data-behavior=seekable-timecode] {
   max-height: 30rem;
 }
 
-// Max-width 75%
-.max-w-75 {
-  max-width: 75%;
-}
-
 // Fix height and width
 .fix-h-and-w {
   width: 308px;
   height:308px;
 }
-
-// Dropdown shown state overrride
-.override-dropdown-show-state {
-  color: $white !important;
-  background-color: $black !important;
-  border-color: transparent !important;
-}
-
-// Override custom switch color
-.override-custom-control-label::before {
-  background-color: #000000;
-}
-
-// Override nav tab design
-.override-nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
-  background: transparent;
-  border-color: transparent;
-  border-bottom: 3px solid #ff0000;
-}
-
-//Trix underline style
-trix-toolbar {
-  .trix-button--icon-underline::before {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 17c3.31 0 6-2.69 6-6V3h-2.5v8c0 1.93-1.57 3.5-3.5 3.5S8.5 12.93 8.5 11V3H6v8c0 3.31 2.69 6 6 6zm-7 2v2h14v-2H5z'/%3E%3C/svg%3E");
-  }
-}
-
-// Play button SVG
-.play-btn {
-  width: 60%;
-  height: auto;
-}
-
-.play-btn-svg{
-  transition: 0.3s;
-  stroke:#fedfc2;
-  opacity: 0;
-}
-
-.play-btn:hover .play-btn-svg {
-  fill-opacity: 0;
-  opacity: 1;
-}
-
-// Play button in video thumbnail preview
-.play-thumbnail { position: relative; }
-.play-thumbnail img { display: block; }
-.play-thumbnail .play-btn { position: absolute; bottom:5px; left:10px; }
-
-// Active recording highlight
-.playing-highlight {
-  background-color: scale-color($primary, $lightness: 80%);
-}
-
-// Toast min width and border radius
-.toast-min-w-border-radius {
-  min-width: 18rem; 
-  border-radius: 0.8rem;
-}
-
-// Toast left border primary
-.toast-border-left-primary {
-  border-left: 8px solid $primary;
-}
-
-// Toast left border danger
-.toast-border-left-danger {
-  border-left: 8px solid $danger;
-}
-
-// Change link color to primary on toast notifications
-.toast {
-  a {
-    color: $primary;
-  }
-
-  a.btn {
-    color: white;
-  }
-}

app/assets/stylesheets/contract_pdf.scss

@@ -48,10 +48,6 @@ u {
   margin-right: -30px;
 }
 
-.embed-person-photo {
-  text-align: right;
-}
-
 .do-not-copy-warning {
   padding-right: 15px;
 }

app/channels/broadcasts_channel.rb

@@ -11,7 +11,6 @@ class BroadcastsChannel < ApplicationCable::Channel
   def self.broadcast_stream_updates(broadcast)
     status_content = ApplicationController.render partial: "broadcasts/broadcast_status", locals: { broadcast: broadcast }
     video_content = ApplicationController.render partial: "broadcasts/video", locals: { broadcast: broadcast }
-    recording_status_content = ApplicationController.render partial: "broadcasts/recording_status", locals: { broadcast: broadcast }
 
     broadcast_to broadcast, {
       event: :broadcast_stream_update,
@@ -19,7 +18,6 @@ class BroadcastsChannel < ApplicationCable::Channel
       playback_url: broadcast.stream_playback_url,
       full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
       video_content: video_content,
-      recording_status_content: recording_status_content,
       status_content: status_content,
       streamer_status: broadcast.streamer_status
     }

app/controllers/account_sessions_controller.rb

@@ -1,5 +1,4 @@
 class AccountSessionsController < ApplicationController
-  skip_before_action :redirect_locked_accounts
   def update
     authorize :account_session, :update?
     session[:active_account] = account_session_params[:account_id]

app/controllers/acquired_media_releases_controller.rb

@@ -18,6 +18,7 @@ class AcquiredMediaReleasesController < ApplicationController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params)
 
     if @acquired_media_release.save
+      log_create_analytics
       SetTagsForReleasableJob.perform_later(@acquired_media_release)
       redirect_to [@project, :acquired_media_releases], notice: t(".notice")
     else
@@ -118,8 +119,11 @@ class AcquiredMediaReleasesController < ApplicationController
                                                    :term_id, :term_text,
                                                    :restriction_id, :restriction_text,
                                                    categories: [],
-                                                   files: []
-                                                  )
+                                                   file_infos_attributes: %i[
+                                                     filename
+                                                     content_type
+                                                     byte_size
+                                                   ])
   end
 
   def build_acquired_media_release(attrs = {})
@@ -135,4 +139,8 @@ class AcquiredMediaReleasesController < ApplicationController
 
     results
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AcquiredMediaRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/admin/account_locks_controller.rb

@@ -1,31 +0,0 @@
-class Admin::AccountLocksController < Admin::ApplicationController
-  before_action :set_account
-
-  def create
-    authorize :account_lock, :create?
-    @account.update(locked: true)
-    redirect_to admin_accounts_path, notice: 'Account locked'
-  end
-
-  def destroy
-    authorize :account_lock, :destroy?
-    @account.update(locked: false)
-    redirect_to admin_accounts_path, notice: 'Account unlocked'
-  end
-
-  private
-
-  def set_account
-    if params[:account_id].present?
-      @account = Account.find_by(slug: params[:account_id])
-    else
-      failure_redirect
-    end
-  rescue ActiveRecord::RecordNotFound
-    failure_redirect
-  end
-
-  def failure_redirect
-    redirect_to admin_accounts_path, alert: 'Failed to find the account'
-  end
-end

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,29 +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(
-      :video_conference_url_override,
-      :stream_url_override, 
-      :stream_key_override, 
-      :director_mode_video_embed
-    )
-  end
-end

app/controllers/api/releases_controller.rb

@@ -21,6 +21,7 @@ class Api::ReleasesController < Api::ApiController
     release.contract_template_id = @contract_template.id
     handle_attachments(release, release_create_params[:photos])
     release.save!(context: :native)
+    log_create_analytics
     after_create(release)
     handle_response(release, :created)
   end
@@ -45,14 +46,13 @@ class Api::ReleasesController < Api::ApiController
     if model_name == "acquired_media_release"
       mapping = {
         "#{model_name.camelize}": SerializableAcquiredMediaRelease,
-        FileInfo: SerializableFileInfo,
-        "ActiveStorage::Attachment".to_sym => ActiveStorage::SerializableAttachment,
+        FileInfo: SerializableFileInfo
       }
 
       render jsonapi: release,
            status: status,
            class: mapping,
-           include: [:files, :file_infos]
+           include: [:file_infos]
     else
       mapping = {
         "#{model_name.camelize}": show_serializable,
@@ -181,4 +181,8 @@ class Api::ReleasesController < Api::ApiController
     parameters = parameters.slice(*keys).except(:created_at, :updated_at, :id, :user_id, :signature)
     parameters
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_native_release, release_type: model_constant.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip, application: :ios)
+  end
 end

app/controllers/api/user_token_controller.rb

@@ -1,13 +1,5 @@
-# frozen_string_literal: true
-
-require './lib/knock_monkeypatch'
-
 class Api::UserTokenController < Knock::AuthTokenController
-  include Oath::ControllerHelpers
-  include RememberMe::Controller
-
   skip_before_action :verify_authenticity_token
-  before_action :sign_in_user
 
   rescue_from Exception, :with => :return_error
 
@@ -18,7 +10,7 @@ class Api::UserTokenController < Knock::AuthTokenController
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
-    logger.error "==Handled======="
+    logger.error "==Handled=======" 
     case exception
     when ActiveRecord::RecordNotFound
       @status = 404
@@ -35,18 +27,12 @@ class Api::UserTokenController < Knock::AuthTokenController
     end
 
     # for some reason render json_errors is not working
-    # simulating JSON API support
-    render json: {
+    # simulating JSON API support 
+    render json: { 
       errors: [{
         status: @status.to_s,
         title: @message
       }]
     }
   end
-
-  private
-
-  def sign_in_user
-    sign_in(entity)
-  end
 end

app/controllers/api/users_controller.rb

@@ -1,33 +0,0 @@
-# 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/appearance_releases_controller.rb

@@ -18,6 +18,7 @@ class AppearanceReleasesController < ApplicationController
     @appearance_release = build_appearance_release(appearance_release_params)
 
     if @appearance_release.save(context: :non_native)
+      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@appearance_release)
       redirect_to [@project, :appearance_releases], notice: "The release has been imported. #{link_to_import_another}"
@@ -126,4 +127,8 @@ class AppearanceReleasesController < ApplicationController
   def link_to_import_another
     view_context.link_to "Import Another", [:new, @project, :appearance_release]
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AppearanceRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/application_controller.rb

@@ -13,7 +13,6 @@ class ApplicationController < ActionController::Base
 
   include SetCurrentRequestDetails
   before_action :redirect_accountless
-  before_action :redirect_locked_accounts
 
   private
 
@@ -30,12 +29,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def redirect_locked_accounts
-    if Current.user && !Current.user.admin? && Current.account.present? && Current.account.locked?
-      redirect_to locked_account_path
-    end
-  end
-
   def signed_in_as_admin?
     signed_in? && current_user.admin?
   end

app/controllers/approvals_controller.rb

@@ -6,12 +6,9 @@ class ApprovalsController < ApplicationController
 
   def create
     @releasable.approve_by(current_user)
-    @releasable.approved_by_user_signature.attach(approved_by_user_signature_params) if signature_data.present?
 
-    if @releasable.save(context: :approval)
+    if @releasable.save
       redirect_to [@project, "#{@releasable_param.name.pluralize}"], notice: t('.release_approved', release_type: @releasable.model_name.human)
-    else
-      render :new
     end
   end
 
@@ -28,21 +25,4 @@ class ApprovalsController < ApplicationController
   def set_project
     @project = @releasable.project
   end
-
-  def releasable_params
-    params.require(releasable_param.name).permit(approved_by_user_signature: :data)
-  end
-
-  def signature_data
-    releasable_params.dig(:approved_by_user_signature, :data)
-  end
-
-  def approved_by_user_signature_params
-    {
-      data: signature_data,
-      filename: "approved_by_user_signature.png",
-      content_type: "image/png",
-      identify: false,
-    }
-  end
 end

app/controllers/broadcast_recordings_controller.rb

@@ -1,30 +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)
-    set_recordings
-  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
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/broadcasts_controller.rb

@@ -23,16 +23,12 @@ class BroadcastsController < ApplicationController
     else
       render :new
     end
-  rescue MuxRuby::ApiError, ActiveResource::ConnectionError => e
-    Raven.capture_exception(e)
-    redirect_to [@project, :broadcasts], alert: t(".alert")
   end
 
   def show
-    @conference_url = conference_url_for(@broadcast)
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+    @conference_url = url_for [@broadcast.project, @broadcast, :conference_meeting]
+    @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
 
@@ -76,7 +72,7 @@ class BroadcastsController < ApplicationController
   end
 
   def broadcast_params
-    params.require(:broadcast).permit(:name, :shoot_location_time_zone, files: [])
+    params.require(:broadcast).permit(:name, :shoot_location_time_zone, :conference_option, files: [])
   end
 
   def set_project
@@ -113,10 +109,6 @@ class BroadcastsController < ApplicationController
     results
   end
 
-  def conference_url_for(broadcast)
-    broadcast.video_conference_url_override.presence || url_for([broadcast.project, broadcast, :zoom_meeting])
-  end
-
   def log_create_analytics
     TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_live_stream, user_agent: request.user_agent, user_ip: request.remote_ip)
   end

app/controllers/callbacks_controller.rb

@@ -0,0 +1,22 @@
+class CallbacksController < ApplicationController
+  skip_before_action :require_login
+  skip_after_action :verify_authorized, except: :index
+  skip_after_action :verify_policy_scoped, only: :index
+  skip_before_action :verify_authenticity_token
+
+  def create
+    uid = request.env['omniauth.auth'][:uid]
+    token_data = request.env['omniauth.auth'][:credentials]
+
+    current_user&.tap do |user|
+      user.microsoft_user_id = uid
+      user.microsoft_access_token = token_data.token
+      user.microsoft_refresh_token = token_data.refresh_token
+      user.microsoft_token_expires_at = token_data.expires_at # Expiration time is returned in seconds
+      user.save
+    end
+
+    redirect_to profile_path
+  end
+
+end

app/controllers/conference_meetings_controller.rb

@@ -0,0 +1,45 @@
+class ConferenceMeetingsController < ApplicationController
+  require 'microsoft_graph'
+
+  def show
+    authorize broadcast = Broadcast.find(params[:broadcast_id])
+    case broadcast.conference_option
+    when 'zoom'
+      redirect_to broadcast.zoom_meeting_url
+    when 'ms_teams'
+      if broadcast.conference_join_url.nil?
+        begin
+          graph_api = MicrosoftGraph.new(
+            current_user,
+            ENV['AZURE_CLIENT_ID'],
+            ENV['AZURE_CLIENT_SECRET'],
+            ENV['AZURE_TENANT_ID'],
+            ENV['AZURE_SCOPES']
+          )
+
+          subject = "#{broadcast.name} Online Meeting"
+          teams_meeting = graph_api.create_teams_meeting(subject)
+          join_url = teams_meeting['joinUrl']
+
+          if join_url.present?
+            broadcast.conference_join_url = join_url
+            broadcast.save
+          else
+            raise StandardError, 'Failed to read teams meeting join URL'
+          end
+        rescue ActionController::InvalidAuthenticityToken => e
+          Rails.logger.error(e.message)
+          redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.not_authenticated')
+          return
+        rescue StandardError => e
+          Rails.logger.error(e.message)
+          redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.failed_to_join')
+          return
+        end
+      end
+      redirect_to broadcast.conference_join_url
+    else
+      redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.unknown_conference_option')
+    end
+  end
+end

app/controllers/contract_downloads_controller.rb

@@ -7,41 +7,28 @@ class ContractDownloadsController < ApplicationController
 
   def create
     authorize policy_scope(Download).create
-
-    download = @project.downloads.create!(release_type: release_type)
+    fetch_releases
+    
+    download = @project.downloads.create!(release_type: params[:release_type])
     other_downloads_in_progress = @project.downloads.unfinished_desc_order.offset(1)
 
     if other_downloads_in_progress.any?
-      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: release_type }, :layout => false
+      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: params[:release_type] }, :layout => false
       ProjectsChannel.broadcast_download_generation_update(download, in_progress_downloads_details)
     else
-      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: release_type.titleize))
+      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: params[:release_type].titleize))
     end
 
-    GenerateContractsZipJob.perform_later(@project, download, release_type, release_ids, search_query, type_filter)
+    GenerateContractsZipJob.perform_later(@project, download, params[:release_type], @releases.ids)
   end
 
   private
 
-  def release_type
-    params[:release_type]
+  def fetch_releases
+    @releases = policy_scope(@project.public_send(releases))
   end
 
-  def search_query
-    params[:search_query]
-  end
-
-  def type_filter
-    params[:type_filter]
-  end
-
-  def release_ids
-    JSON.parse(params[:release_ids])
-  rescue StandardError
-    []
-  end
-
-  def release_name(release_type)
-    release_type.constantize.model_name.plural
+  def releases
+    params[:release_type].constantize.model_name.plural
   end
 end

app/controllers/contract_templates_controller.rb

@@ -26,7 +26,6 @@ class ContractTemplatesController < ApplicationController
       contract = Contract.new releasable_instance, true
       send_file contract.to_pdf, download_attributes
     elsif @contract_template.save
-      log_create_analytics
       redirect_to [@project, :contract_templates], notice: t('.notice')
     else
       @release_type = contract_template_params[:release_type]
@@ -95,9 +94,7 @@ class ContractTemplatesController < ApplicationController
               :question_9_text, :question_10_text,
               :question_11_text, :question_12_text,
               :question_13_text, :question_14_text,
-              :question_15_text, :questionnaire_legal_text,
-              :exhibit_a_legal_text, :exhibit_a_question_text,
-              :exhibit_b_legal_text, :exhibit_b_question_text)
+              :question_15_text)
   end
 
   def download_attributes
@@ -107,8 +104,4 @@ class ContractTemplatesController < ApplicationController
       type: 'application/pdf'
     }
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_contract_template, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/contracts_controller.rb

@@ -3,7 +3,7 @@ class ContractsController < ApplicationController
     respond_to do |format|
       format.pdf { send_contract_pdf }
 
-      if Rails.env.development? || Rails.env.test?
+      if Rails.env.development?
         format.html { render_sample_html }
       end
     end

app/controllers/file_infos_controller.rb

@@ -1,4 +1,4 @@
-class FilesController < ApplicationController
+class FileInfosController < ApplicationController
   before_action :set_releasable
 
   layout "project"
@@ -16,7 +16,7 @@ class FilesController < ApplicationController
     
     if @releasable.update(releasable_params)
       SetTagsForReleasableJob.perform_later(@releasable)
-      redirect_to [@project, @releasable.model_name.plural], notice: "Files added successfully to the release."
+      redirect_to [@project, @releasable.model_name.plural], notice: t(".notice")
     else
       render :edit
     end
@@ -29,10 +29,16 @@ class FilesController < ApplicationController
   end
 
   def set_releasable
-    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :edit_files?
+    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :"#{action_name}_file_infos?"
   end
 
   def releasable_params
-    params.fetch(releasable_param.name, {}).permit(files: [])
+    params.fetch(releasable_param.name, {}).permit(
+      file_infos_attributes: [
+        :filename,
+        :content_type,
+        :byte_size
+      ],
+    )
   end
 end

app/controllers/location_releases_controller.rb

@@ -18,6 +18,7 @@ class LocationReleasesController < ApplicationController
     @location_release = build_location_release(location_release_params)
 
     if @location_release.save
+      log_create_analytics
       SetTagsForReleasableJob.perform_later(@location_release)
       redirect_to [@project, :location_releases], notice: t(".notice")
     else
@@ -89,4 +90,8 @@ class LocationReleasesController < ApplicationController
 
     results
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: LocationRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/locked_accounts_controller.rb

@@ -1,10 +0,0 @@
-class LockedAccountsController < ApplicationController
-  skip_before_action :redirect_locked_accounts
-  skip_after_action :verify_policy_scoped
-
-  def index
-    unless Current.account.locked?
-      redirect_to projects_path
-    end
-  end
-end

app/controllers/material_releases_controller.rb

@@ -18,6 +18,7 @@ class MaterialReleasesController < ApplicationController
     @material_release = build_material_release(material_release_params)
 
     if @material_release.save
+      log_create_analytics
       SetTagsForReleasableJob.perform_later(@material_release)
       redirect_to [@project, :material_releases], notice: t(".notice")
     else
@@ -49,64 +50,17 @@ class MaterialReleasesController < ApplicationController
 
   private
 
-  def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_company
-      person_email
-      person_title
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
-    ]
-  end
-
-  def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      guardian_photo
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_photo
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-    ]
-  end
-
   def material_release_params
-    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
+    params.require(:material_release).permit(
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
+      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
+      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :applicable_medium_id, :applicable_medium_text,
       :territory_id, :territory_text,
       :term_id, :term_text,
       :restriction_id, :restriction_text,
       :description,
-      :contract, files: []
+      :contract, { photos: [] }
     )
   end
 
@@ -135,4 +89,8 @@ class MaterialReleasesController < ApplicationController
 
     results
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MaterialRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/music_releases_controller.rb

@@ -22,6 +22,7 @@ class MusicReleasesController < ApplicationController
     @music_release = build_music_release(music_release_params)
 
     if @music_release.save
+      log_create_analytics
       SetTagsForReleasableJob.perform_later(@music_release)
       redirect_to [@project, :music_releases], notice: t(".notice")
     else
@@ -110,4 +111,8 @@ class MusicReleasesController < ApplicationController
 
     results
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MusicRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/pages_controller.rb

@@ -4,16 +4,4 @@ class PagesController < ApplicationController
   skip_after_action :verify_authorized
   skip_after_action :verify_policy_scoped
   skip_before_action :require_login
-
-  layout :layout_for_page
-
-  private
-
-  def layout_for_page
-    case params[:id]
-    when 'nanocosmos_player'
-      false
-    else
-    end
-  end
 end

app/controllers/projects_controller.rb

@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
   before_action :set_project, only: [:show, :edit, :update, :destroy]
 
   def index
-    @projects = filtered_projects.order_by_name
+    @projects = policy_scope(Current.account.projects).order_by_name
   end
 
   def new
@@ -46,20 +46,6 @@ class ProjectsController < ApplicationController
 
   private
 
-  def filtered_projects
-    results = projects
-    
-    if params[:query].present?
-      results = results.search(params[:query])
-    end
-
-    results
-  end
-
-  def projects
-    authorize policy_scope(Current.account.projects)
-  end
-
   def set_project
     @project = authorize projects.find(params[:id])
   end

app/controllers/public/acquired_media_releases_controller.rb

@@ -10,6 +10,7 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params_with_locale_and_contract_template)
 
     if @acquired_media_release.save(context: :native)
+      log_create_analytics
       after_create(@acquired_media_release)
     else
       render :new
@@ -99,8 +100,11 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
                                                    :signature_base64,
                                                    :locale, :contract_template,
                                                    categories: [],
-                                                   files: []
-                                                  )
+                                                   file_infos_attributes: %i[
+                                                     filename
+                                                     content_type
+                                                     byte_size
+                                                   ])
   end
 
   def acquired_media_release_params_with_locale
@@ -110,4 +114,8 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
   def acquired_media_release_params_with_locale_and_contract_template
     acquired_media_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AcquiredMediaRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/appearance_releases_controller.rb

@@ -10,6 +10,7 @@ class Public::AppearanceReleasesController < Public::BaseController
     @appearance_release = build_appearance_release(appearance_release_params_with_locale_and_contract_template)
 
     if @appearance_release.save(context: :native)
+      log_create_analytics
       after_create(@appearance_release)
     else
       render :new
@@ -86,35 +87,12 @@ class Public::AppearanceReleasesController < Public::BaseController
     ]
   end
 
-  def questionnaire_params
-    [
-      :question_1_answer,
-      :question_2_answer,
-      :question_3_answer,
-      :question_4_answer,
-      :question_5_answer,
-      :question_6_answer,
-      :question_7_answer,
-      :question_8_answer,
-      :question_9_answer,
-      :question_10_answer,
-      :question_11_answer,
-      :question_12_answer,
-      :question_13_answer,
-      :question_14_answer,
-      :question_15_answer,
-    ]
-  end
-
   def appearance_release_params
     params.require(:appearance_release).permit(person_params, guardian_params,
                                                second_guardian_params,
-                                               questionnaire_params,
                                                :minor, :signature_base64,
                                                :person_date_of_birth,
-                                               :locale, :contract_template,
-                                               :exhibit_a_answer, :exhibit_b_answer
-                                              )
+                                               :locale, :contract_template)
   end
 
   def appearance_release_params_with_locale
@@ -124,4 +102,8 @@ class Public::AppearanceReleasesController < Public::BaseController
   def appearance_release_params_with_locale_and_contract_template
     appearance_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AppearanceRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/broadcast_recording_starrings_controller.rb

@@ -1,24 +0,0 @@
-class Public::BroadcastRecordingStarringsController < Public::BaseController
-  skip_after_action :verify_authorized
-  before_action :set_broadcast
-  before_action :set_recording
-  
-  def create
-    @recording.toggle_star
-    set_recordings
-  end
-
-  private
-
-  def set_broadcast
-    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
-  end
-
-  def set_recording
-    @recording = @broadcast.broadcast_recordings.find(params[:broadcast_recording_id])
-  end
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/public/broadcast_recordings_controller.rb

@@ -1,31 +0,0 @@
-class Public::BroadcastRecordingsController < Public::BaseController
-  skip_after_action :verify_authorized
-  before_action :set_broadcast, only: [:edit, :update]
-  before_action :set_recording, only: [:edit, :update]
-  
-  def edit
-  end
-
-  def update
-    @recording.update(broadcast_recording_params)
-    set_recordings
-  end
-
-  private
-
-  def broadcast_recording_params
-    params.require(:broadcast_recording).permit(:name, :description)
-  end
-
-  def set_broadcast
-    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
-  end
-
-  def set_recording
-    @recording = @broadcast.broadcast_recordings.find(params[:id])
-  end
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/public/broadcasts_controller.rb

@@ -3,9 +3,9 @@ class Public::BroadcastsController < Public::BaseController
   before_action :set_broadcast, only: [:show, :update]
 
   def show
-    @conference_url = conference_url_for(@broadcast)
+    @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'
@@ -43,10 +43,6 @@ class Public::BroadcastsController < Public::BaseController
     end
   end
 
-  def conference_url_for(broadcast)
-    broadcast.video_conference_url_override.presence || broadcast_zoom_meeting_url(broadcast.token)
-  end
-
   class MultiViewBroadcast
     include Rails.application.routes.url_helpers
 

app/controllers/public/location_releases_controller.rb

@@ -10,6 +10,7 @@ class Public::LocationReleasesController < Public::BaseController
     @location_release = build_location_release(location_release_params_with_locale_and_contract_template)
 
     if @location_release.save(context: :native)
+      log_create_analytics
       after_create(@location_release)
     else
       render :new
@@ -75,4 +76,8 @@ class Public::LocationReleasesController < Public::BaseController
   def location_release_params_with_locale_and_contract_template
     location_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: LocationRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/material_releases_controller.rb

@@ -10,6 +10,7 @@ class Public::MaterialReleasesController < Public::BaseController
     @material_release = build_material_release(material_release_params_with_locale_and_contract_template)
 
     if @material_release.save(context: :native)
+      log_create_analytics
       after_create(@material_release)
     else
       render :new
@@ -38,61 +39,13 @@ class Public::MaterialReleasesController < Public::BaseController
     authorize material_releases.build(params)
   end
 
-  def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_email
-      person_title
-      person_company
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
-    ]
-  end
-
-  def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      guardian_photo
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_photo
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-    ]
-  end
-
-
   def material_release_params
-    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
+    params.require(:material_release).permit(
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
+      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
+      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :signature_base64,
-      :locale, :contract_template, :description, files: []
+      :locale, :contract_template, :description, photos: []
     )
   end
 
@@ -103,4 +56,8 @@ class Public::MaterialReleasesController < Public::BaseController
   def material_release_params_with_locale_and_contract_template
     material_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MaterialRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/medical_releases_controller.rb

@@ -12,6 +12,7 @@ class Public::MedicalReleasesController < Public::BaseController
       if @medical_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@medical_release)
       end
+      log_create_analytics
     else
       render :new
     end
@@ -115,4 +116,8 @@ class Public::MedicalReleasesController < Public::BaseController
   def medical_release_params_with_locale_and_contract_template
     medical_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MedicalRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/misc_releases_controller.rb

@@ -12,6 +12,7 @@ class Public::MiscReleasesController < Public::BaseController
       if @misc_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@misc_release)
       end
+      log_create_analytics
     else
       render :new
     end
@@ -49,14 +50,6 @@ class Public::MiscReleasesController < Public::BaseController
         :signature_base64,
         :locale,
         :contract_template,
-        :applicable_medium_id,
-        :applicable_medium_text,
-        :territory_id,
-        :territory_text,
-        :term_id,
-        :term_text,
-        :restriction_id,
-        :restriction_text,
         photos: [],
       )
   end
@@ -120,4 +113,8 @@ class Public::MiscReleasesController < Public::BaseController
   def misc_release_params_with_locale_and_contract_template
     misc_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MiscRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/public/talent_releases_controller.rb

@@ -10,6 +10,7 @@ class Public::TalentReleasesController < Public::BaseController
     @talent_release = build_talent_release(talent_release_params_with_locale_and_contract_template)
 
     if @talent_release.save(context: :native)
+      log_create_analytics
       after_create(@talent_release)
     else
       render :new
@@ -107,4 +108,8 @@ class Public::TalentReleasesController < Public::BaseController
   def talent_release_params_with_locale_and_contract_template
     talent_release_params_with_locale.merge(contract_template: @contract_template)
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: TalentRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

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/controllers/talent_releases_controller.rb

@@ -18,6 +18,7 @@ class TalentReleasesController < ApplicationController
     @talent_release = build_talent_release(talent_release_params)
 
     if @talent_release.save
+      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@talent_release)
       redirect_to [@project, :talent_releases], notice: t(".notice")
@@ -136,4 +137,8 @@ class TalentReleasesController < ApplicationController
 
     results
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: TalentRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/video_analyses/acquired_media_releases_controller.rb

@@ -2,7 +2,7 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
   before_action :set_video
 
   def index
-    @acquired_media_files = filtered_files
+    @acquired_media_file_infos = filtered_file_infos
   end
 
   private
@@ -15,12 +15,12 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
     params[:query]
   end
   
-  def filtered_files
+  def filtered_file_infos
     releasables = policy_scope(@video.acquired_media_releases)
-    results = ActiveStorage::Attachment.where(record: releasables, name: "files")
+    results = FileInfo.where(releasable: releasables)
 
     if query_param.present?
-      results = results.joins(:blob).where("active_storage_blobs.filename ILIKE ?", "%#{query_param}%")
+      results = results.search_filename(query_param)
     end
 
     results

app/controllers/video_release_confirmations_controller.rb

@@ -74,7 +74,6 @@ class VideoReleaseConfirmationsController < ApplicationController
     params.require(:video_release_confirmation).permit(
       :time_elapsed,
       :file_info_id,
-      :file_id,
       :channel,
       :timecode_in,
       :timecode_out,

app/helpers/broadcast_conferences_helper.rb

@@ -0,0 +1,17 @@
+module BroadcastConferencesHelper
+  def options_for_conference_select
+    [
+        ['Zoom', 'zoom'],
+        ['MS Teams', 'ms_teams']
+    ]
+  end
+
+  def conference_option_name_from_key(key)
+    option = options_for_conference_select.find { |option| option[1] == key }
+    if option.present?
+      option.first
+    else
+      'Unknown conference option'
+    end
+  end
+end

app/helpers/dropzone_helper.rb

@@ -40,13 +40,4 @@ module DropzoneHelper
       { name: file_info.filename, size: file_info.byte_size, type: file_info.content_type }
     end.to_json
   end
-  
-  def dropzone_file_size_limit_for(releasable)
-    case releasable.model_name.param_key
-    when "material_release", "acquired_media_release"
-      1000000
-    else
-      256
-    end
-  end
 end

app/helpers/mail_helper.rb

@@ -6,6 +6,6 @@ module MailHelper
       "1. Tell us the name of the video: \n\n" \
       "2. Attach each EDL to this email. Please make sure to indicate whether the EDL is a Video Only, Graphics Only, or Audio Only EDL."
 
-    mail_to "info@mesuite.ai", content, subject: subject, body: body
+    mail_to "info@bigmedia.ai", content, subject: subject, body: body
   end
 end

app/helpers/tags_helper.rb

@@ -17,7 +17,6 @@ module TagsHelper
         disable_with: disabled_content,
       },
       form: {
-        id: "selected_releases_form",
         data: {
           releasable_ids: [],
         },

app/javascript/packs/active_storage_dropzone.js

@@ -12,7 +12,6 @@ class ActiveStorageDropzone {
     var acceptedFiles = $(element).data("accepted-files") || "image/*";
     var dictDefaultMessage = $(element).data("placeholder") || "Drop files here";
     var submitButton = $($(element).data("submit-button"));
-    var maxFileSize = $(element).data("max-file-size");
     var that = this;
 
     this.myDropzone = new this.DropzoneClass(element, {
@@ -21,7 +20,6 @@ class ActiveStorageDropzone {
       acceptedFiles: acceptedFiles,
       parallelUploads: 30,
       dictDefaultMessage: dictDefaultMessage,
-      maxFilesize: maxFileSize,
 
       init: function () {
         this.on("sending", (file, xhr, formData) => {
@@ -69,23 +67,6 @@ class ActiveStorageDropzone {
           var upload = new that.UploaderClass(file, url, delegate);
           createUpload(this, upload);
         });
-
-        this.on("addedfile", function(file) {
-          // Show download link in dropzone previews
-
-          let div = document.createElement("div");
-          let anchor = document.createElement("a");
-          let download_icon = "<i class='fa fa-download' aria-hidden='true'></i> Download";
-
-          anchor.innerHTML = download_icon;
-          anchor.href = file.dataURL;
-          anchor.setAttribute('target', '_blank');
-          anchor.setAttribute('style', 'background-color: rgba(255, 255, 255, 0.4); padding: 0 0.4em; border: 1px solid transparent; text-decoration: none;');
-          div.append(anchor);
-          div.setAttribute('class', 'dz-download-link')
-          div.setAttribute('style', 'margin-top: 1em;')
-          $(file.previewElement.childNodes[3]).append(div);
-        });
       },
     });
 

app/jobs/generate_contracts_zip_job.rb

@@ -7,14 +7,13 @@ class GenerateContractsZipJob < ApplicationJob
     @project = job.arguments.first
     @download = job.arguments.second
     @release_type = job.arguments.third
-    @release_ids = job.arguments.fourth
-    @search_query = job.arguments.fifth
-    @type_filter = job.arguments[5]
-    @folder_name = "#{@project.name.parameterize}_#{release_name.gsub('_', '-')}"
+    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
-  def perform(project, download, release_type, release_ids, search_query, type_filter)
+  def perform(project, download, release_type, release_ids)
+    releases = project.public_send(get_release_name(release_type)).where(id: release_ids)
+
     ::ReleaseContractCollectionService.new(releases, @folder_name).build do |dir, files|
       zipfile_name = "#{dir}/#{@folder_name}.zip"
       Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
@@ -32,7 +31,7 @@ class GenerateContractsZipJob < ApplicationJob
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
-
+    
     @download.failure!
     ProjectsChannel.broadcast_download_generation_update(@download, I18n.t("contract_downloads.download.failure"))
   end
@@ -62,32 +61,7 @@ class GenerateContractsZipJob < ApplicationJob
     end
   end
 
-  def release_name
-    @release_type.constantize.model_name.plural
-  end
-
-  def all_releases
-    @project.public_send(release_name)
-  end
-
-  def releases
-    if @release_ids.any?
-      return all_releases.where(id: @release_ids)
-    end
-
-    results = all_releases
-    if all_releases.respond_to?(:complete, :incomplete)
-      results = case @type_filter
-                when 'complete'
-                  all_releases.complete
-                when 'incomplete'
-                  all_releases.incomplete
-                else
-                  all_releases
-                end
-    end
-
-    results = results.search(@search_query) if @search_query.present?
-    results
+  def get_release_name(release_type)
+    release_type.constantize.model_name.plural
   end
 end

app/jobs/match_appearance_releases_job.rb

@@ -15,7 +15,6 @@ class MatchAppearanceReleasesJob < ApplicationJob
     matches = response.matches || []
     key_signed_id_hash = Hash[filtered_attachments_object[:keys].zip(filtered_attachments_object[:signed_ids])]
     handle_matches matches, project, key_signed_id_hash
-    handle_unmatches matches, project, key_signed_id_hash
     matching_request.destroy
   end
 
@@ -41,21 +40,6 @@ class MatchAppearanceReleasesJob < ApplicationJob
     end
   end
 
-  def handle_unmatches(matches, project, key_signed_id_hash)
-    matched_keys = matches.flat_map { |match| match.contracts + match.headshots }
-    unmatches = key_signed_id_hash.find_all { |key, _| !key.in?(matched_keys) }
-
-    unmatches.each do |key, signed_id|
-      blob = ActiveStorage::Blob.find_signed signed_id
-
-      if blob.image?
-        create_release(project, nil, signed_id, nil)
-      else
-        create_release(project, signed_id, nil, nil)
-      end
-    end
-  end
-
   def create_release(project, contract, headshot, identifier)
     random_contract_no = AppearanceRelease.random_contract_number.to_s
     is_incomplete = contract.nil? || headshot.nil?

app/mailers/admin_mailer.rb

@@ -1,5 +1,5 @@
 class AdminMailer < ApplicationMailer
-  default to: %w[bray@mesuite.ai]
+  default to: %w(bray@bigmedia.ai lee@bigmedia.ai)
 
   def new_video(video)
     @video = video

app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@mesuite.ai" }
+  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@bigmedia.ai" }
   layout "mailer"
 end

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
@@ -64,19 +63,6 @@ class Account < ApplicationRecord
       ])).sum(:byte_size).to_f
   end
 
-  def total_number_of_releases
-    [
-      MiscRelease.where(project: projects).size,
-      AppearanceRelease.where(project: projects).size,
-      TalentRelease.where(project: projects).size,
-      MaterialRelease.where(project: projects).size,
-      MedicalRelease.where(project: projects).size, 
-      LocationRelease.where(project: projects).size,
-      AcquiredMediaRelease.where(project: projects).size,
-      MusicRelease.where(project: projects).size
-    ].sum
-  end
-
   def to_param
     slug
   end
@@ -98,7 +84,7 @@ class Account < ApplicationRecord
   end
 
   def taskme_enabled?
-    plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme"
+    ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
   end
 
   def plan_name

app/models/acquired_media_release.rb

@@ -15,18 +15,16 @@ class AcquiredMediaRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
-  include FilesFilterable
-  
+
   class << self
     def custom_csv_exportable_headers
-      %i[name files_count owner_info]
+      %i[name file_infos_count]
     end
   end
 
-  # This association needs to be removed after changing the API. Removing it right now will cause failure in API specs.
   has_many :file_infos, as: :releasable, dependent: :destroy
 
-  has_many_attached :files
+  accepts_nested_attributes_for :file_infos
 
   composed_of :person_address,
               class_name: "Address",
@@ -104,7 +102,7 @@ class AcquiredMediaRelease < ApplicationRecord
     true
   end
 
-  def files_count
-    files.any? ? files.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
+  def file_infos_count
+    file_infos.any? ? file_infos.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
   end
 end

app/models/app_host.rb

@@ -15,7 +15,7 @@ class AppHost
   end
 
   def domain_with_port
-    [domain, port].compact.join(":")
+    [domain, port].reject(&:blank?).compact.join(":")
   end
 
   def protocol
@@ -40,7 +40,7 @@ class AppHost
       use_ssl: false,
     },
     production: {
-      host: "mesuite.ai",
+      host: "bigmedia.ai",
       use_ssl: true,
     }
   }

app/models/appearance_release.rb

@@ -17,9 +17,6 @@ class AppearanceRelease < ApplicationRecord
   include SecondGuardianName
   include CsvExportable
   include Approvable
-  include Amendmenable
-
-  NUMBER_OF_CUSTOM_FIELDS = 15
 
   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
@@ -49,13 +45,11 @@ class Broadcast < ApplicationRecord
   private
 
   def create_mux_live_stream
-    stream = MuxLiveStream.create_with_simulcast
+    stream = MuxLiveStream.new
 
     self.stream_uid = stream.id
     self.stream_key = stream.key
     self.stream_playback_uid = stream.playback_id
-    self.simulcast_uid = stream.simulcast_id
-    self.director_mode_video_embed ||= stream.simulcast_destination.try(:playback_embed)
     self.save!
   end
 

app/models/broadcast_recording.rb

@@ -5,12 +5,8 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
-  scope :visible, -> { where(hidden: false) }
-
-  before_save :set_title_and_description
-
   def download_url
-    "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{name}"
+    "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
   end
 
   def playback_url
@@ -18,21 +14,6 @@ class BroadcastRecording < ApplicationRecord
   end
 
   def download_file_name
-    "#{broadcast_name}_Date_#{Time.now.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{Time.now.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
-  end
-
-  def toggle_star
-    toggle! :starred
-  end
-
-  def thumbnail_url(width = 300)
-    "https://image.mux.com/#{asset_playback_uid}/thumbnail.jpg?width=#{width}"
-  end
-
-  private
-
-  def set_title_and_description
-    self.name ||= download_file_name
-    self.description ||= "No description provided for this recording."
+    "#{broadcast_name}_Date_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
   end
 end

app/models/concerns/approvable.rb

@@ -1,24 +1,15 @@
 module Approvable
   extend ActiveSupport::Concern
-
+  
   included do
-    include ActiveStorageSupport::SupportForBase64
-
-    has_one_base64_attached :approved_by_user_signature
-
-    # Requires signature when saving in the approval context
-    with_options on: :approval do
-      validates :approved_by_user_signature, attached: true
-    end
-
     def approve_by(user)
       return unless approved_at.nil?
-
+  
       self.approved_by_user_name = user.full_name
       self.approved_by_user_email = user.email
-      self.approved_at = BigMediaTime.time_zone_now
+      self.approved_at = Time.zone.now
     end
-
+  
     def approved?
       self.approved_at.present?
     end

app/models/concerns/csv_exportable.rb

@@ -3,8 +3,8 @@
 module CsvExportable
   extend ActiveSupport::Concern
 
-  COMMON_HEADERS = %i[approved notes tags signed_at].freeze
-  COMMON_VALUES = %w[approved? clean_notes clean_tags signed_on].freeze
+  COMMON_HEADERS = %i[approved? notes tags signed_at].freeze
+  COMMON_VALUES = %w[clean_notes clean_tags signed_on].freeze
 
   included do
     class << self
@@ -29,20 +29,11 @@ module CsvExportable
 
     private
 
-    def owner_info
-      compact_contact_info(name: person_name, address: person_address, phone: person_phone, email: person_email)
-    end
-
     def contact_info
-      owner_info
-    end
-
-    def compact_contact_info(name: nil, address: nil, phone: nil, email: nil)
       contact_info = ''
-      contact_info += "#{name}; " if name.present?
-      contact_info += "#{address}; " if address.present?
-      contact_info += "P: #{phone}; " if phone.present?
-      contact_info += "E: #{email}" if email.present?
+      contact_info += "#{person_address}; " if person_address.present?
+      contact_info += "P: #{person_phone}; " if person_phone.present?
+      contact_info += "E: #{person_email}" if person_email.present?
       contact_info.delete_suffix '; '
     end
 

app/models/concerns/files_filterable.rb

@@ -1,17 +0,0 @@
-module FilesFilterable
-  extend ActiveSupport::Concern
-
-  included do
-    def image_files
-      files_blobs.where("content_type ILIKE ?", "%image%")
-    end
-  
-    def video_files
-      files_blobs.where("content_type ILIKE ?", "%video%")
-    end
-  
-    def other_files
-      files_blobs.where("NOT content_type ILIKE ANY (array[?])", ["%image%", "%video%"])
-    end
-  end
-end

app/models/contract_template.rb

@@ -18,18 +18,15 @@ class ContractTemplate < ApplicationRecord
   has_many :medical_releases, dependent: :restrict_with_error
   has_many :misc_releases, dependent: :restrict_with_error
 
-  monetize :fee_old_cents
+  monetize :fee_cents
   has_rich_text :body
   has_rich_text :guardian_clause
   has_rich_text :signature_legal_text
   has_rich_text :amendment_clause
-  has_rich_text :exhibit_a_legal_text
-  has_rich_text :exhibit_b_legal_text
-  has_rich_text :questionnaire_legal_text
 
   validates :name, presence: true
   validates :release_type, presence: true
-  validates :fee_old_cents, numericality: {
+  validates :fee_cents, numericality: {
     greater_than_or_equal_to: 0,
     less_than_or_equal_to: 99_999_999_99
   }
@@ -50,11 +47,7 @@ class ContractTemplate < ApplicationRecord
   enum accessibility: [:public_template, :private_template]
 
   def fee?
-    fee.present?
-  end
-
-  def fee_old?
-    !fee_old.zero?
+    !fee.zero?
   end
 
   def releases
@@ -77,14 +70,6 @@ class ContractTemplate < ApplicationRecord
     (1..NUMBER_OF_CUSTOM_FIELDS).any? { |n| public_send("question_#{n}_text").presence }
   end
 
-  def has_exhibit_a?
-    exhibit_a_legal_text.present?
-  end
-
-  def has_exhibit_b?
-    exhibit_b_legal_text.present?
-  end
-
   def editable?
     releases.size.zero?
   end

app/models/location_release.rb

@@ -16,7 +16,7 @@ class LocationRelease < ApplicationRecord
 
   class << self
     def custom_csv_exportable_headers
-      %i[location_info owner_info amendment_signed_column]
+      %i[name address]
     end
   end
 
@@ -67,18 +67,6 @@ class LocationRelease < ApplicationRecord
     true
   end
 
-  def location_info
-    compact_contact_info(name: name, address: address)
-  end
-
-  def amendment_signed_column
-    if amendment_signable?
-      amendment_signed?
-    else
-      I18n.t('location_releases.csv.no_amendment_clause')
-    end
-  end
-
   private
 
   def end_date_after_start_date

app/models/material_release.rb

@@ -3,7 +3,7 @@ class MaterialRelease < ApplicationRecord
   include Contractable
   include Exploitable
   include Notable
-  include Photoable # This association needs to be removed after changing the API. Removing it right now will cause failure in API specs.
+  include Photoable
   include Releasable
   include Searchable
   include Signable
@@ -12,15 +12,10 @@ class MaterialRelease < ApplicationRecord
   include PersonName
   include CsvExportable
   include Approvable
-  include GuardianPhotoable
-  include SecondGuardianPhotoable
-  include GuardianName
-  include SecondGuardianName
-  include FilesFilterable
 
   class << self
     def custom_csv_exportable_headers
-      %i[name owner_info files_count]
+      %i[name]
     end
   end
 
@@ -35,41 +30,6 @@ class MaterialRelease < ApplicationRecord
                 %w(person_address_country country)
               ]
 
-  composed_of :guardian_address,
-              class_name: 'Address',
-              mapping: [
-                  %w[guardian_address_street1 street1],
-                  %w[guardian_address_street2 street2],
-                  %w[guardian_address_city city],
-                  %w[guardian_address_state state],
-                  %w[guardian_address_zip zip],
-                  %w[guardian_address_country country]
-              ]
-
-  composed_of :guardian_2_address,
-              class_name: 'Address',
-              mapping: [
-                  %w[guardian_2_address_street1 street1],
-                  %w[guardian_2_address_street2 street2],
-                  %w[guardian_2_address_city city],
-                  %w[guardian_2_address_state state],
-                  %w[guardian_2_address_zip zip],
-                  %w[guardian_2_address_country country]
-              ]
-  
-  has_many_attached :files
-
-  # We don't care for the argument but method WILL receive option name
-  # when called from inside with_option block, hence * argument
-  def self.face_photo_acceptable_content_types(*)
-    ['image/png', 'image/jpeg']
-  end
-
-  def self.acceptable_import_file_extensions
-    ['.png', '.jpeg', '.jpg', '.pdf']
-  end
-
-
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -87,15 +47,11 @@ class MaterialRelease < ApplicationRecord
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
 
-  def second_guardian_present?
-    guardian_2_first_name.present?
+  def minor?
+    false
   end
 
   def uses_edl?
     true
   end
-
-  def files_count
-    files.any? ? files.size : I18n.t('material_releases.material_release.no_media')
-  end
 end

app/models/millicast_destination.rb

@@ -1,41 +0,0 @@
-class MillicastDestination
-  attr_reader :name, :token
-  
-  def self.create
-    token_stream_name = SecureRandom.urlsafe_base64
-
-    publish_token = Millicast::PublishToken.create(
-      label: SecureRandom.urlsafe_base64, 
-      streams: [
-        { streamName: token_stream_name }
-      ]
-    )
-
-    new(token_stream_name, publish_token.data.token)
-  end
-
-  def initialize(name, token)
-    @name = name
-    @token = token
-  end
-
-  def account_id
-    ENV["MILLICAST_ACCOUNT_ID"]
-  end
-
-  def key
-    "#{name}?token=#{token}"
-  end
-
-  def url
-    "rtmp://live-rtmp-pub.millicast.com:1935/v2/pub"
-  end
-
-  def playback_url
-    "https://viewer.millicast.com/v2?streamId=#{account_id}/#{name}"
-  end
-
-  def playback_embed
-    "<iframe src=\"#{playback_url}\" allowfullscreen width=\"640\" height=\"480\"></iframe>"
-  end
-end

app/models/misc_release.rb

@@ -11,7 +11,6 @@ class MiscRelease < ApplicationRecord
   include GuardianPhotoable
   include CsvExportable
   include Approvable
-  include Exploitable
 
   class << self
     def custom_csv_exportable_headers

app/models/mux_live_stream.rb

@@ -1,15 +1,4 @@
 class MuxLiveStream
-  attr_accessor :simulcast_id, :simulcast_destination
-
-  def self.create_with_simulcast(destination = nil)
-    destination ||= MillicastDestination.create
-
-    MuxLiveStream.new.tap do |stream|
-      stream.id # force the live stream to be created by calling for its id
-      stream.create_simulcast(destination)
-    end
-  end
-
   def id
     live_stream.data.id
   end
@@ -26,15 +15,6 @@ class MuxLiveStream
     client.delete_live_stream(stream_uid)
   end
 
-  def create_simulcast(destination)
-    return if test_mode_enabled?
-
-    request = MuxRuby::CreateSimulcastTargetRequest.new(stream_key: destination.key, url: destination.url)
-    result = client.create_live_stream_simulcast_target(id, request)
-    self.simulcast_destination = destination
-    self.simulcast_id = result.data.id
-  end
-
   private
 
   def live_stream

app/models/project.rb

@@ -2,7 +2,6 @@ class Project < ApplicationRecord
   include Archivable
   include Filterable
   include Syncable
-  include PgSearch
 
   SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical misc)
   AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical misc)
@@ -43,15 +42,6 @@ class Project < ApplicationRecord
     }
   end
 
-  pg_search_scope :search, {
-    against: [:name],
-    using: {
-      tsearch: {any_word: true, prefix: true},
-      trigram: {},
-      dmetaphone: {any_word: true}
-    }
-  }
-
   validates :name, presence: true, uniqueness: { scope: :account_id }
 
   filterable_by :active, :inactive, :archived

app/models/video_release_confirmation.rb

@@ -9,10 +9,6 @@ class VideoReleaseConfirmation < ApplicationRecord
     Timecode.from_seconds(time_elapsed.to_f).to_s
   end
 
-  def file
-    ActiveStorage::Attachment.find(file_id)
-  end
-
   private
 
   class ReleaseRankOrder

app/policies/account_lock_policy.rb

@@ -1,9 +0,0 @@
-class AccountLockPolicy < ApplicationPolicy
-  def create?
-    user.admin?
-  end
-
-  def destroy?
-    user.admin?
-  end
-end

app/policies/acquired_media_release_policy.rb

@@ -19,7 +19,11 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
     true
   end
 
-  def edit_files?
+  def edit_file_infos?
+    true
+  end
+
+  def update_file_infos?
     true
   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,21 +0,0 @@
-class BroadcastRecordingPolicy < ApplicationPolicy
-  def create?
-    true
-  end
-
-  def destroy?
-    if user.nil? || user.user.nil?
-      return false
-    end
-
-    user.manager? || user.account_manager?
-  end
-
-  def edit?
-    true
-  end
-
-  def update?
-    true
-  end
-end

app/policies/material_release_policy.rb

@@ -19,16 +19,12 @@ class MaterialReleasePolicy < ReleasePolicy
     user.manager? || user.account_manager?
   end
 
-  def edit_files?
+  def edit_photos?
     true
   end
 
-  def update_files?
-    edit_files?
-  end
-
   def update_photos?
-    edit_files?
+    edit_photos?
   end
 
   def tag_multiple?

app/serializers/serializable_acquired_media_release.rb

@@ -7,7 +7,7 @@ class SerializableAcquiredMediaRelease < JSONAPI::Serializable::Resource
               :person_title, :person_company, :created_at, :updated_at, :collection_uid, :territory_old, :term_old,
               :applicable_medium_id, :applicable_medium_text, :territory_id, :territory_text, :term_id, :term_text,
               :restriction_id, :restriction_text, :categories, :description, :tag_list
-
+  
   has_many :file_infos do
     data do
       @object.file_infos
@@ -16,15 +16,5 @@ class SerializableAcquiredMediaRelease < JSONAPI::Serializable::Resource
     meta do
       { count: @object.file_infos.size }
     end
-  end
-
-  has_many :files do
-    data do
-      @object.files
-    end
-
-    meta do
-      { count: @object.files.size }
-    end
-  end
+  end            
 end

app/serializers/serializable_user.rb

@@ -1,9 +1,5 @@
 class SerializableUser < JSONAPI::Serializable::Resource
   type "user"
 
-  attributes :email, :full_name
-
-  attribute :company_name do
-    @object.primary_account.name
-  end
+  attributes :email
 end

app/services/release_contract_collection_service.rb

@@ -24,7 +24,7 @@ class ReleaseContractCollectionService
       end
 
       files = Dir.entries("#{dir}/").select { |f| !File.directory? f }
-      # raise StandardError.new "Contracts or Contract Templates not found." unless files.any?
+      raise StandardError.new "Contracts or Contract Templates not found." unless files.any?
       yield(dir, files)
     }
   end

app/telemetry/analytics.rb

@@ -169,24 +169,6 @@ class Analytics
       )
     end
   end
-
-  def track_create_contract_template(user_agent:, user_ip:)
-    if analytics_enabled?
-      identify
-      track(
-        {
-          user_id: user.id,
-          event: "Contract Template Created",
-          properties: {
-            account: account.try(:name),
-            account_id: account.try(:id),
-            user_agent: user_agent,
-            ip: user_ip,
-          },
-        }
-      )
-    end
-  end
   
   private
 

app/views/account_auths/_account_logo_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_with model: account, url: account_path, html: { autocorrect: :off, autocapitalize: :none, autocomplete: :off, spellcheck: false }, layout: :inline, remote: true do |form| %>
-  <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1", required: true %>
+  <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1" %>
   <%= form.button(fa_icon("upload", text: t(".submit")), class: "btn btn-md btn-primary", data: { disable_with: t("shared.disable_with") }) %>
 <% end %>

app/views/accounts/_form.html.erb

@@ -6,7 +6,7 @@
   <%= form.email_field :email, class: "form-group" %>
   <%= form.password_field :password %>
   <%= form.text_field :account_name, label: 'Account Name' %>
-  <%= form.select :interested_product_name, options_for_select(["I'm interested in all products", "ME Suite PRO", "DirectME", "ReleaseME", "CastME", "EditME", "DeliverME", "ExpenseME"]), { label: "What product are you most interested in?" }, { class: "form-control custom-select" } %>
+  <%= form.select :interested_product_name, options_for_select(["I'm interested in all products", "DirectME", "ReleaseME", "CastME", "EditME", "DeliverME", "ExpenseME"]), { label: "What product are you most interested in?" }, { class: "form-control custom-select" } %>
   <div class="pt-3">
     <%= form.submit "Start Free Trial", class: "btn btn-block btn-danger font-weight-bold" %>
   </div>

app/views/accounts/new.html.erb

@@ -4,9 +4,6 @@
       <h3>Welcome To <%= suite_wordmark("d-inline-block") %></h3>
       <div class="mt-4">
         <p>Sign up for a <strong>14 Day Free Trial</strong> which includes full access to the following products. No credit card required!</p>
-        <div class="d-flex justify-content-between pb-2">
-          <div><%= image_tag "ME_PRO_black.png", width: "96.66%" %></div>
-        </div>
         <div class="d-flex justify-content-between pb-2">
           <div><%= image_tag "logo_directme.png", width: "90%" %></div>
           <div><%= image_tag "logo_releaseme.png", width: "90%" %></div>

app/views/acquired_media_releases/_acquired_media_release.html.erb

@@ -12,15 +12,12 @@
     <%= acquired_media_release.name %>
   </td>
   <td>
-    <% if acquired_media_release.files.any? %>
-      <%= acquired_media_release.files.size %>
+    <% if acquired_media_release.file_infos.any? %>
+      <%= acquired_media_release.file_infos.size %>
     <% else %>
       <%= fa_icon("warning", text: t(".no_media"), class: "text-danger") %>
     <% end %>
   </td>
-  <td>
-    <%= contact_info_for(acquired_media_release.contact_person) %>
-  </td>
   <td>
     <%= notes_preview acquired_media_release.notes.order_by_recent %>
   </td>
@@ -40,8 +37,8 @@
         <% if policy(acquired_media_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, acquired_media_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
-        <% if policy(acquired_media_release).edit_files? %>
-          <%= link_to fa_icon("file fw", text: "Media"), [:edit, acquired_media_release, :files], class: "dropdown-item" %>
+        <% if policy(acquired_media_release).edit_file_infos? %>
+          <%= link_to fa_icon("file fw", text: "Add Media"), [:edit, acquired_media_release, :file_infos], class: "dropdown-item" %>
         <% end %>
         <% if policy(Contract).show? && (acquired_media_release.contract.attached? || acquired_media_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [acquired_media_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>

app/views/acquired_media_releases/_form.html.erb

@@ -44,7 +44,7 @@
       <%= fa_icon "warning" %>
       <strong>For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence.</strong>
     </div>
-    <%= render "shared/releasable_files_dropzone", form: form, releasable: acquired_media_release %>
+    <%= render "shared/file_infos_dropzone", form: form, releasable: acquired_media_release %>
 
     <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
       <br>

app/views/acquired_media_releases/index.html.erb

@@ -1,19 +1,16 @@
 <div class="row">
   <div class="col-md-12">
-    <input id="total_entries" type=hidden value=<%= @acquired_media_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(AcquiredMediaRelease).new? %>
-        <div class="mr-auto">
-          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :acquired_media_release], class: "btn btn-primary mr-2 mb-2" %>
-        </div>
+        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :acquired_media_release], class: "btn btn-primary mr-2 mb-2" %>
       <% end %>
 
       <% if @acquired_media_releases.any? && policy(AcquiredMediaRelease).tag_multiple? %>
         <%= button_to_bulk_tagging(@project) %>
       <% end %>
-
+      
       <% if @acquired_media_releases.any? && policy(AcquiredMediaRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @acquired_media_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
+        <%= link_to "Download All", [@project, :contract_downloads, release_type: @acquired_media_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
@@ -31,8 +28,7 @@
         <th data-behavior="all-selectable"><%= check_box_tag "acquired_media_release_ids[]", false, false %></th>
         <th><%= t '.table_headers.approved'%></th>
         <th><%= AcquiredMediaRelease.human_attribute_name(:name) %></th>
-        <th><%= t(".table_headers.files_count") %></th>
-        <th><%= t(".table_headers.owner_info") %></th>
+        <th><%= t(".table_headers.file_infos_count") %></th>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>  
         <th><%= t(".table_headers.signed_at") %></th>

app/views/acquired_media_releases/index.js.erb

@@ -1,5 +1,3 @@
 $("#acquired_media_releases").html("<%= j render(@acquired_media_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#acquired_media_releases_pagination").html("<%= j will_paginate(@acquired_media_releases) %>");
-$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
-$("#total_entries").val(<%= @acquired_media_releases.total_entries %>);

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

@@ -8,9 +8,6 @@
   <td>
     <%= account.projects.size %>
   </td>
-  <td>
-    <%= account.total_number_of_releases %>
-  </td>
   <td>
     <%= number_with_delimiter convert_duration(account.current_month_video_duration_total, from: :seconds, to: :minutes).round %> minutes
   </td>
@@ -30,11 +27,6 @@
         <%= link_to fa_icon("arrow-right", text: "Overview"), admin_account_path(account), class: "dropdown-item" %>
         <%= link_to fa_icon("pencil", text: "Edit"), edit_admin_account_path(account), class: "dropdown-item" %>
         <%= link_to fa_icon("arrow-right", text: "Account Managers"), account_auths_path({ account_id: account.id}), class: "dropdown-item" %>
-        <% if account.locked? %>
-          <%= link_to fa_icon("unlock", text: "Unlock Account"), [:admin, account, :lock], method: :delete, class: "dropdown-item" %>
-        <% else %>
-          <%= link_to fa_icon("lock", text: "Lock Account"), [:admin, account, :lock], method: :post, class: "dropdown-item" %>
-        <% end %>
       </div>
     </div>
   </td>

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>