rebase master

app/assets/javascripts/channels/broadcasts.coffee

@@ -8,16 +8,11 @@ $(document).on "turbolinks:load", ->
       # Called when the subscription has been terminated by the server
 
     received: (data) ->
+      return unless document.querySelector("meta[name=broadcast-token][content='#{broadcastToken}']")
       switch data.event
-        when "broadcast_stream_update"
-          return unless document.querySelector("meta[name=broadcast-token][current=true][content='#{broadcastToken}']")
-          @refreshBroadcastVideo(data)
-        when "stream_recording_ready"
-          return unless document.querySelector("meta[name=broadcast-token][current=true][content='#{broadcastToken}']")
-          @showBroadcastRecordings(data)
-        when "file_upload_update"
-          return unless document.querySelector("meta[name=broadcast-token][content='#{broadcastToken}']")
-          @refreshBroadcastFilesTab(data)
+        when "broadcast_stream_update" then @refreshBroadcastVideo(data)
+        when "stream_recording_ready" then @showBroadcastRecordings(data)
+        when "file_upload_update" then @refreshBroadcastFilesTab(data)
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content

app/controllers/api/direct_uploads_controller.rb

@@ -3,25 +3,15 @@
 class Api::DirectUploadsController < Api::ApiController
   include ActiveStorage::SetCurrent
 
-  deserializable_resource :direct_upload, only: [:create]
-
   def create
-    blob = ActiveStorage::Blob.create_before_direct_upload!(blob_params)
+    blob = ActiveStorage::Blob.create_before_direct_upload!(blob_args)
     render jsonapi: DirectUpload.new(blob)
   end
 
   private
 
-  def blob_params
-    params.
-      require(:direct_upload).
-      permit(:type, :filename, :byte_size, :checksum, :content_type, :metadata).
-      except(:type).
-      to_h.symbolize_keys
-  end
-
-  class DeserializableDirectUpload < JSONAPI::Deserializable::Resource
-    attributes :filename, :byte_size, :checksum, :content_type, :metadata
+  def blob_args
+    params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :metadata).to_h.symbolize_keys
   end
 
   class SerializableDirectUpload < JSONAPI::Serializable::Resource

app/controllers/appearance_releases_controller.rb

@@ -78,7 +78,7 @@ class AppearanceReleasesController < ApplicationController
   end
 
   def appearance_release_params
-    params.require(:appearance_release).permit(:contract, :guardian_address_street1, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
+    params.require(:appearance_release).permit(:contract, :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
                                                :person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
                                                :applicable_medium_id, :applicable_medium_text,
                                                :territory_id, :territory_text,

app/controllers/public/appearance_releases_controller.rb

@@ -39,25 +39,9 @@ class Public::AppearanceReleasesController < Public::BaseController
     authorize appearance_releases.build(params)
   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 appearance_release_params
     params.require(:appearance_release).permit(:person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
-                                               guardian_params, :minor,
+                                               :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_email, :guardian_photo, :minor,
                                                :signature_base64, :person_date_of_birth,
                                                :locale, :contract_template,)
   end

app/models/appearance_release.rb

@@ -16,18 +16,6 @@ class AppearanceRelease < ApplicationRecord
 
   has_one_attached :person_photo
 
-  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]
-              ]
-
-
   # These validations apply to all releases
   validates :person_email, email: true, allow_blank: true
   validates :person_first_name, :person_last_name, presence: true

app/models/headshot_collection.rb

@@ -23,7 +23,7 @@ class HeadshotCollection
       collection_uid: collection_uid.to_s,
       bucket_name: aws_bucket_name,
       ids_to_images: map_ids_to_images,
-    }.reject { |k, v| v.blank? && k != :ids_to_images }
+    }.reject { |_, v| v.blank? }
   end
 
   private

app/views/appearance_releases/_form.html.erb

@@ -23,7 +23,7 @@
         <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
       </div>
       <div class="form-row">
-        <%= form.text_field :guardian_address_street1, wrapper_class: "col-sm-6" %>
+        <%= form.text_field :guardian_address, wrapper_class: "col-sm-6" %>
       </div>
     </div>
   <% end %>

