Merge pull request #4678 from Growstuff/fix-photo-reindex-error-4629481995101950332

Fix NoMethodError: undefined method 'reindex' for class Photo in specs

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
 
 # Install Rails
-RUN gem install rails:7.0.8
+RUN gem install rails:8.0.5
 
 # Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
 # The value is a comma-separated list of allowed domains

Dockerfile

@@ -25,7 +25,7 @@ ENV RAILS_ENV=production \
 WORKDIR /app
 
 # Install gems
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock .ruby-version ./
 RUN bundle config set --local deployment 'true' && \
     bundle config set --local without 'development test' && \
     bundle install --jobs 4 --retry 3

Gemfile.lock

@@ -441,7 +441,7 @@ GEM
       bigdecimal (>= 3.1, < 5)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -452,10 +452,10 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.19.3)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
     oj (3.17.3)

app.json

@@ -1,6 +1,6 @@
 {
   "name": "growstuff",
-  "stack": "heroku-18",
+  "stack": "heroku-26",
   "description": "Open data project for small-scale food growers",
   "scripts": {
     "postdeploy": "bundle exec rails db:seed"

app/controllers/likes_controller.rb

@@ -11,7 +11,7 @@ class LikesController < ApplicationController
       likeable_id:   params[:id]
     )
     if @like.likeable && @like.save
-      @like.likeable.reindex(refresh: true)
+      @like.likeable.reindex(refresh: true) if @like.likeable.respond_to?(:reindex)
       success(@like, liked_by_member: true, status_code: :created)
     else
       failed(@like, message: t('messages.unable_to_like'))
@@ -26,7 +26,7 @@ class LikesController < ApplicationController
     )
 
     if @like&.destroy
-      @like.likeable.reindex(refresh: true)
+      @like.likeable.reindex(refresh: true) if @like.likeable.respond_to?(:reindex)
       success(@like, liked_by_member: false, status_code: :ok)
     else
       failed(@like, message: t('messages.unable_to_unlike'))

app/controllers/photos_controller.rb

@@ -9,13 +9,17 @@ class PhotosController < ApplicationController
   responders :flash
 
   def index
-    @photos = Photo.search(
-      load:     false,
-      boost_by: [:created_at],
-      where:    index_where_clause,
-      page:     params[:page],
-      limit:    Photo.per_page
-    )
+    @photos = if @crop
+                @crop.photos
+              elsif @planting
+                @planting.photos
+              else
+                Photo.all
+              end
+
+    @photos = @photos.includes(:owner)
+                     .order(created_at: :desc)
+                     .paginate(page: params[:page], per_page: Photo.per_page)
     respond_with(@photos)
   end
 
@@ -114,18 +118,6 @@ class PhotosController < ApplicationController
     end
   end
 
-  def index_where_clause
-    if params[:crop_slug]
-      { crops: @crop.id }
-    elsif params[:planting_id]
-      { planting_id: @planting.id }
-    elsif params[:planting_slug]
-      { plantings: @planting.id }
-    else
-      {}
-    end
-  end
-
   def set_crop_and_planting
     @crop = Crop.find params[:crop_slug] if params[:crop_slug]
     @planting = Planting.find params[:planting_id] if params[:planting_id]

app/models/concerns/search_photos.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module SearchPhotos
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   title:      { type: :text },
-                   created_at: { type: :integer }
-                 }
-               }
-
-    def search_data
-      {
-        id:,
-        title:,
-        thumbnail_url:,
-        fullsize_url:,
-        # crops
-        crops:                  crops.pluck(:id),
-        # likes
-        liked_by_members_names:,
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-        # counts
-        likes_count:,
-
-        created_at:             created_at.to_i
-      }
-    end
-  end
-end

app/models/photo.rb

@@ -3,7 +3,6 @@
 class Photo < ApplicationRecord
   include Likeable
   include Ownable
-  include SearchPhotos
 
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze
 

spec/controllers/photos_controller_spec.rb

@@ -2,15 +2,14 @@
 
 require 'rails_helper'
 
-describe PhotosController, :search do
+describe PhotosController do
   login_member
 
   describe 'GET index' do
     describe 'all photos' do
-      let!(:photo) { create(:photo, :reindex) }
+      let!(:photo) { create(:photo) }
 
       before do
