update all policies

Author: lodewiges

app/models/photo.rb

@@ -25,8 +25,12 @@ class Photo < ApplicationRecord
     joins(:photo_album).where(photo_albums: { visibility: 'everybody' })
   }
 
-  scope :alumni_visible, lambda {
-    joins(:photo_album).where(photo_albums: { visibility: 'alumni' })
+  scope :alumni_visible, lambda { |start_date, end_date|
+  joins(:photo_album)
+    .where(photo_albums: { visibility: 'alumni' })
+    .or(photo_albums: { visibility: 'everybody' })
+    .or(where.not(photo_albums: { date: nil}).where(photo_albums: { date: start_date..end_date}))
+    .or(where(photo_albums: { date: nil }).where(photo_albums: { created_at: start_date..end_date}))
   }
 
   scope :with_tags, lambda {

app/models/photo_album.rb

@@ -9,12 +9,15 @@ class PhotoAlbum < ApplicationRecord
   validates :title, presence: true
   validates :visibility, inclusion: { in: %w[everybody alumni members] }
 
-  scope :alumni_visible, -> { where(visibility: 'alumni') }
-  scope :publicly_visible, -> { where(visibility: 'everybody') }
-  scope :posted_between_or_publicly_visible, lambda { |start_date, end_date|
-    where(publicly_visible: true)
-      .or(where.not(date: nil).where(date: start_date..end_date))
-      .or(where(date: nil).where(created_at: start_date..end_date))
+  scope :publicly_visible, lambda {
+    joins(:photo_album).where(photo_albums: { visibility: 'everybody' })
+  }
+  scope :alumni_visible, lambda { |start_date, end_date|
+  joins(:photo_album)
+    .where(photo_albums: { visibility: 'alumni' })
+    .or(photo_albums: { visibility: 'everybody' })
+    .or(where.not(date: nil).where(date: start_date..end_date))
+    .or(where(date: nil).where(created_at: start_date..end_date))
   }
   scope :without_photo_tags, lambda {
     where.not(id: Photo.joins(:tags).select(:photo_album_id).distinct)

app/models/photo_comment.rb

@@ -10,7 +10,11 @@ class PhotoComment < ApplicationRecord
     joins(:photo_album).where(photo_albums: { visibility: 'everybody' })
   }
 
-  scope :alumni_visible, lambda {
-    joins(:photo_album).where(photo_albums: { visibility: 'alumni' })
+  scope :alumni_visible, lambda { |start_date, end_date|
+  joins(:photo_album)
+    .where(photo_albums: { visibility: 'alumni' })
+    .or(photo_albums: { visibility: 'everybody' })
+    .or(where.not(photo_albums: { date: nil}).where(photo_albums: { date: start_date..end_date}))
+    .or(where(photo_albums: { date: nil }).where(photo_albums: { created_at: start_date..end_date}))
   }
 end