Taskme update

app/models/account.rb

@@ -55,6 +55,10 @@ class Account < ApplicationRecord
         User.joins(:project_memberships).where(project_memberships: { project: projects }),
         Broadcast.where(project: projects),
         TaskRequest.where(project: projects),
+        ZoomMeeting.where(project: projects),
+        MedicalRelease.where(project: projects),
+        MiscRelease.where(project: projects),
+        MatchingRequest.where(project: projects),
         self
       ])).sum(:byte_size).to_f
   end

app/models/acquired_media_release.rb

@@ -43,7 +43,8 @@ class AcquiredMediaRelease < ApplicationRecord
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
-  CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
   def minor?
     false

app/models/appearance_release.rb

@@ -12,10 +12,46 @@ class AppearanceRelease < ApplicationRecord
   include Taggable
   include PersonName
   include GuardianPhotoable
+  include SecondGuardianPhotoable
   include GuardianName
+  include SecondGuardianName
 
   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]
+              ]
+
+  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]
+              ]
+
+
   # These validations apply to all releases
   validates :person_email, email: true, allow_blank: true
   validates :person_first_name, :person_last_name, presence: true
@@ -39,6 +75,7 @@ class AppearanceRelease < ApplicationRecord
   # These validations apply to releases being signed by a minor
   with_options if: :minor? do
     validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_email, email: true, allow_blank: true
   end
 
   validates :person_photo, content_type: face_photo_acceptable_content_types
@@ -70,7 +107,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
@@ -97,6 +145,10 @@ class AppearanceRelease < ApplicationRecord
     true
   end
 
+  def second_guardian_present?
+    self.guardian_2_first_name.present?
+  end
+
   def contract_file_name
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime('%Y.%m.%d')}_#{release_number}_#{filename_suffix.parameterize}"
   end

app/models/blank_contract.rb

@@ -8,7 +8,7 @@ class BlankContract
   end
 
   def to_pdf
-    kit = PDFKit.new(as_html)
+    kit = PDFKit.new(as_html, margin_right: 1, margin_left: 1, margin_top: 10, margin_bottom: 1)
     kit.to_file("tmp/#{filename}")
   end
 

app/models/broadcast.rb

@@ -7,8 +7,6 @@ class Broadcast < ApplicationRecord
 
   has_secure_token
 
-  scope :order_by_recent, -> { order(created_at: :desc) }
-
   validates :name, presence: true
 
   enum status: [:created, :active, :idle]

app/models/broadcast_recording.rb

@@ -1,8 +1,6 @@
 class BroadcastRecording < ApplicationRecord
   belongs_to :broadcast
 
-  scope :order_by_recent, -> { order(created_at: :desc) }
-
   delegate :name, to: :broadcast, prefix: :broadcast
 
   validates :asset_uid, uniqueness: true

app/models/concerns/attachable.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Attachable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many_attached :attachments
+  end
+end

app/models/concerns/releasable.rb

@@ -6,8 +6,6 @@ module Releasable
   included do
     belongs_to :project, touch: true
     belongs_to :contract_template, optional: true
-
-    scope :order_by_recent, -> { order(created_at: :desc) }
   end
 
   def release_number

app/models/concerns/second_guardian_name.rb

@@ -0,0 +1,20 @@
+module SecondGuardianName
+  extend ActiveSupport::Concern
+  
+  included do
+    def guardian_2_name
+      "#{guardian_2_first_name} #{guardian_2_last_name}".titleize
+    end
+
+    def guardian_2_name=(value)
+      if value.include?(' ')
+        split = value.split(" ", 2)
+        self.guardian_2_first_name = split.first
+        self.guardian_2_last_name = split.last
+      else
+        self.guardian_2_first_name = value
+        self.guardian_2_last_name = "(Not Given)"
+      end
+    end
+  end
+end

app/models/concerns/second_guardian_photoable.rb

@@ -0,0 +1,9 @@
+module SecondGuardianPhotoable
+  extend ActiveSupport::Concern
+
+  included do
+    has_one_attached :guardian_2_photo
+
+    validates :guardian_2_photo, content_type: ["image/png", "image/jpeg"]
+  end
+end

app/models/contract.rb

@@ -29,6 +29,10 @@ class Contract
     }
   end
 
+  def medical_release?
+    @releasable.instance_of?(MedicalRelease)
+  end
+
   private
 
   def contract_template

app/models/contract_template.rb

@@ -13,6 +13,8 @@ class ContractTemplate < ApplicationRecord
   has_many :acquired_media_releases, dependent: :restrict_with_error
   has_many :location_releases, dependent: :restrict_with_error
   has_many :material_releases, dependent: :restrict_with_error
+  has_many :medical_releases, dependent: :restrict_with_error
+  has_many :misc_releases, dependent: :restrict_with_error
 
   monetize :fee_cents
   has_rich_text :body
@@ -50,6 +52,10 @@ class ContractTemplate < ApplicationRecord
     parent.present?
   end
 
