fix MR comments

app/assets/javascripts/channels/broadcasts.coffee

@@ -8,11 +8,16 @@ $(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" then @refreshBroadcastVideo(data)
-        when "stream_recording_ready" then @showBroadcastRecordings(data)
-        when "file_upload_update" then @refreshBroadcastFilesTab(data)
+        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)
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content

app/controllers/api/direct_uploads_controller.rb

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

app/controllers/appearance_releases_controller.rb

@@ -79,7 +79,7 @@ class AppearanceReleasesController < ApplicationController
 
   def appearance_release_params
     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,
+                                               :person_address_street1, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
                                                :applicable_medium_id, :applicable_medium_text,
                                                :territory_id, :territory_text,
                                                :term_id, :term_text, :person_date_of_birth,

app/controllers/public/appearance_releases_controller.rb

@@ -39,8 +39,24 @@ class Public::AppearanceReleasesController < Public::BaseController
     authorize appearance_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_photo
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_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,
+    params.require(:appearance_release).permit(person_params,
                                                :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_email, :guardian_photo, :minor,
                                                :signature_base64, :person_date_of_birth,
                                                :locale, :contract_template,)

app/models/appearance_release.rb

@@ -16,6 +16,17 @@ class AppearanceRelease < ApplicationRecord
 
   has_one_attached :person_photo
 
