mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-11 09:17:20 -04:00
* Refactor Activity model to remove Elasticsearch integration - Removed `SearchActivities` concern and Searchkick from `Activity` model. - Implemented `Activity.homepage_records` using ActiveRecord with `DISTINCT ON` for PostgreSQL. - Updated `ActivitiesController#index` to use ActiveRecord queries with eager loading and pagination. - Added `active` scope to `Activity`. - Added unit tests for `Activity` model. - Deleted `app/models/concerns/search_activities.rb`. Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com> * Fix NoMethodError: undefined method 'reindex' for class Activity - Removed all calls to `Activity.reindex` in migrations, rake tasks, and spec helpers. - These were causing failures after the removal of Searchkick from the Activity model. Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com> * Fix ambiguous column id in homepage_records query - Updated `Activity.homepage_records` to use `activities.id` instead of `id` in the subquery. - This resolves the `PG::AmbiguousColumn: ERROR: column reference "id" is ambiguous` error. Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com> * Fix ambiguous created_at in homepage_records query - Use `unscoped` in the subquery for `Activity.homepage_records` to bypass the default scope from `Ownable` concern. - This prevents the join with the `members` table in the subquery, which was causing `PG::AmbiguousColumn: ERROR: column reference "created_at" is ambiguous`. Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com> * Complete refactoring of Activity model to remove Elasticsearch - Removed SearchActivities concern and searchkick integration. - Updated ActivitiesController#index to use ActiveRecord queries. - Implemented performant Activity.homepage_records using DISTINCT ON (PostgreSQL). - Added Activity.active scope. - Added no-op Activity.reindex (class and instance methods) for backward compatibility. - Cleaned up leftover reindex calls in rake tasks, migrations, and spec helpers. - Added unit tests for new Activity model logic. - Updated factories to include no-op reindex traits. Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com> * Less eager loading --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
115 lines
2.9 KiB
Ruby
115 lines
2.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivitiesController < DataController
|
|
def index
|
|
@show_all = params[:all] == '1'
|
|
|
|
@activities = Activity.includes(:owner).order(created_at: :desc)
|
|
@activities = @activities.active unless @show_all
|
|
|
|
if params[:member_slug].present?
|
|
@owner = Member.find_by!(slug: params[:member_slug])
|
|
@activities = @activities.where(owner_id: @owner.id)
|
|
end
|
|
|
|
@activities = @activities.paginate(page: params[:page], per_page: 30)
|
|
|
|
@filename = "Growstuff-#{specifics}Activities-#{Time.zone.now.to_fs(:number)}.csv"
|
|
respond_with(@activities)
|
|
end
|
|
|
|
def show
|
|
if @activity.finished? && @activity.owner == current_member && (@activity.updated_at + 2.weeks) > Time.now
|
|
@repeat_link = new_activity_path(
|
|
name: @activity.name,
|
|
garden_id: @activity.garden_id,
|
|
planting_id: @activity.planting_id,
|
|
category: @activity.category,
|
|
description: @activity.description,
|
|
due_date: 2.weeks.from_now.to_date
|
|
)
|
|
end
|
|
|
|
respond_with @activity
|
|
end
|
|
|
|
def new
|
|
@activity = Activity.new(
|
|
owner: current_member,
|
|
due_date: Date.today
|
|
)
|
|
@activity.name = params[:name] if params[:name]
|
|
@activity.description = params[:description] if params[:description]
|
|
@activity.category = params[:category] if params[:category]
|
|
@activity.due_date = params[:due_date] if params[:due_date]
|
|
if params[:garden_id]
|
|
@activity.garden = Garden.find_by(
|
|
owner: current_member,
|
|
id: params[:garden_id]
|
|
)
|
|
end
|
|
|
|
if params[:planting_id]
|
|
@activity.planting = Planting.find_by(
|
|
owner: current_member,
|
|
id: params[:planting_id]
|
|
)
|
|
end
|
|
|
|
respond_with @activity
|
|
end
|
|
|
|
def edit
|
|
# the following are needed to display the form but aren't used
|
|
@gardens = @activity.owner.gardens.active.order_by_name
|
|
@plantings = @activity.owner.plantings.active
|
|
end
|
|
|
|
def create
|
|
@activity = Activity.new(activity_params)
|
|
@activity.owner = current_member
|
|
@activity.due_date ||= Date.today
|
|
|
|
if @activity.save
|
|
if params[:repeat_times].to_i > 0
|
|
repeat_times = params[:repeat_times].to_i
|
|
repeat_weeks = params[:repeat_weeks].to_i
|
|
|
|
repeat_times.times do |i|
|
|
new_activity = @activity.dup
|
|
new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
|
|
new_activity.save
|
|
end
|
|
end
|
|
end
|
|
|
|
respond_with @activity
|
|
end
|
|
|
|
def update
|
|
@activity.update(activity_params)
|
|
respond_with @activity
|
|
end
|
|
|
|
def destroy
|
|
@activity.destroy
|
|
respond_with @activity, location: @activity.garden
|
|
end
|
|
|
|
private
|
|
|
|
def activity_params
|
|
params.require(:activity).permit(
|
|
:name, :description, :category, :finished,
|
|
:garden_id, :planting_id, :due_date,
|
|
:repeat_times, :repeat_weeks
|
|
)
|
|
end
|
|
|
|
def specifics
|
|
return if @owner.blank?
|
|
|
|
"#{@owner.to_param}-"
|
|
end
|
|
end
|