+  def archived?
+    archived_at.present?
+  end
+
   def archive
     update(archived_at: Time.zone.now)
   end

app/models/headshot_collection.rb

@@ -5,7 +5,7 @@ class HeadshotCollection
   def self.for_project(project)
     appearance_releases_with_photo = project.appearance_releases.with_person_photo
 
-    new(project.id, appearance_releases_with_photo + project.talent_releases)
+    new(project.headshot_collection_uid, appearance_releases_with_photo + project.talent_releases)
   end
 
   def initialize(collection_uid, releasables)
@@ -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 }
   end
 
   private

app/models/matching_request.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MatchingRequest < ApplicationRecord
+  include Attachable
+
+  belongs_to :project
+end

app/models/medical_release.rb

@@ -0,0 +1,79 @@
+class MedicalRelease < ApplicationRecord
+  include Contractable
+  include Notable
+  include Photoable
+  include Releasable
+  include Searchable
+  include Signable
+  include Syncable
+  include PersonName
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
+  NUMBER_OF_CUSTOM_FIELDS = 15
+
+  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) 
+              ]
+
+  def self.face_photo_acceptable_content_types
+    ["image/png", "image/jpeg"]
+  end
+
+  # These validations apply to all releases
+  validates :person_first_name, :person_last_name, presence: true
+  validates :person_email, email: true, allow_blank: true
+
+  acts_as_taggable_on :internal_tags, :tags
+
+  # These validations apply to releases being signed by a minor
+  with_options if: :minor? do
+    validates :guardian_email, email: true, allow_blank: true
+    validates :guardian_2_email, email: true, allow_blank: true
+  end
+
+  # These validations apply to releases created natively by the system (i.e. not imported from elsewhere)
+  with_options on: :native do
+    validates :signature, attached: true
+  end
+
+  # These validations apply to releases imported to the system from an outside source
+  with_options on: :non_native do
+    validates :contract, attached: true
+  end
+
+  searchable_on %i[ 
+    person_first_name person_last_name person_email person_phone
+    person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country 
+  ]
+
+  # All releases must respond to the following messages
+  def name
+    person_name
+  end
+
+  def filename_suffix
+    "#{person_last_name} #{person_first_name}"
+  end
+
+  def contact_person
+    @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
+  end
+
+  def uses_edl?
+    false
+  end
+
+  def contract_file_name
+    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
+  end
+end

app/models/misc_release.rb

@@ -0,0 +1,86 @@
+class MiscRelease < ApplicationRecord
+  include Contractable
+  include Notable
+  include Photoable
+  include Releasable
+  include Searchable
+  include Signable
+  include Syncable
+  include PersonName
+  include GuardianName
+  include GuardianPhotoable
+
+  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) 
+              ]
+  
+  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) 
+              ]
+
+  def self.face_photo_acceptable_content_types
+    ["image/png", "image/jpeg"]
+  end
+
+  # These validations apply to all releases
+  validates :person_first_name, :person_last_name, presence: true
+  validates :person_email, email: true, allow_blank: true
+
+  acts_as_taggable_on :internal_tags, :tags
+
+  # These validations apply to releases created natively by the system (i.e. not imported from elsewhere)
+  with_options on: :native do
+    validates :signature, attached: true
+  end
+
+  # These validations apply to releases imported to the system from an outside source
+  with_options on: :non_native do
+    validates :contract, attached: true
+  end
+
+  with_options if: :minor? do
+    validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_phone, presence: true
+  end
+
+  searchable_on %i[ 
+    person_first_name person_last_name person_email person_phone
+    person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
+    guardian_address_street1 guardian_address_street2 guardian_address_city guardian_address_state guardian_address_zip guardian_address_country 
+  ]
+
+  # All releases must respond to the following messages
+  def name
+    person_name
+  end
+
+  def filename_suffix
+    "#{person_last_name} #{person_first_name}"
+  end
+
+  def contact_person
+    @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
+  end
+
+  def uses_edl?
+    false
+  end
+
+  def contract_file_name
+    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
+  end
+end

app/models/note.rb

@@ -4,6 +4,4 @@ class Note < ApplicationRecord
   belongs_to :notable, polymorphic: true
 
   validates :content, presence: true
-
-  scope :order_by_recent, -> { order(created_at: :desc) }
 end

app/models/project.rb

@@ -3,8 +3,8 @@ class Project < ApplicationRecord
   include Filterable
   include Syncable
 
-  SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material)
-  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music)
+  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)
 
   belongs_to :account
   has_many :acquired_media_releases, dependent: :destroy
@@ -13,6 +13,8 @@ class Project < ApplicationRecord
   has_many :material_releases, dependent: :destroy
   has_many :music_releases, dependent: :destroy
   has_many :talent_releases, dependent: :destroy
