Rename image associations/models (#609)

* Rename media/images to Asset

* Display Organization, rather than Project in notices

* Adjust form_image_fields to render images and attachments, if those assns exist

* Convert tabs to spaces for rubocop

* Rename media -> asset or add comment

* Don't carry over legacy paperclip data when copying to Asset

* Convert Facilitator, User, Project to using has_one_attached, rather than associated 'SquareAsset'

* Add rake tasks for converting header on workshop into primary asset, then making sure there's only one primary_asset

* Rename SecondaryAsset to GalleryAsset

* Remove trailing comma

* Don't include avatar & logo, bc they are no longer associations

* Remove extra line

* Correct assn/class names

Author: maebeale

app/controllers/api/v1/workshops_controller.rb

@@ -16,7 +16,8 @@ def index
           { quotes: { only: :quote } },
           { sectors: { only: :name } }
         ],
-        methods: [ :main_image_url, :sector_hashtags ]
+        methods: [ :main_image_url, # leaving this until api is refactored
+                   :sector_hashtags ]
       }
     })
 

app/controllers/community_news_controller.rb

@@ -65,8 +65,8 @@ def destroy
 
   # Optional hooks for setting variables for forms or index
   def set_form_variables
-    @community_news.build_main_image if @community_news.main_image.blank?
-    @community_news.gallery_images.build
+    @community_news.build_primary_asset if @community_news.primary_asset.blank?
+    @community_news.gallery_assets.build
 
     @organizations = Project.pluck(:name, :id).sort_by(&:first)
     @windows_types = WindowsType.all
@@ -87,8 +87,8 @@ def community_news_params
       :reference_url, :youtube_url,
       :project_id, :windows_type_id,
       :author_id, :created_by_id, :updated_by_id,
-      main_image_attributes: [ :id, :file, :_destroy ],
-      gallery_images_attributes: [ :id, :file, :_destroy ]
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ]
     )
   end
 end

app/controllers/dashboard_controller.rb

@@ -2,29 +2,29 @@ class DashboardController < ApplicationController
   include AdminDashboardCardsHelper
 
   def index
-    workshops = Workshop.includes(:sectors, :categories, :windows_type, :main_image, :gallery_images)
+    workshops = Workshop.includes(:sectors, :categories, :windows_type, :primary_asset, :gallery_assets)
                         .featured
                         .published
                         .decorate
     @workshops = workshops.sort { |x, y| Date.parse(y.date) <=> Date.parse(x.date) }
 
-    @resources = Resource.includes(:windows_type, :main_image, :gallery_images)
+    @resources = Resource.includes(:windows_type, :primary_asset, :gallery_assets)
                          .featured
                          .published
                          .by_most_viewed(6)
                          .order(ordering: :asc, created_at: :desc)
                          .decorate
-    @stories = Story.includes(:windows_type, :main_image, :gallery_images)
+    @stories = Story.includes(:windows_type, :primary_asset, :gallery_assets)
                     .featured
                     .published
                     .order(:title)
                     .decorate
-    @community_news = CommunityNews.includes(:windows_type, :main_image, :gallery_images)
+    @community_news = CommunityNews.includes(:windows_type, :primary_asset, :gallery_assets)
                                    .featured
                                    .published
                                    .order(updated_at: :desc)
                                    .decorate
-    @events = Event.includes(:event_registrations, :main_image, :gallery_images)
+    @events = Event.includes(:event_registrations, :primary_asset, :gallery_assets)
                    .featured
                    .published
                    .order(:start_date)

app/controllers/events_controller.rb

@@ -67,8 +67,8 @@ def destroy
 
   def set_form_variables
     @event = @event.decorate
-    @event.build_main_image if @event.main_image.blank?
-    @event.gallery_images.build
+    @event.build_primary_asset if @event.primary_asset.blank?
+    @event.gallery_assets.build
   end
 
   def set_event
@@ -83,8 +83,8 @@ def event_params
                                   :start_date, :end_date,
                                   :registration_close_date,
                                   :publicly_visible,
