Update returning users data dates

app/models/data/high_fail_questions.rb

@@ -50,7 +50,7 @@ def high_fail_questions
           total_count = question_attempts[[module_name, question_name]]
           fail_rate = fail_count / total_count
 
-          if fail_rate > average_fail_rate
+          if fail_rate >= average_fail_rate
             high_fail_questions[[module_name, question_name]] = fail_rate.to_f
           end
         end

app/models/data/module_overview.rb

@@ -28,7 +28,7 @@ def dashboard
         mods.map do |mod|
           {
             module_name: mod.name,
-            total_users: User.count,
+            total_users: User.registration_complete.count,
             not_started: not_started(mod),
             started: started(mod),
             in_progress: in_progress(mod),

app/models/data/returning_users.rb

@@ -5,22 +5,16 @@ class ReturningUsers
     class << self
       # @return [Array<String>]
       def column_names
-        [
-          'Weekly Returning Users',
-          'Monthly Returning Users',
-          'Bimonthly Returning Users',
-          'Quarterly Returning Users',
-        ]
+        ['Weekly Returning Users', 'Monthly Returning Users', 'Quarterly Returning Users']
       end
 
       # @return [Array<Hash{Symbol => Mixed}>]
       def dashboard
         [
           {
-            weekly: weekly,
-            monthly: monthly,
-            bimonthly: bimonthly,
-            quarterly: quarterly,
+            weekly_returning_users: weekly,
+            monthly_returning_users: monthly,
+            quarterly_returning_users: quarterly,
           },
         ]
       end
@@ -30,33 +24,25 @@ def dashboard
       # @param previous [Range]
       # @param current [Range]
       # @return [Integer]
-      def count(previous:, current:)
-        previous_visits = Ahoy::Visit.where(started_at: previous)
-        current_visits = Ahoy::Visit.where(started_at: current)
-
-        previous_visits.where(user_id: current_visits.pluck(:user_id)).distinct.count(:user_id)
+      def count(time_range)
+        visits = Ahoy::Visit.where(started_at: time_range)
+        visits.group(:user_id).having('count(user_id) > 1').count.size
       end
 
       # @return [Integer]
       def weekly
-        count(previous: 2.weeks.ago..1.week.ago, current: 1.week.ago..Time.zone.now)
+        count(Time.zone.today.last_week.beginning_of_week..Time.zone.today.last_week.end_of_week)
       end
 
       # @return [Integer]
       def monthly
-        count(previous: 2.months.ago..1.month.ago, current: 1.month.ago..Time.zone.now)
-      end
-
-      # @return [Integer]
-      def bimonthly
-        count(previous: 4.months.ago..2.months.ago, current: 2.months.ago..Time.zone.now)
+        count(Time.zone.today.last_month.beginning_of_month..Time.zone.today.last_month.end_of_month)
       end
 
       # @return [Integer]
       def quarterly
         current = Time.zone.today.beginning_of_quarter
-        previous = current - 3.months
-        count(previous: previous..current, current: current..Time.zone.today)
+        count(current..Time.zone.now)
       end
     end
   end

app/models/data/user_module_completion.rb

@@ -29,7 +29,7 @@ def dashboard
       # @param mod_name [String]
       # @return [Integer]
       def module_count(mod_name)
-        User.all.count { |user| user.module_completed?(mod_name) }
+        User.registration_complete.count { |user| user.module_completed?(mod_name) }
       end
     end
   end

app/models/data/user_module_completion_count.rb

@@ -28,7 +28,7 @@ def module_count
       # @param count [Integer]
       # @return [Integer]
       def completed_count(count)
-        User.all.count { |user| user.modules_completed.eql?(count) }
+        User.registration_complete.count { |user| user.modules_completed.eql?(count) }
       end
     end
   end

spec/models/data/returning_users_spec.rb

@@ -2,35 +2,28 @@
 
 RSpec.describe Data::ReturningUsers do
   let(:headers) do
-    [
-      'Weekly Returning Users',
-      'Monthly Returning Users',
-      'Bimonthly Returning Users',
-      'Quarterly Returning Users',
-    ]
+    ['Weekly Returning Users', 'Monthly Returning Users', 'Quarterly Returning Users']
   end
 
   let(:rows) do
     [
       {
-        weekly: 1,
-        monthly: 1,
-        bimonthly: 1,
-        quarterly: 1,
+        weekly_returning_users: 1,
+        monthly_returning_users: 1,
+        quarterly_returning_users: 1,
       },
     ]
   end
 
   let(:user) { create :user, :registered }
 
   before do
-    Ahoy::Visit.create! id: 1, user_id: user.id, started_at: Time.zone.now
-    Ahoy::Visit.create! id: 9, user_id: user.id, started_at: 1.day.ago
-    Ahoy::Visit.create! id: 2, user_id: user.id, started_at: 1.week.ago
-    Ahoy::Visit.create! id: 3, user_id: user.id, started_at: 2.weeks.ago
-    Ahoy::Visit.create! id: 4, user_id: user.id, started_at: 1.month.ago
-    Ahoy::Visit.create! id: 5, user_id: user.id, started_at: 2.months.ago
-    Ahoy::Visit.create! id: 8, user_id: user.id, started_at: 3.months.ago.beginning_of_quarter
+    Ahoy::Visit.create!(id: 1, user_id: 1, started_at: Time.zone.today.last_week)
+    Ahoy::Visit.create!(id: 2, user_id: 1, started_at: Time.zone.today.last_week)
+    Ahoy::Visit.create!(id: 3, user_id: 1, started_at: Time.zone.today.last_month)
+    Ahoy::Visit.create!(id: 4, user_id: 1, started_at: Time.zone.today.last_month)
+    Ahoy::Visit.create!(id: 5, user_id: 1, started_at: Time.zone.today.beginning_of_quarter)
+    Ahoy::Visit.create!(id: 6, user_id: 1, started_at: Time.zone.today.beginning_of_quarter)
   end
 
   it_behaves_like 'a data export model'