+  has_many :medical_releases, dependent: :destroy
+  has_many :misc_releases, dependent: :destroy
   has_many :videos, dependent: :destroy
   has_many :imports, dependent: :destroy
   has_many :contract_templates, dependent: :destroy
@@ -34,6 +36,8 @@ class Project < ApplicationRecord
       material_release: false,
       music_release: false,
       talent_release: false,
+      medical_release: false,
+      misc_release: false,
       video_analysis: false,
     }
   end
@@ -66,6 +70,8 @@ class Project < ApplicationRecord
         material_release: true,
         music_release: true,
         talent_release: true,
+        medical_release: true,
+        misc_release: true,
         video_analysis: true,
       }
     when "nat_geo"
@@ -77,6 +83,8 @@ class Project < ApplicationRecord
         material_release: true,
         music_release: true,
         talent_release: true,
+        medical_release: true,
+        misc_release: true,
         video_analysis: true,
       }
     else
@@ -118,7 +126,7 @@ class Project < ApplicationRecord
     current_zoom_meeting = zoom_meetings.active.first
 
     unless current_zoom_meeting.present?
-      zoom_user = ZoomUser.free.first || ZoomUser.create
+      zoom_user = ZoomUser.for_new_meeting
       current_zoom_meeting = ZoomMeeting.create(zoom_user: zoom_user, project: self)
     end
 

app/models/qr_code.rb

@@ -24,7 +24,7 @@ class QrCode
     end
   end
 
-  def to_base64_png(width = 100, height = 100)
+  def to_base64_png(width = 200, height = 200)
     _qr_code.as_png.resize(width, height).to_data_url
   end
 

app/models/releasable_param.rb

@@ -1,5 +1,5 @@
 class ReleasableParam
-  TYPES = %w(talent appearance location material acquired_media music)
+  TYPES = %w(talent appearance location material acquired_media music medical misc)
 
   def initialize(params)
     @params = params

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/models/talent_release.rb

@@ -11,7 +11,9 @@ class TalentRelease < ApplicationRecord
   include Taggable
   include PersonName
   include GuardianPhotoable
+  include SecondGuardianPhotoable
   include GuardianName
+  include SecondGuardianName
 
   composed_of :person_address, 
               class_name: "Address",
@@ -35,6 +37,17 @@ class TalentRelease < ApplicationRecord
                 %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)
+              ]
+
   def self.face_photo_acceptable_content_types
     ["image/png", "image/jpeg"]
   end
@@ -58,6 +71,7 @@ class TalentRelease < ApplicationRecord
   # These validations apply to releases being signed by a minor
   with_options if: :minor? do
     validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_email, :guardian_2_email, email: true, allow_blank: true
     validates :guardian_phone, presence: true
   end
 
@@ -84,6 +98,10 @@ class TalentRelease < ApplicationRecord
     false
   end
 
+  def second_guardian_present?
+    guardian_2_first_name.present?
+  end
+
   def contract_file_name
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
   end

app/models/zoom_meeting.rb

@@ -1,9 +1,10 @@
-require 'zoom_gateway'
-
 class ZoomMeeting < ApplicationRecord
   belongs_to :project, optional: true
   belongs_to :zoom_user
 
+  has_one_attached :recording
+  validates :recording, content_type: ['video/mp4']
+
   enum status: [:created, :started, :ended]
 
   after_create :create_api_meeting, if: -> { api_meeting_id.nil? }

app/models/zoom_user.rb

@@ -1,18 +1,27 @@
+require 'securerandom'
 class ZoomUser < ApplicationRecord
   has_many :zoom_meetings, dependent: :nullify
 
+  enum tier: [:basic, :pro]
+
   after_create :create_api_user, if: -> { api_id.nil? }
   before_destroy :abort_destroy
 
+  scope :current_account, -> { where(account_number: ZoomGateway.ACCOUNT_NUMBER) }
   scope :free, -> { where.not(id: ZoomMeeting.active.pluck(:zoom_user_id)) }
 
-  def api_email
-    self.class.api_email(self.id)
-  end
-
   def create_api_user
-    self.api_id = gateway.create_host(api_email)
+    retries ||= 0
+    self.api_id = gateway.create_host(self.class.generate_api_email)
+    self.account_number = ZoomGateway.ACCOUNT_NUMBER
     save
+  rescue ZoomGateway::UserAlreadyExists => e
+    retries += 1
+    if retries < 3
+      retry # new api email will be generated automatically
+    else
+      raise e
+    end
   end
 
   def delete_api_user
@@ -21,9 +30,22 @@ class ZoomUser < ApplicationRecord
     save
   end
 
+  def current_account?
+    account_number == ZoomGateway.ACCOUNT_NUMBER
+  end
+
+  # Static methods
   class << self
-    def api_email(id)
-      "host#{id}@directme"
+    def generate_api_email
+      "host#{SecureRandom.random_number(10000)}@directme"
+    end
+
+    def for_new_meeting
+      user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.free.first
+      if user.nil?
+        user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.create
+      end
+      user
     end
   end