Fixed lint

Author: lodewiges

.rubocop.yml

@@ -33,9 +33,6 @@ Metrics/BlockLength:
     - 'config/routes.rb'
     - 'spec/**/*'
 
-Layout/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Exclude:
     - 'db/migrate/*'

app/models/photo.rb

@@ -22,11 +22,11 @@ class Photo < ApplicationRecord
   }
 
   scope :alumni_visible, lambda { |start_date, end_date|
-  joins(:photo_album)
-    .where(photo_albums: { visibility: 'alumni' })
-    .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}))
+    joins(:photo_album)
+      .where(photo_albums: { visibility: 'alumni' })
+      .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 }))
   }
 
   scope :with_tags, lambda {

app/models/photo_album.rb

@@ -13,11 +13,11 @@ class PhotoAlbum < ApplicationRecord
     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: 'public' })
-    .or(where.not(date: nil).where(date: start_date..end_date))
-    .or(where(date: nil).where(created_at: start_date..end_date))
+    joins(:photo_album)
+      .where(photo_albums: { visibility: 'alumni' })
+      .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))
   }
   scope :without_photo_tags, lambda {
     where.not(id: Photo.joins(:tags).select(:photo_album_id).distinct)

app/models/photo_comment.rb

@@ -7,10 +7,10 @@ class PhotoComment < ApplicationRecord
   validates :content, presence: true, length: { minimum: 1, maximum: 500 }
 
   scope :alumni_visible, lambda { |start_date, end_date|
-  joins(:photo_album)
-    .where(photo_albums: { visibility: 'alumni' })
-    .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}))
+    joins(:photo_album)
+      .where(photo_albums: { visibility: 'alumni' })
+      .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 }))
   }
 end

app/policies/photo_comment_policy.rb

@@ -1,6 +1,6 @@
 class PhotoCommentPolicy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
-    def resolve # rubocop:disable Metrics/AbcSize
+    def resolve
       if user_can_read?
         membership = user.memberships.joins(:group).where(groups: { name: 'Leden' }).first
         return if membership.nil?

app/policies/photo_policy.rb

@@ -1,6 +1,6 @@
 class PhotoPolicy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
-    def resolve # rubocop:disable Metrics/AbcSize
+    def resolve
       if user_can_read?
         membership = user.memberships.joins(:group).where(groups: { name: 'Leden' }).first
         return if membership.nil?

db/migrate/20250314221852_alumni_visibilty.rb renamed to db/migrate/20250314221852_alumni_visibility.rb

@@ -10,7 +10,7 @@ def up
   end
 
   def down
-    add_column :photo_albums, :publicly_visible, :boolean, default: false
+    add_column :photo_albums, :publicly_visible, :boolean, default: false, null: false
 
     photoAlbums.find_each do |record|
       record.update!(publicly_visible: record.visibility == 'public')