updated everything to reflect changes

Author: lodewiges

app/models/photo.rb

@@ -21,14 +21,10 @@ class Photo < ApplicationRecord
     joins(:comments).distinct
   }
 
-  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(photo_albums: { visibility: 'public' })
     .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}))
   }

app/models/photo_album.rb

@@ -7,15 +7,15 @@ class PhotoAlbum < ApplicationRecord
   belongs_to :group, optional: true
 
   validates :title, presence: true
-  validates :visibility, inclusion: { in: %w[everybody alumni members] }
+  validates :visibility, inclusion: { in: %w[public alumni members] }
 
   scope :publicly_visible, lambda {
-    joins(:photo_album).where(photo_albums: { visibility: 'everybody' })
+    joins(:photo_album).where(photo_albums: { visibility: 'public' })
   }
   scope :alumni_visible, lambda { |start_date, end_date|
   joins(:photo_album)
     .where(photo_albums: { visibility: 'alumni' })
-    .or(photo_albums: { visibility: 'everybody' })
+    .or(photo_albums: { visibility: 'public' })
     .or(where.not(date: nil).where(date: start_date..end_date))
     .or(where(date: nil).where(created_at: start_date..end_date))
   }

app/models/photo_comment.rb

@@ -6,14 +6,10 @@ class PhotoComment < ApplicationRecord
 
   validates :content, presence: true, length: { minimum: 1, maximum: 500 }
 
-  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(photo_albums: { visibility: 'public' })
     .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}))
   }

app/policies/photo_album_policy.rb

@@ -5,7 +5,7 @@ def resolve # rubocop:disable Metrics/AbcSize
         membership = user.memberships.joins(:group).where(groups: { name: 'Leden' }).first
         return scope.publicly_visible if membership.nil?
 
-        scope.posted_between_or_publicly_visible(
+        scope.alumni_visible(
           membership.start_date&.advance(months: -18),
           membership.end_date&.advance(months: 6)
         )

app/policies/photo_comment_policy.rb

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

app/policies/photo_policy.rb

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

db/migrate/20250314221852_alumni_visibilty.rb

@@ -0,0 +1,21 @@
+class AlumniVisibility < ActiveRecord::Migration[7.0]
+  def up
+    add_column :photo_albums, :visibility, :string, default: 'members'
+
+    photoAlbums.find_each do |record|
+      record.update!(visibility: record.publicly_visible ? 'public' : 'members')
+    end
+
+    remove_column :photo_albums, :publicly_visible
+  end
+
+  def down
+    add_column :photo_albums, :publicly_visible, :boolean, default: false
+
+    photoAlbums.find_each do |record|
+      record.update!(publicly_visible: record.visibility == 'public')
+    end
+
+    remove_column :photo_albums, :visibility
+  end
+end