add second guardian fields to non native release edit form

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "2.6.3"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
-gem "rails", "~> 6.0.3.1"
+gem "rails", "~> 6.0.0"
 # Use postgresql as the database for Active Record
 gem "pg", "~> 0.18"
 # Use Puma as the app server

Gemfile.lock

@@ -44,71 +44,71 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_storage_base64 (1.0.0)
       rails (~> 6.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
     activeresource (5.1.0)
       activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
       activesupport (>= 5.0, < 7)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      zeitwerk (~> 2.1, >= 2.1.8)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
@@ -181,7 +181,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
     countries (2.1.4)
       i18n_data (~> 0.8.0)
@@ -230,7 +230,7 @@ GEM
     hubspot-ruby (0.9.0)
       activesupport (>= 3.0.0)
       httparty (>= 0.10.0)
-    i18n (1.8.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     i18n_yaml_sorter (0.2.0)
@@ -270,22 +270,22 @@ GEM
       ruby_dep (~> 1.2)
     loaf (0.8.1)
       rails (>= 3.2)
-    loofah (2.6.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (1.0.0)
+    method_source (0.9.2)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0904)
-    mimemagic (0.3.5)
+    mimemagic (0.3.3)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.0)
     monetize (1.9.2)
       money (~> 6.12)
     money (6.13.4)
@@ -298,8 +298,8 @@ GEM
     msgpack (1.3.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nio4r (2.5.1)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     oath (1.1.0)
       bcrypt
@@ -337,20 +337,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
+      railties (= 6.0.0)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -363,9 +363,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -469,7 +469,7 @@ GEM
     turbolinks-source (5.2.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
@@ -494,9 +494,9 @@ GEM
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
+    websocket-extensions (0.1.4)
     will_paginate (3.2.1)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
@@ -504,7 +504,7 @@ GEM
     wkhtmltopdf-heroku (2.12.5.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.3.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -561,7 +561,7 @@ DEPENDENCIES
   rack!
   rack-contrib (~> 2.0.1)
   rack-cors
-  rails (~> 6.0.3.1)
+  rails (~> 6.0.0)
   rails-controller-testing (~> 1.0.4)
   rails-data-migrations (~> 1.2.0)
   redcarpet (~> 3.4.0)

app/policies/acquired_media_release_policy.rb

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

app/policies/appearance_release_policy.rb

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

app/policies/location_release_policy.rb

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

app/policies/material_release_policy.rb

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

app/policies/medical_release_policy.rb

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

app/policies/misc_release_policy.rb

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

app/policies/music_release_policy.rb

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

app/policies/talent_release_policy.rb

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

app/views/contracts/_medical_questionnaire.html.erb

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

app/views/contracts/_signature_page.html.erb

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

app/views/contracts/pdf.html.erb

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

config/locales/en.yml

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

spec/models/account_spec.rb

@@ -133,8 +133,7 @@ RSpec.describe Account do
         ZoomMeeting,
         MedicalRelease,
         MiscRelease,
-        MatchingRequest,
-        ActionMailbox::InboundEmail # This is Rails model, we are not using it and it is NOT added to the Account#storage_total calculation
+        MatchingRequest
       ]
       Rails.application.eager_load!
       ActiveRecord::Base.descendants.each do |model|

spec/policies/acquired_media_release_policy_spec.rb

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

spec/policies/appearance_release_policy_spec.rb

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

spec/policies/location_release_policy_spec.rb

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

spec/policies/material_release_policy_spec.rb

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

spec/policies/medical_release_policy_spec.rb

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

spec/policies/misc_release_policy_spec.rb

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

spec/policies/music_release_policy_spec.rb

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

spec/policies/talent_release_policy_spec.rb

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