Upstream sync master

2020-06-09 06:35:40 +02:00
parent 64bda6eab6
commit cd5bbaeb62
26 changed files with 255 additions and 62 deletions
--- a/app/controllers/acquired_media_releases_controller.rb
+++ b/app/controllers/acquired_media_releases_controller.rb
@@ -61,7 +61,8 @@ class AcquiredMediaReleasesController < ApplicationController
      :name,
      :territory,
      :term,
-      :person_name,
+      :person_first_name,
+      :person_last_name,
      :person_phone,
      :person_email,
      :person_company,
--- a/app/controllers/location_releases_controller.rb
+++ b/app/controllers/location_releases_controller.rb
@@ -68,7 +68,8 @@ class LocationReleasesController < ApplicationController
      :territory_id, :territory_text,
      :term_id, :term_text,
      :restriction_id, :restriction_text,
-      :filming_started_on, :filming_ended_on
+      :filming_started_on, :filming_ended_on,
+      :filming_hours
    )
  end

--- a/app/controllers/public/acquired_media_releases_controller.rb
+++ b/app/controllers/public/acquired_media_releases_controller.rb
@@ -45,6 +45,9 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
    params.require(:acquired_media_release).permit(
      :name, 
      :description,
+      :person_first_name,
+      :person_last_name,
+      :person_email,
      :person_title,
      :person_phone,
      :person_fax,
--- a/app/controllers/public/location_releases_controller.rb
+++ b/app/controllers/public/location_releases_controller.rb
@@ -63,7 +63,8 @@ class Public::LocationReleasesController < Public::BaseController
      :person_address_zip, 
      :person_address_country,
      :signature_base64,
-      :locale, :contract_template, :filming_started_on, :filming_ended_on
+      :locale, :contract_template, :filming_started_on, :filming_ended_on,
+      :filming_hours
    )
  end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -117,7 +117,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

--- a/app/models/zoom_user.rb
+++ b/app/models/zoom_user.rb
@@ -1,19 +1,28 @@
 require 'zoom_gateway'
+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
@@ -22,9 +31,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

--- a/app/views/acquired_media_releases/_form.html.erb
+++ b/app/views/acquired_media_releases/_form.html.erb
@@ -4,7 +4,7 @@
    <div class="form-row">
      <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
    </div>
-    <%= form.form_group :categories, label: { text: "Categories" } do %>
+    <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
      <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
        <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
      <% end %>
--- a/app/views/contracts/_signature_page.html.erb
+++ b/app/views/contracts/_signature_page.html.erb
@@ -29,6 +29,7 @@
  <% if releasable.model_name == "LocationRelease" %>
    <%= description_list_pair "Filming Started On:", releasable&.filming_started_on&.strftime("%D") %>
    <%= description_list_pair "Filming Ended On:", releasable&.filming_ended_on&.strftime("%D") %>
+    <%= description_list_pair "Filming Hours:", releasable&.filming_hours %>
  <% end %>
  <% if contract_template.fee? %>
    <%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>
--- a/app/views/location_releases/_form.html.erb
+++ b/app/views/location_releases/_form.html.erb
@@ -11,14 +11,10 @@

  <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
+      <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
      <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
      <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
    </div>
@@ -38,6 +34,7 @@
    <div class="form-row">
      <%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true  %>
      <%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
+      <%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
    </div>
  <% end %>

--- a/app/views/material_releases/_form.html.erb
+++ b/app/views/material_releases/_form.html.erb
@@ -13,14 +13,10 @@

  <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
+      <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
      <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
      <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
    </div>
--- a/app/views/public/acquired_media_releases/new.html.erb
+++ b/app/views/public/acquired_media_releases/new.html.erb
@@ -15,12 +15,12 @@

      <%= card_field_set_tag t(".acquired_media_info.heading") do %>
        <div class="form-row">
-          <%= form.text_field :name, required: true, wrapper_class: "col-12", label: 'Licensor ("Owner")' %>
+          <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
        </div>
        <div class="form-row">
          <%= form.text_area :description, wrapper_class: "col-12" %>
        </div>
-        <%= form.form_group :categories, label: { text: "Categories" } do %>
+        <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
          <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
            <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
          <% end %>
@@ -31,8 +31,11 @@

      <%= card_field_set_tag t(".personal_info.heading") do %>
        <div class="form-row">
+          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_phone, wrapper_class: "col-sm-6", label: 'Phone' %>
+          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6", label: 'Phone' %>
+          <%= form.email_field :person_email, wrapper_class: "col-sm-6", label: 'Email' %>
          <%= form.text_field :person_fax, wrapper_class: "col-sm-6", label: 'Fax' %>
        </div>
        <%= render "shared/address_fields", form: form, subject: "person" %>
--- a/app/views/public/location_releases/new.html.erb
+++ b/app/views/public/location_releases/new.html.erb
@@ -27,11 +27,7 @@
          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
        </div>
@@ -45,6 +41,7 @@
        <div class="form-row">
          <%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
          <%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
+          <%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
        </div>
      <% end %>

--- a/app/views/public/material_releases/new.html.erb
+++ b/app/views/public/material_releases/new.html.erb
@@ -27,11 +27,7 @@
          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
        </div>