app/views/broadcasts/show.html.erb

@@ -3,12 +3,12 @@
     <meta name="project-id" content="<%= @project.id %>">
   <% end %>
   <% if @broadcast %>
-    <meta name="broadcast-token" current="true" content="<%= @broadcast.token %>">
+    <meta name="broadcast-token" content="<%= @broadcast.token %>">
   <% end %>
   <% # Subscribe to Action Cable for every broadcast including those in multi-view %>
   <% @multi_view_broadcasts.each do |multi_view_broadcast| %>
     <% if multi_view_broadcast.token != @broadcast.token %>
-      <meta name="broadcast-token" current="false" content="<%= multi_view_broadcast.token %>">
+      <meta name="broadcast-token" content="<%= multi_view_broadcast.token %>">
     <% end %>
   <% end %>
 <% end %>

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

@@ -79,7 +79,9 @@
             <div class="form-row">
               <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
             </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian" %>
+            <div class="form-row">
+              <%= form.text_field :guardian_address, wrapper_class: "col-sm-6" %>
+            </div>
           <% end %>
 
           <hr>

config/locales/en.yml

@@ -336,12 +336,6 @@ en:
         person_last_name: Last name
         person_name: Name
         person_phone: Phone number
-        guardian_address_city: Guardian city
-        guardian_address_country: Guardian country
-        guardian_address_state: Guardian state
-        guardian_address_street1: Guardian address
-        guardian_address_street2: Guardian address (Line 2)
-        guardian_address_zip: Guardian zip code
       location_release:
         address_city: City
         address_country: Country

config/locales/es.yml

@@ -115,6 +115,7 @@ es:
   helpers:
     label:
       appearance_release:
+        guardian_address: Dirección del tutor legal
         guardian_name: Nómbre del tutor legal
         guardian_phone: Número de teléfono del tutor legal
         minor: El firmante es un menor
@@ -122,12 +123,6 @@ es:
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono
-        guardian_address_city: Guardian city (ES)
-        guardian_address_country: Guardian country (ES)
-        guardian_address_state: Guardian state (ES)
-        guardian_address_street1: Dirección del tutor legal
-        guardian_address_street2: Dirección del tutor legal (Línea 2)
-        guardian_address_zip: Guardian zip code (ES)
       project:
         client_name: Nómbre del cliente del proyecto
         description: Descripción del proyecto

db/migrate/20200616124214_destructure_guardian_address_column_in_appearance_releases.rb

@@ -1,10 +0,0 @@
-class DestructureGuardianAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :appearance_releases, :guardian_address, :guardian_address_street1
-    add_column :appearance_releases, :guardian_address_street2, :string
-    add_column :appearance_releases, :guardian_address_city, :string
-    add_column :appearance_releases, :guardian_address_state, :string
-    add_column :appearance_releases, :guardian_address_zip, :string
-    add_column :appearance_releases, :guardian_address_country, :string
-  end
-end

db/structure.sql