-                                  main_image_attributes: [ :id, :file, :_destroy ],
-                                  gallery_images_attributes: [ :id, :file, :_destroy ]
+                                  primary_asset_attributes: [ :id, :file, :_destroy ],
+                                  gallery_assets_attributes: [ :id, :file, :_destroy ]
                                   )
   end
 

app/controllers/facilitators_controller.rb

@@ -79,7 +79,6 @@ def set_user
     def set_form_variables
       set_user
       # @facilitator.build_user if @facilitator.user.blank? # Build a fresh one if missing
-      @facilitator.build_avatar_image if @facilitator.avatar_image.blank?
 
       if @facilitator.user
         @facilitator.user.project_users.first || @facilitator.user.project_users.build
@@ -96,6 +95,7 @@ def set_form_variables
     # Only allow a list of trusted parameters through.
     def facilitator_params
       params.require(:facilitator).permit(
+        :avatar,
         :first_name, :last_name,
         :email, :email_type,
         :email_2, :email_2_type,
@@ -128,7 +128,6 @@ def facilitator_params
         :youtube_url,
         :twitter_url,
         :created_by_id, :updated_by_id,
-        avatar_image_attributes: [ :id, :file, :_destroy ],
         sectorable_items_attributes: [ :id, :sector_id, :is_leader, :_destroy ],
         addresses_attributes: [
           :id,

app/controllers/projects_controller.rb

@@ -54,7 +54,7 @@ def create
     @project = Project.new(project_params)
 
     if @project.save
-      redirect_to projects_path, notice: "Project was successfully created."
+      redirect_to projects_path, notice: "Organization was successfully created."
     else
       set_form_variables
       render :new, status: :unprocessable_content
@@ -63,7 +63,7 @@ def create
 
   def update
     if @project.update(project_params)
-      redirect_to projects_path, notice: "Project was successfully updated.", status: :see_other
+      redirect_to projects_path, notice: "Organization was successfully updated.", status: :see_other
     else
       set_form_variables
       render :edit, status: :unprocessable_content
@@ -72,13 +72,11 @@ def update
 
   def destroy
     @project.destroy!
-    redirect_to projects_path, notice: "Project was successfully destroyed."
+    redirect_to projects_path, notice: "Organization was successfully destroyed."
   end
 
   # Optional hooks for setting variables for forms or index
   def set_form_variables
-    @project.build_logo_image if @project.logo_image.blank?
-
     @project_statuses = ProjectStatus.all
     @facilitators_array = Facilitator.joins(:user)
                                      .order(:first_name, :last_name)
@@ -102,9 +100,8 @@ def set_project
   def project_params
     params.require(:project).permit(
       :name, :description, :start_date, :end_date, :mission_vision_values, :internal_id,
-      :inactive, :notes, :agency_type,  :agency_type_other, :website_url,
+      :inactive, :logo, :notes, :agency_type,  :agency_type_other, :website_url,
       :project_status_id, :location_id, :windows_type_id,
-      logo_image_attributes: [ :id, :file, :_destroy ],
       sectorable_items_attributes: [
         :id,
         :sector_id,

app/controllers/reports_controller.rb

@@ -253,8 +253,8 @@ def report_params
       :owner_type, :windows_type_id, report_form_field_answers_attributes:
       [ :form_field_id, :answer_option_id, :answer, :_create ],
       media_files_attributes: [ :file ],
-      main_image_attributes: [ :id, :file, :_destroy ],
-      gallery_images_attributes: [ :id, :file, :_destroy ]
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ]
     )
   end
 

app/controllers/resources_controller.rb

@@ -4,7 +4,7 @@ def index
     if turbo_frame_request?
       per_page = params[:number_of_items_per_page].presence || 25
       unfiltered = Resource.where(kind: Resource::PUBLISHED_KINDS) # TODO - #FIXME brittle
-        .includes(:main_image, :gallery_images, :attachments)
+        .includes(:primary_asset, :gallery_assets, :attachments)
       filtered = unfiltered.search_by_params(params)
         .by_created
       @resources = filtered.paginate(page: params[:page], per_page: per_page)
@@ -114,8 +114,8 @@ def download
   private
 
   def set_form_variables
-    @resource.build_main_image if @resource.main_image.blank?
-    @resource.gallery_images.build
+    @resource.build_primary_asset if @resource.primary_asset.blank?
+    @resource.gallery_assets.build
 
     @windows_types = WindowsType.all
     @authors = User.active.or(User.where(id: @resource.user_id))
@@ -137,8 +137,8 @@ def resource_params
     params.require(:resource).permit(
       :text, :rhino_text, :kind, :male, :female, :title, :featured, :inactive, :url,
       :agency, :author, :filemaker_code, :windows_type_id, :ordering,
-      main_image_attributes: [ :id, :file, :_destroy ],
-      gallery_images_attributes: [ :id, :file, :_destroy ],
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ],
       categorizable_items_attributes: [ :id, :category_id, :_destroy ], category_ids: [],
       sectorable_items_attributes: [ :id, :sector_id, :is_leader, :_destroy ], sector_ids: []
     )

app/controllers/stories_controller.rb

@@ -67,8 +67,8 @@ def destroy
 
   # Optional hooks for setting variables for forms or index
   def set_form_variables
-    @story.build_main_image if @story.main_image.blank?
-    @story.gallery_images.build
+    @story.build_primary_asset if @story.primary_asset.blank?
+    @story.gallery_assets.build
 
     @story_idea = StoryIdea.find(params[:story_idea_id]) if params[:story_idea_id].present?
     @user = User.find(params[:user_id]) if params[:user_id].present?
@@ -89,7 +89,7 @@ def set_form_variables
   #
   #   respond_to do |format|
   #     format.turbo_stream
-  #     format.html { redirect_to edit_story_path(@story), notice: "Image removed." }
+  #     format.html { redirect_to edit_story_path(@story), notice: "Asset removed." }
   #   end
   # end
 
@@ -105,8 +105,8 @@ def story_params
       :title, :body, :featured, :published, :youtube_url, :website_url,
       :windows_type_id, :project_id, :workshop_id, :external_workshop_title,
       :created_by_id, :updated_by_id, :story_idea_id, :spotlighted_facilitator_id,
-      main_image_attributes: [ :id, :file, :_destroy ],
-      gallery_images_attributes: [ :id, :file, :_destroy ]
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ]
     )
   end
 end