+  composed_of :person_address,
+              class_name: 'Address',
+              mapping: [
+                %w[person_address_street1 street1],
+                %w[person_address_street2 street2],
+                %w[person_address_city city],
+                %w[person_address_state state],
+                %w[person_address_zip zip],
+                %w[person_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
@@ -71,7 +82,18 @@ class AppearanceRelease < ApplicationRecord
   scope :having_no_person_photo,            -> { left_joins(:person_photo_attachment).group(:id).having('COUNT(active_storage_attachments) = 0') }
   scope :with_person_name,                  ->(name) { where('person_first_name ILIKE ? OR person_last_name ILIKE ?', "%#{name}%") }
 
-  searchable_on %i[person_first_name person_last_name person_address person_email person_phone]
+  searchable_on %i[
+    person_first_name
+    person_last_name
+    person_address_street1
+    person_address_street2
+    person_address_city
+    person_address_state
+    person_address_zip
+    person_address_country
+    person_email
+    person_phone
+  ]
 
   # All releases must respond to the following messages
   def name

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 { |_, v| v.blank? }
+    }.reject { |k, v| v.blank? && k != :ids_to_images }
   end
 
   private

app/models/sample_appearance_release.rb

@@ -8,7 +8,12 @@ class SampleAppearanceRelease < AppearanceRelease
 
   def default_attrs
     {
-      person_address: "Street Address, City, State Zipcode",
+      person_address_street1: "Street Address",
+      person_address_street2: "St2",
+      person_address_city: "City",
+      person_address_state: "State",
+      person_address_zip: "ZIP",
+      person_address_country: "Country",
       person_first_name:    "Some",
       person_last_name:     "Person",
       person_phone:   "555-555-5555",

app/views/appearance_releases/_form.html.erb

@@ -13,7 +13,7 @@
     <div class="form-row">
       <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
       <%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
-      <%= form.text_field :person_address, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_address_street1, wrapper_class: "col-sm-6" %>
     </div>
 
     <div class="<%= class_string("collapse" => !appearance_release.minor?) %>" data-ujs-target="guardian-fields">

app/views/broadcasts/show.html.erb

@@ -3,12 +3,12 @@
     <meta name="project-id" content="<%= @project.id %>">
   <% end %>
   <% if @broadcast %>
-    <meta name="broadcast-token" content="<%= @broadcast.token %>">
+    <meta name="broadcast-token" current="true" 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" content="<%= multi_view_broadcast.token %>">
+      <meta name="broadcast-token" current="false" content="<%= multi_view_broadcast.token %>">
     <% end %>
   <% end %>
 <% end %>

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

@@ -35,8 +35,8 @@
         <div class="form-row">
           <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
           <%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
-          <%= form.text_field :person_address, wrapper_class: "col-sm-6" %>
         </div>
+        <%= render "shared/address_fields", form: form, subject: "person" %>
       <% end %>
 
       <%= card_field_set_tag t(".photo.heading") do %>

config/locales/en.yml

@@ -329,7 +329,12 @@ en:
         person_title: Title
       appearance_release:
         minor: Is the person a minor?
-        person_address: Address
+        person_address_city: City
+        person_address_country: Country
+        person_address_state: State
+        person_address_street1: Address
+        person_address_street2: Address (Line 2)
+        person_address_zip: Zip code
         person_date_of_birth: Date of birth
         person_email: Email address
         person_first_name: First name

config/locales/es.yml

@@ -118,8 +118,12 @@ es:
         guardian_address: Dirección del tutor legal
         guardian_name: Nómbre del tutor legal
         guardian_phone: Número de teléfono del tutor legal
+        person_address_city: City (ES)
+        person_address_country: Country (ES)
+        person_address_state: State (ES)
+        person_address_street1: Address (ES)
+        person_address_street2: Address (Line 2) (ES)
         minor: El firmante es un menor
-        person_address: Dirección
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono

db/migrate/20200615133602_destructure_person_address_column_in_appearance_releases.rb

@@ -0,0 +1,10 @@
+class DestructurePersonAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :appearance_releases, :person_address, :person_address_street1
+    add_column :appearance_releases, :person_address_street2, :string
+    add_column :appearance_releases, :person_address_city, :string
+    add_column :appearance_releases, :person_address_state, :string
+    add_column :appearance_releases, :person_address_zip, :string
+    add_column :appearance_releases, :person_address_country, :string
+  end
+end

db/structure.sql

@@ -290,7 +290,7 @@ ALTER SEQUENCE public.active_storage_blobs_id_seq OWNED BY public.active_storage
 CREATE TABLE public.appearance_releases (
     id bigint NOT NULL,
     person_name_old character varying,
-    person_address character varying,
+    person_address_street1 character varying,
     person_phone character varying,
     project_id bigint,
     created_at timestamp without time zone NOT NULL,
@@ -318,7 +318,12 @@ CREATE TABLE public.appearance_releases (
     guardian_first_name character varying,
     guardian_last_name character varying,
     identifier character varying,
-    guardian_email character varying
+    guardian_email character varying,
+    person_address_street2 character varying,
+    person_address_city character varying,
+    person_address_state character varying,
+    person_address_zip character varying,
+    person_address_country character varying
 );
 
 
@@ -3654,6 +3659,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200610085411'),
 ('20200610140459'),
 ('20200612121539'),
-('20200615131722');
+('20200615131722'),
+('20200615133602');
 
 

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: { blob: blob_params }
+      post :create, params: { direct_upload: direct_upload_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 blob_params
+  def direct_upload_params
     file = file_fixture("video_file.mp4")
     checksum = Digest::MD5.base64digest(StringIO.new(file.read).to_s)
 

spec/controllers/public/appearance_releases_controller_spec.rb

@@ -31,7 +31,7 @@ describe Public::AppearanceReleasesController do
       contract_template = create(:contract_template, project: project)
       sign_in(user)
 
-      post :create, params: { account_id: user.primary_account.to_param, project_id: project, contract_template_id: contract_template, appearance_release: { person_address: "Albuquerque" } }
+      post :create, params: { account_id: user.primary_account.to_param, project_id: project, contract_template_id: contract_template, appearance_release: { person_email: "email@email.com" } }
       body = CGI.unescape_html(response.body)
       expect(body).to match /Person first name can't be blank/
       expect(body).to match /Person last name can't be blank/

spec/factories/appearance_releases.rb

@@ -11,7 +11,12 @@ FactoryBot.define do
     end
 
     trait :native do
-      person_address "100 Test Lane, New York, NY 10001"
+      person_address_street1 "St1"
+      person_address_street2 "St2"
+      person_address_city "City"
+      person_address_state "State"
+      person_address_zip "ZIP"
+      person_address_country "Country"
       person_phone "123-555-6789"
 
       signature do

spec/features/user_managing_appearance_releases_spec.rb

@@ -485,7 +485,7 @@ feature 'User managing appearance releases' do
   end
 
   def person_address_field
-    t('helpers.label.appearance_release.person_address')
+    t('helpers.label.appearance_release.person_address_street1')
   end
 
   def person_email_field

spec/models/contract_template_preview_spec.rb

@@ -50,7 +50,11 @@ describe ContractTemplatePreview do
         'id' => nil,
         'person_first_name' => 'Dummy',
         'person_last_name' => 'Person',
-        'person_address' => 'Street 1, Street 2, City, State 12345, Country',
+        'person_address_street1' => 'Street 1',
+        'person_address_street2' => 'Street 2',
+        'person_address_city' => 'City',
+        'person_address_state' => 'State',
+        'person_address_zip' => '12345',
         'person_phone' => '00 111 222 333 4444',
         'updated_at' => nil,
         'minor' => true,

spec/models/excel_reports/video_reports/nat_geo_legal_binder_logs/appearance_release_log_sheet_spec.rb

@@ -29,7 +29,7 @@ module ExcelReports
                                       restriction: Restriction.last,
                                       person_first_name: "John", 
                                       person_last_name: "Doe", 
-                                      person_address: "123 Main Street, New York, NY 10000")
+                                      person_address_street1: "123 Main Street, New York, NY 10000")
                    )
             )
             allow(sheet).to receive(:add_row)

spec/models/headshot_collection_spec.rb

@@ -97,6 +97,18 @@ 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