@@ -296,7 +296,7 @@ CREATE TABLE public.appearance_releases (
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     minor boolean DEFAULT false,
-    guardian_address_street1 character varying,
+    guardian_address character varying,
     guardian_name_old character varying,
     guardian_phone character varying,
     person_email character varying,
@@ -318,12 +318,7 @@ CREATE TABLE public.appearance_releases (
     guardian_first_name character varying,
     guardian_last_name character varying,
     identifier character varying,
-    guardian_email character varying,
-    guardian_address_street2 character varying,
-    guardian_address_city character varying,
-    guardian_address_state character varying,
-    guardian_address_zip character varying,
-    guardian_address_country character varying
+    guardian_email character varying
 );
 
 
@@ -3659,7 +3654,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200610085411'),
 ('20200610140459'),
 ('20200612121539'),
-('20200615131722'),
-('20200616124214');
+('20200615131722');
 
 

spec/controllers/api/direct_uploads_controller_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Api::DirectUploadsController, type: :controller do
 
   describe '#create' do
     it 'returns data for a direct upload' do
-      post :create, params: { direct_upload: direct_upload_params }
+      post :create, params: { blob: blob_params }
 
       expect(response).to be_successful
       expect(response_body_data_attributes).to include('id', 'key', 'signed_id', 'url', 'headers')
@@ -19,7 +19,7 @@ RSpec.describe Api::DirectUploadsController, type: :controller do
 
   private
 
-  def direct_upload_params
+  def blob_params
     file = file_fixture("video_file.mp4")
     checksum = Digest::MD5.base64digest(StringIO.new(file.read).to_s)
 

spec/controllers/appearance_releases_controller_spec.rb

@@ -265,9 +265,6 @@ RSpec.describe AppearanceReleasesController, tye: :controller do
   def minor_appearance_release_params
     attributes_for(:appearance_release, :non_native, :minor_with_guardian_photo)
       .except(:contract)
-      .except(:guardian_address_street2).except(:guardian_address_city)
-      .except(:guardian_address_state).except(:guardian_address_zip)
-      .except(:guardian_address_country)
       .merge(contract_param, exploitable_rights_params)
   end
 

spec/controllers/public/appearance_releases_controller_spec.rb

@@ -120,19 +120,7 @@ describe Public::AppearanceReleasesController do
 
   def minor_appearance_release_params(with_guardian_photo = true)
     minor_type = with_guardian_photo ? :minor_with_guardian_photo : :minor
-    attributes_for(:appearance_release, minor_type)
-        .merge(signature_param, guardian_address_params)
-  end
-
-  def guardian_address_params
-    {
-      guardian_address_street1: "St1",
-      guardian_address_street2: "St2",
-      guardian_address_city: "City",
-      guardian_address_state: "State",
-      guardian_address_zip: "ZIP",
-      guardian_address_country: "Country"
-    }
+    attributes_for(:appearance_release, minor_type).merge(signature_param)
   end
 
   def signature_param

spec/factories/appearance_releases.rb

@@ -31,12 +31,7 @@ FactoryBot.define do
       minor true
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
-      guardian_address_street1 "St1"
-      guardian_address_street2 "St2"
-      guardian_address_city "City"
-      guardian_address_state "State"
-      guardian_address_zip "ZIP"
-      guardian_address_country "Country"
+      guardian_address "100 Test Lane, New York, 10001"
       guardian_phone "123-555-1234"
       guardian_email "guardian@galaxy.all"
     end
@@ -45,14 +40,9 @@ FactoryBot.define do
       minor true
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
+      guardian_address "100 Test Lane, New York, 10001"
       guardian_phone "123-555-1234"
       guardian_email "guardian@galaxy.all"
-      guardian_address_street1 "St1"
-      guardian_address_street2 "St2"
-      guardian_address_city "City"
-      guardian_address_state "State"
-      guardian_address_zip "ZIP"
-      guardian_address_country "Country"
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")

spec/models/contract_template_preview_spec.rb

@@ -54,11 +54,7 @@ describe ContractTemplatePreview do
         'person_phone' => '00 111 222 333 4444',
         'updated_at' => nil,
         'minor' => true,
-        'guardian_address_street1' => 'Street 3',
-        'guardian_address_street2' => 'Street 4',
-        'guardian_address_city' => 'City-2',
-        'guardian_address_state' => 'State-2',
-        'guardian_address_zip' => '112233',
+        'guardian_address' => 'Street 3, Street 4, City-2, State-2 112233, Country-2',
         "guardian_first_name" => nil,
         "guardian_last_name" => nil,
         "guardian_name_old" => nil,

spec/models/headshot_collection_spec.rb

@@ -97,18 +97,6 @@ describe HeadshotCollection do
         expect(hash.keys).not_to include(:collection_uid)
       end
     end
-
-    context "when there are no releasables" do
-      it "includes a blank hash value for the ids_to_images key" do
-        releases = []
-        collection = HeadshotCollection.new(nil, releases)
-
-        hash = collection.to_hash
-
-        expect(hash.keys).to include(:ids_to_images)
-        expect(hash[:ids_to_images]).to eq(Hash.new)
-      end
-    end
   end
 
   private