Show correct referalls for month and year

Author: suninthesky

app/controllers/partners_controller.rb

@@ -5,7 +5,7 @@ def index
     @date = params[:date]&.to_date || Date.today
 
     @usage ||= Referral.joins(:partner).used
-                       .by_month(@date.month, col: 'referrals.created_at')
+                       .by_month(@date, col: 'referrals.created_at')
                        .group('partners.slug').size
 
     @partners = Partner.active.order(:name)

app/controllers/referrals_controller.rb

@@ -5,7 +5,7 @@ class ReferralsController < ApplicationController
 
   def new
     if @partner
-      @referrals = @partner.referrals.by_month(@date.month)
+      @referrals = @partner.referrals.by_month(@date)
       @used_referrals = @referrals.used
       @total_available = @partner.max_monthly_referrals - @used_referrals.size
     else
@@ -14,7 +14,7 @@ def new
   end
 
   def index
-    @referrals = Referral.order(created_at: :desc).by_month(@date.month)
+    @referrals = Referral.order(created_at: :desc).by_month(@date)
   end
 
   def show

app/controllers/webhooks_controller.rb

@@ -16,7 +16,7 @@ def new_response
           'referrals',
           partner: partner.slug,
           max_referrals: partner.max_monthly_referrals,
-          used_referrals: partner.referrals.used.by_month(Time.zone.now.month).size
+          used_referrals: partner.referrals.used.by_month(Time.zone.now).size
         )
         head :ok
       else

app/models/partner.rb

@@ -18,7 +18,7 @@ def self.active
   end
 
   def can_accept_referrals?
-    referrals.used.by_month(Time.zone.now.month).size < max_monthly_referrals
+    referrals.used.by_month(Time.zone.now).size < max_monthly_referrals
   end
 
   def name=(str)

app/models/referral.rb

@@ -9,8 +9,10 @@ class Referral < ApplicationRecord
   validates :last_state, inclusion: { in: STATES }
   validates :original_response, presence: true
 
-  def self.by_month(month, col: 'created_at')
-    where("extract(month from #{col}) = ?", month)
+  def self.by_month(date, col: 'created_at')
+    raise 'Argument `date` does not respond to `:strftime` method' unless date.respond_to?(:strftime)
+
+    where("extract(month from #{col}) = ? AND extract(year from #{col}) = ?", date.month, date.year)
   end
 
   def self.used

app/views/layouts/_month_picker.html.erb

@@ -1,11 +1,11 @@
 <div class="h2 bold center">
-  <% if date.month < Date.today.month %>
+  <% if date < Date.today %>
     <%= link_to('❮', send(path, date: date + 1.month), class: 'yellow no-decoration') %>
   <% else %>
     <a class="grey no-decoration">❮</a>
   <% end %>
   <span class="px15">
-    <%= "#{Date::MONTHNAMES[date.month]} #{Time.zone.now.year}" %>
+    <%= "#{Date::MONTHNAMES[date.month]} #{date.year}" %>
   </span>
   <%= link_to('❯', send(path, date: date - 1.month), class: 'yellow no-decoration', data: { turbolinks: false }) %>
 </div>

app/views/partners/index.html.erb

@@ -1,13 +1,13 @@
 <h1 class="bold maroon mt50 mb40">
-  <%= "#{Date::MONTHNAMES[@date.month]} Referrals #{Time.zone.now.year}" %>
+  <%= "#{Date::MONTHNAMES[@date.month]} Referrals #{@date.year}" %>
 </h1>
 
 <div class="row with-gutter wrap">
 
   <div class="fr2 mb20">
     <h2 class="mb20"><br/></h2>
     <div class="lg">
-      All referrals (<%= Referral.by_month(@date.month).size %> in total)
+      All referrals (<%= Referral.by_month(@date).size %> in total)
     </div>
   </div>
 

test/models/referral_test.rb

@@ -13,10 +13,17 @@ class ReferralTest < ActiveSupport::TestCase
 
   test 'self#by_month' do
     @subject.save!
-    query = @subject.class.by_month(Time.zone.now.month)
+    query = @subject.class.by_month(Date.today)
     assert_equal(1, query.size)
   end
 
+  test 'self#by_month raise' do
+    @subject.save!
+    assert_raises 'Argument `date` does not respond to `:strftime` method' do
+      @subject.class.by_month(nil)
+    end
+  end
+
   test 'self#used' do
     @subject.save!
     create(:referral, last_state: 'accepted', partner: @subject.partner)

test/system/partner_referral_test.rb

@@ -18,12 +18,6 @@ class PartnerReferralTest < ApplicationSystemTestCase
 
   test 'make Referral' do
     visit new_partner_referral_path(@partner)
-
-    page.within_frame(find('iframe')) do
-      find('.general').click
-      find('.submit', visible: false).click
-    end
-
     send_fake_webhook_request(@partner)
 
     within("##{@partner.slug}-available-referrals") { assert_text('9') }