Changes before error encountered

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>

Author: Copilot

app/controllers/monthly_reports_controller.rb

@@ -38,7 +38,7 @@ def create
         @form_builder = FormBuilder.find(@report.owner_id)
         build_month_and_year
         load_agencies
-        @agency_id = report_params["project_id"]
+        @agency_id = report_params["organization_id"]
 
         flash[:alert] = "There was a problem submitting your form: " +
                         "#{@report.errors.full_messages.join(" ")}"
@@ -61,7 +61,7 @@ def edit
     build_month_and_year
     find_form_builder
     @report = Report.find(params[:id])
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
     @month = @report.date.month
     @year  =  @report.date.year
@@ -85,7 +85,7 @@ def update
         flash[:notice] = "Thanks for reporting on a update report. "
         redirect_to root_path
       else
-        @agencies  = current_user.projects.
+        @agencies  = current_user.organizations.
                        where(windows_type_id: @report.windows_type_id)
 
         flash[:alert] = "ERROR!!!!!!!!!!!!!!"
@@ -102,7 +102,7 @@ def show
     @answers      = @monthly_report.report_form_field_answers
 
     if @monthly_report
-      if current_user.super_user? || (@monthly_report.project && current_user.project_ids.include?(@monthly_report.project.id))
+      if current_user.super_user? || (@monthly_report.organization && current_user.organization_ids.include?(@monthly_report.organization.id))
         render :show
       else
         redirect_to root_path, error: "You do not have permission to view this page."
@@ -116,7 +116,7 @@ def show
   private
 
   def load_agencies
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                    where(windows_type_id: @form_builder.windows_type_id).uniq
   end
 
@@ -143,7 +143,7 @@ def find_form_builder
         .decorate
     end
 
-    agency     = params[:agency_id] ? Project.find(params[:agency_id]) : current_user.projects.where(windows_type_id: @form_builder.windows_type).first
+    agency     = params[:agency_id] ? Organization.find(params[:agency_id]) : current_user.organizations.where(windows_type_id: @form_builder.windows_type).first
     @agency_id = agency.id unless agency.nil?
   end
 
@@ -196,7 +196,7 @@ def build_report_form_fields
   end
 
   def find_workshop_logs
