default stats to basil v2

Author: drusepth

app/controllers/basil_controller.rb

@@ -256,10 +256,11 @@ def commission_info
   end
 
   def stats
-    @commissions = BasilCommission.all.with_deleted
+    @version = params[:v] || 2
+    @all_commissions = BasilCommission.where(basil_version: @version).with_deleted
 
-    @queued = BasilCommission.where(completed_at: nil)
-    @completed = BasilCommission.where.not(completed_at: nil).with_deleted
+    @queued = BasilCommission.where(completed_at: nil, basil_version: @version)
+    @completed = BasilCommission.where.not(completed_at: nil).where(basil_version: @version).with_deleted
 
     @average_wait_time = @completed.where('completed_at > ?', 24.hours.ago)
                                    .average(:cached_seconds_taken) || 0
@@ -268,10 +269,10 @@ def stats
                                    .map { |minutes, list| [minutes, list.count] }
 
     # Projected date, at our current rate, to reach 1,000,000 images
-    commission_counts_per_day   = @commissions.group_by_day(:completed_at).values
-    @average_commissions_per_day = commission_counts_per_day.sum(0.0) / commission_counts_per_day.count
-    commissions_left            = 1_000_000 - @commissions.count
-    @days_til_1_million_commissions = commissions_left / @average_commissions_per_day
+    commission_counts_per_day   = @all_commissions.group_by_day(:completed_at).values
+    @average_commissions_per_day = commission_counts_per_day.sum(0.0) / (commission_counts_per_day.count + 0.000001)
+    commissions_left            = 1_000_000 - @all_commissions.count
+    @days_til_1_million_commissions = commissions_left / (@average_commissions_per_day + 0.000001)
 
     # Feedback today
     @feedback_today = BasilFeedback.where('updated_at > ?', 24.hours.ago)

app/views/basil/stats.html.erb

@@ -6,7 +6,8 @@
     <h1 style="font-size: 2em; margin-left: 1rem">Hey, I'm Basil.</h4>
     <h2 style="font-size: 1.4em; margin-left: 1rem">I can help you visualize your ideas.</h2>
     <p style="margin-left: 1rem">
-      This is a little About Me page.
+      <strong>The latest Basil version is v2.</strong> This page is currently showing stats for v<%= @version %>. You can see v1's stats by <%= link_to 'clicking here', basil_stats_path(v: 1) %>.
+      <br /><br />
       <%= link_to 'Click here to start generating images of your notebook pages.', basil_path %>
     </p>
   </div>
@@ -37,12 +38,12 @@
   </div>
 
   <div class="col s12 m4 l3">
-    <h1 class="center purple-text" style="margin-bottom: 0; margin-top: 1.6em"><%= number_with_delimiter @commissions.count %></h1>
+    <h1 class="center purple-text" style="margin-bottom: 0; margin-top: 1.6em"><%= number_with_delimiter @all_commissions.count %></h1>
     <div class="center grey-text"><strong>total images created</strong></div>    
   </div>
   <div class="col s12 m8 l9 grey lighten-3">
     <%=
-      area_chart @commissions.where('created_at > ?', 30.days.ago.beginning_of_month).group_by_day(:created_at).map { |date, count| [date.to_date, count] },
+      area_chart @all_commissions.where('created_at > ?', 30.days.ago.beginning_of_month).group_by_day(:created_at).map { |date, count| [date.to_date, count] },
         colors: ['#9C27B0', '#2196F3'],
         title: 'Images created per day',
         suffix: ' images'

config/initializers/devise.rb

@@ -191,7 +191,7 @@
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
-  config.reset_password_within = 6.hours
+  config.reset_password_within = 48.hours
 
   # When set to false, does not sign a user in automatically after their password is
   # reset. Defaults to true, so a user is signed in automatically after a reset.

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_05_12_222601) do
+ActiveRecord::Schema.define(version: 2025_05_06_081045) do
 
   create_table "active_storage_attachments", force: :cascade do |t|
     t.string "name", null: false
@@ -201,6 +201,7 @@
     t.string "s3_bucket", default: "basil-commissions"
     t.datetime "saved_at"
     t.datetime "deleted_at"
+    t.integer "basil_version", default: 2
     t.index ["entity_type", "entity_id", "saved_at"], name: "basil_commissions_ees"
     t.index ["entity_type", "entity_id", "style"], name: "basil_commissions_ees2"
     t.index ["entity_type", "entity_id"], name: "basil_commissions_ee"