Upstream sync master

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
 

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