-    @workshop_logs = current_user.project_monthly_workshop_logs(
+    @workshop_logs = current_user.organization_monthly_workshop_logs(
       @report.date, @report.windows_type
     )
 
@@ -207,7 +207,7 @@ def find_workshop_logs
 
   def find_combined_workshop_logs(agency_id)
     combined_windows_type = WindowsType.where(short_name: "COMBINED").first
-    @combined_workshop_logs = current_user.project_workshop_logs(
+    @combined_workshop_logs = current_user.organization_workshop_logs(
     @report.date, combined_windows_type, agency_id)
   end
 
@@ -225,7 +225,7 @@ def report_params
     end
 
     params.require(:report).permit(
-      :type, :project_id, :date, :owner_id, :workshop_id,
+      :type, :organization_id, :date, :owner_id, :workshop_id,
       :owner_type, :windows_type_id, :other_description,
       media_files_attributes: [ :file ],
       report_form_field_answers_attributes:

app/controllers/reports_controller.rb

@@ -27,7 +27,7 @@ def share_story
 
     @report.owner_type = "FormBuilder"
     @report.owner_id   = 7
-    @agencies = current_user.projects
+    @agencies = current_user.organizations
   end
 
   def render_form
@@ -46,7 +46,7 @@ def edit
     build_month_and_year
     find_form_builder
     @report    = current_user.submitted_monthly_report(@date, @form_builder.windows_type)
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
     @month = @report.date.month
     @year  =  @report.date.year
@@ -60,7 +60,7 @@ def edit_story
                              .order(title: :asc)
 
     @report    = Report.find(params[:id])
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
   end
 
@@ -159,7 +159,7 @@ def create_story
       @report.windows_type_id = Workshop.find(@report.workshop_id).windows_type_id
     else
       @report.workshop_id = nil
-      @report.windows_type_id = @report.project.windows_type_id
+      @report.windows_type_id = @report.organization.windows_type_id
     end
 
     if @report.save
@@ -233,7 +233,7 @@ def build_report_form_fields
   end
 
   def find_workshop_logs
-    @workshop_logs = current_user.project_monthly_workshop_logs(
+    @workshop_logs = current_user.organization_monthly_workshop_logs(
       @report.date, @report.windows_type
     )
 
@@ -256,7 +256,7 @@ def report_params
     end
 
     params.require(:report).permit(
-      :image, :form_file, :type, :project_id, :date, :workshop_name, :owner_id, :workshop_id,
+      :image, :form_file, :type, :organization_id, :date, :workshop_name, :owner_id, :workshop_id,
       :owner_type, :windows_type_id, report_form_field_answers_attributes:
       [ :form_field_id, :answer_option_id, :answer, :_create ],
       media_files_attributes: [ :file ],

app/controllers/workshop_logs_controller.rb

@@ -9,7 +9,7 @@ def index
         WorkshopLog.all
       else
         WorkshopLog.where(created_by_id: current_user.id)
-                   .or(WorkshopLog.project_id(current_user.project_ids))
+                   .or(WorkshopLog.organization_id(current_user.organization_ids))
       end
     @workshop_logs_unpaginated = permitted_logs.includes(:workshop, :user, :windows_type)
                                                .search(params)
@@ -83,7 +83,7 @@ def show
     @answers      = @workshop_log.report_form_field_answers
 
     if @workshop_log
-      if current_user.super_user? || (@workshop_log.project && current_user.project_ids.include?(@workshop_log.project.id))
+      if current_user.super_user? || (@workshop_log.organization && current_user.organization_ids.include?(@workshop_log.organization.id))
         render :show
       else
         redirect_to root_path, error: "You do not have permission to view this page."
@@ -104,7 +104,7 @@ def edit
   def validate_new
     @date         = Date.new(params[:year].to_i, params[:month].to_i)
     @windows_type = WindowsType.find(params[:windows_type])
-    @report       = current_user.submitted_monthly_report(@date, @windows_type, params[:project_id])
+    @report       = current_user.submitted_monthly_report(@date, @windows_type, params[:organization_id])
 
     render json: { validate: @report.nil? }.to_json
   end
@@ -125,10 +125,10 @@ def set_index_variables # needs to not be private
                         .distinct
                         .order(:last_name, :first_name)
     @projects = if current_user.super_user?
-      # Project.where(id: @workshop_logs_unpaginated.pluck(:project_id)).order(:name)
-      Project.active.order(:name)
+      # Organization.where(id: @workshop_logs_unpaginated.pluck(:organization_id)).order(:name)
+      Organization.active.order(:name)
     else
-      current_user.projects.order(:name)
+      current_user.organizations.order(:name)
     end
     @workshops = Workshop.where(id: @workshop_logs_unpaginated.select(:workshop_id).distinct)
                          .order(:title)
@@ -182,11 +182,11 @@ def set_form_variables
     end
 
     @agencies =
-      Project.where(id: current_user.projects.select(:id))
-             .or(Project.where(id: @workshop_log.project_id))
-             .distinct
-             .order(:name)
-    agency = params[:agency_id].present? ? Project.where(id: params[:agency_id]).last : @agencies.first
+      Organization.where(id: current_user.organizations.select(:id))
+                   .or(Organization.where(id: @workshop_log.organization_id))
+                   .distinct
+                   .order(:name)
+    agency = params[:agency_id].present? ? Organization.where(id: params[:agency_id]).last : @agencies.first
     @agency_id = agency.id if agency
   end
 
@@ -210,7 +210,7 @@ def set_workshop
   def workshop_log_params
     params.require(:workshop_log).permit(
       :children_ongoing, :children_first_time, :teens_ongoing, :teens_first_time,
-      :adults_ongoing, :adults_first_time, :owner_id, :owner_type, :user_id, :project_id, :date,
+      :adults_ongoing, :adults_first_time, :owner_id, :owner_type, :user_id, :organization_id, :date,
       :workshop_name, :workshop_id, :windows_type_id, :other_description, # :user,
       quotable_item_quotes_attributes: [
         :id, :quotable_type, :quotable_id, :_destroy,

app/models/user.rb

@@ -123,11 +123,11 @@ def recent_activity(activity_limit = 10)
     recent.sort_by { |item| item.try(:updated_at) || item.created_at }.reverse.first(activity_limit * 8)
   end
 
-  def project_monthly_workshop_logs(date, *windows_type)
+  def organization_monthly_workshop_logs(date, *windows_type)
     where = windows_type.map { |wt| "windows_type_id = ?" }
 
-    logs = projects.map do |project|
-      project.workshop_logs.where(where.join(" OR "), *windows_type)
+    logs = organizations.map do |organization|
+      organization.workshop_logs.where(where.join(" OR "), *windows_type)
     end.flatten
     logs = logs.select do |log|
       log.date && log.date.month == date.month.to_i &&
@@ -136,9 +136,9 @@ def project_monthly_workshop_logs(date, *windows_type)
     logs.uniq.group_by { |log| log.date }
   end
 
-  def project_workshop_logs(date, windows_type, project_id)
-    if project_id
-      logs = workshop_logs.where(project_id: project_id, windows_type_id: windows_type.id)
+  def organization_workshop_logs(date, windows_type, organization_id)
+    if organization_id
+      logs = workshop_logs.where(organization_id: organization_id, windows_type_id: windows_type.id)
       logs = logs.select do |log|
         log.date && log.date.month == date.month.to_i &&
           log.date.year == date.year.to_i