app/controllers/story_ideas_controller.rb

@@ -51,8 +51,8 @@ def destroy
 
   # Optional hooks for setting variables for forms or index
   def set_form_variables
-    @story_idea.build_main_image if @story_idea.main_image.blank?
-    @story_idea.gallery_images.build
+    @story_idea.build_primary_asset if @story_idea.primary_asset.blank?
+    @story_idea.gallery_assets.build
 
     @user = User.find(params[:user_id]) if params[:user_id].present?
     @projects = (@user || current_user).projects.order(:name)
@@ -69,7 +69,7 @@ def set_form_variables
   #
   #   respond_to do |format|
   #     format.turbo_stream
-  #     format.html { redirect_to edit_story_path(@story_idea), notice: "Image removed." }
+  #     format.html { redirect_to edit_story_path(@story_idea), notice: "Asset removed." }
   #   end
   # end
 
@@ -86,8 +86,8 @@ def story_idea_params
       :permission_given, :publish_preferences, :promoted_to_story,
       :windows_type_id, :project_id, :workshop_id, :external_workshop_title,
       :created_by_id, :updated_by_id,
-      main_image_attributes: [ :id, :file, :_destroy ],
-      gallery_images_attributes: [ :id, :file, :_destroy ]
+      primary_asset_attributes: [ :id, :file, :_destroy ],
+      gallery_assets_attributes: [ :id, :file, :_destroy ]
     )
   end
 end