visualize current queue

Author: drusepth

app/controllers/basil_controller.rb

@@ -203,7 +203,7 @@ def content
     @in_progress_commissions = @commissions.select { |c| c.completed_at.nil? }
     @generated_images_count  = current_user.basil_commissions.with_deleted.count
 
-    @can_request_another     = @in_progress_commissions.count < 3
+    @can_request_another     = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE
   end
 
   def character
@@ -228,7 +228,7 @@ def character
                                   .limit(20)
                                   .includes(:basil_feedbacks)
     @in_progress_commissions = BasilCommission.where(entity_type: 'Character', entity_id: @character.id, completed_at: nil)
-    @can_request_another = @in_progress_commissions.count < 3
+    @can_request_another = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE
   end
 
   def about
@@ -411,6 +411,8 @@ def review
 
     @commissions_per_user_id = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count
     @unique_users_generating_count = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).count
+
+    @current_queue_items = BasilCommission.where(completed_at: nil).order('created_at ASC')
   end
 
   def commission
@@ -420,6 +422,12 @@ def commission
       return
     end
 
+    current_queue_size = current_user.basil_commissions.where(completed_at: nil).count
+    if current_queue_size >= BasilService::MAX_JOB_QUEUE_SIZE
+      redirect_back fallback_location: basil_path, notice: "You can only have #{BasilService::MAX_JOB_QUEUE_SIZE} commissions in progress at a time. Please wait for one to complete before requesting another."
+      return
+    end
+
     # Fetch the related content
     @content = @current_user_content[commission_params.fetch(:entity_type)]
                   .find { |c| c.id == commission_params.fetch(:entity_id).to_i }

app/services/basil_service.rb

@@ -1,5 +1,6 @@
 class BasilService < Service
-  FREE_IMAGE_LIMIT = 100
+  FREE_IMAGE_LIMIT   = 100
+  MAX_JOB_QUEUE_SIZE = 3
 
   IGNORED_VALUES = ['', 'none', 'n/a', '.', '-', ' ', '?', '??', '???', 'x', nil]
 

app/views/basil/review.html.erb

@@ -13,6 +13,17 @@
     <div>
       <%= pluralize @unique_users_generating_count.count, 'unique user' %> over 48h
     </div>
+
+    <br /><br />
+    <div><strong>Queue</strong></div>
+    <ol>
+      <% @current_queue_items.each do |commission| %>
+        <li>
+          <%= commission.entity_type %>-<%= commission.entity_id %> (<%= commission.style %>)
+          for U-<%= commission.user_id %>
+        </li>
+      <% end %>
+    </ol>
   </div>
   <div class="col s9">
     <% @recent_commissions.each do |commission| %>