-        Photo.reindex
         get :index
       end
 
@@ -21,28 +20,23 @@ describe PhotosController, :search do
     end
 
     describe '#index crop photos' do
-      let!(:photo)      { create(:photo, :reindex, owner: member, title: 'no assocations photo') }
-      let!(:crop_photo) { create(:photo, :reindex, owner: member, title: 'photos of planting')   }
-      let!(:planting)   { create(:planting, :reindex, crop:, owner: member) }
-      let!(:crop)       { create(:crop, :reindex) }
+      let!(:photo)      { create(:photo, owner: member, title: 'no assocations photo') }
+      let!(:crop_photo) { create(:photo, owner: member, title: 'photos of planting')   }
+      let!(:crop)       { create(:crop) }
+      let!(:planting)   { create(:planting, crop:, owner: member) }
 
       before do
         planting.photos << crop_photo
-        Photo.reindex
         get :index, params: { crop_slug: crop.to_param }
       end
 
       describe "find photos by crop" do
-        it "has indexed the photos of this crop" do
-          expect(Photo.search).to include crop_photo
-        end
-
         it "assigns crop" do
           expect(assigns(:crop)).to eq crop
         end
 
         it { expect(assigns(:photos).size).to eq 1 }
-        it { expect(assigns(:photos).first.crops).to include crop.id }
+        it { expect(assigns(:photos).first.crops).to include crop }
         it { expect(assigns(:photos).first.id).to eq crop_photo.id }
       end
     end

spec/factories/photos.rb

@@ -19,10 +19,5 @@ FactoryBot.define do
       license_url { nil }
     end
 
-    trait :reindex do
-      after(:create) do |photo, _evaluator|
-        photo.reindex(refresh: true)
-      end
-    end
   end
 end

spec/features/home/home_spec.rb

@@ -28,7 +28,6 @@ describe "home page", :search do
     Planting.reindex
     Seed.reindex
     Harvest.reindex
-    Photo.reindex
 
     visit root_path
   end

spec/features/likeable_spec.rb

@@ -6,14 +6,10 @@ describe 'Likeable', :js, :search do
   let(:another_member) { create(:london_member) }
   let!(:post)           { create(:post, :reindex, author: member) }
   let!(:activity)       { create(:activity, :reindex, owner: member) }
-  let!(:photo)          { create(:photo, :reindex, owner: member) }
+  let!(:photo)          { create(:photo, owner: member) }
   let!(:harvest)        { create(:harvest, :reindex, owner: member) }
   let!(:planting)       { create(:planting, :reindex, owner: member) }
 
-  before do
-    Photo.reindex
-  end
-
   include_context 'signed in member'
 
   shared_examples 'object can be liked' do

spec/models/photo_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Photo do
-  let(:photo)  { create(:photo, :reindex, owner: member) }
+  let(:photo)  { create(:photo, owner: member) }
   let(:member) { create(:member) }
 
   it_behaves_like "it is likeable"
@@ -237,36 +237,4 @@ describe Photo do
     end
   end
 
-  describe 'Elastic search indexing', :search do
-    let!(:planting) { create(:planting, :reindex, owner: photo.owner) }
-    let!(:crop) { create(:crop, :reindex) }
-
-    before do
-      planting.photos << photo
-      described_class.reindex
-      described_class.searchkick_index.refresh
-    end
-
-    describe "finds all photos in search index" do
-      it "finds just one" do
-        expect(described_class.search.count).to eq 1
-      end
-
-      it "finds the matching photo" do
-        expect(described_class.search).to include photo
-      end
-
-      it "retrieves crops from ES" do
-        expect(described_class.search(load: false).first.crops).to eq [planting.crop.id]
-      end
-    end
-
-    it "finds photos by owner in search index" do
-      expect(described_class.search(where: { owner_id: planting.owner_id })).to include photo
-    end
-
-    it "finds photos by crop in search index" do
-      expect(described_class.search(where: { crops: planting.crop.id })).to include photo
-    end
-  end
 end

spec/spec_helper.rb

@@ -47,7 +47,6 @@ RSpec.configure do |config|
     # reindex models
     Crop.reindex
     Harvest.reindex
-    Photo.reindex
     Planting.reindex
     Seed.reindex
   end