fix a error

Author: lodewiges

Gemfile.lock

@@ -129,7 +129,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    csv (3.3.4)
+    csv (3.3.5)
     date (3.4.1)
     date (3.4.1-java)
     debug_inspector (1.2.0)
@@ -511,7 +511,7 @@ GEM
       logger
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
-    sidekiq-scheduler (6.0.0)
+    sidekiq-scheduler (6.0.1)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 7.3, < 9)
     simplecov (0.22.0)
@@ -579,15 +579,15 @@ DEPENDENCIES
   binding_of_caller (~> 1.0, >= 1.0.1)
   bootsnap (~> 1.18, >= 1.18.6)
   brakeman (~> 7.0, >= 7.0.2)
-  bullet (~> 8.0, >= 8.0.7)
+  bullet (~> 8.0, >= 8.0.8)
   carrierwave (~> 3.1, >= 3.1.2)
   carrierwave-base64 (~> 2.11)
   carrierwave-bombshelter (~> 0.2, >= 0.2.2)
   case_transform (~> 0.2)
   colorize (~> 1.1)
   consistency_fail
   counter_culture (~> 3.10, >= 3.10.1)
-  csv (~> 3.3, >= 3.3.4)
+  csv (~> 3.3, >= 3.3.5)
   doorkeeper (~> 5.8, >= 5.8.2)
   doorkeeper-i18n (~> 5.2, >= 5.2.7)
   dotenv-rails (~> 3.1, >= 3.1.8)
@@ -625,7 +625,7 @@ DEPENDENCIES
   redis (~> 5.4)
   roo (~> 2.10, >= 2.10.1)
   rspec-rails (~> 8.0)
-  rubocop (~> 1.75, >= 1.75.6)
+  rubocop (~> 1.75, >= 1.75.8)
   rubocop-factory_bot (~> 2.27, >= 2.27.1)
   rubocop-performance (~> 1.25)
   rubocop-rails (~> 2.32)
@@ -638,7 +638,7 @@ DEPENDENCIES
   sentry-sidekiq (~> 5.24)
   sepa_king (~> 0.14)
   sidekiq (~> 7.3, >= 7.3.9)
-  sidekiq-scheduler (~> 6.0)
+  sidekiq-scheduler (~> 6.0, >= 6.0.1)
   simplecov (~> 0.22)
   simplecov-lcov (~> 0.8)
   spring (~> 4.3)

app/models/photo_comment.rb

@@ -7,14 +7,6 @@ class PhotoComment < ApplicationRecord
   validates :content, presence: true, length: { minimum: 1, maximum: 500 }
 
   scope :alumni_visible, lambda { |start_date, end_date|
-    joins(photo: :photo_album).where(
-      <<~SQL.squish,
-        photo_albums.visibility IN ('alumni','public')
-        OR (photo_albums.date IS NOT NULL AND photo_albums.date BETWEEN :start_date AND :end_date)
-        OR (photo_albums.date IS NULL AND photo_albums.created_at BETWEEN :start_date AND :end_date)
-      SQL
-      start_date: start_date,
-      end_date: end_date
-    )
+    joins(:photo).merge(Photo.alumni_visible(start_date, end_date))
   }
 end

app/policies/photo_policy.rb

@@ -3,14 +3,14 @@ class Scope < ApplicationPolicy::Scope
     def resolve # rubocop:disable Metrics/AbcSize
       if user_can_read?
         membership = user.memberships.joins(:group).where(groups: { name: 'Leden' }).first
-        return scope.publicly_visible if membership.nil?
+        return scope.none if membership.nil?
 
         scope.alumni_visible(
           membership.start_date&.advance(months: -18),
           membership.end_date&.advance(months: 6)
         )
       else
-        scope.publicly_visible
+        scope.none
       end
     end
   end