From 27f4282f5b89c1ae10ea08885b976794f5e1b487 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 21 Sep 2026 21:28:46 +1200
Subject: [PATCH] Let plantings use a crop's alternate name

A planting can now choose one of its crop's alternate names (eg. "lauki"
for calabash, "aubergine" for eggplant) and shows it instead of the
crop's primary name.

- plantings.alternate_name_id, validated to belong to the planting's crop
- Planting#display_name, used on cards, the planting page, garden lists,
  the member page, the homepage and the RSS/ICS feeds
- planting form offers the crop's alternate names, preselecting the one
  that was searched for
- crop autosuggest shows the matched alternate name, eg.
  "aubergine (eggplant)", via matched_alternate_name in the search JSON

Part of #554

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 app/assets/javascripts/auto_suggest.js.coffee |    2 +-
 .../planting_alternate_name.js.coffee         |   26 +
 app/controllers/alternate_names_controller.rb |    4 +-
 app/controllers/crops_controller.rb           |   19 +-
 app/controllers/plantings_controller.rb       |    2 +-
 app/helpers/gardens_helper.rb                 |    2 +-
 app/models/planting.rb                        |   15 +-
 app/views/home/_plantings.html.haml           |    4 +-
 app/views/members/show.html.haml              |    2 +-
 app/views/plantings/_card.html.haml           |    4 +-
 app/views/plantings/_form.html.haml           |    8 +
 .../plantings/_image_with_popover.html.haml   |    2 +-
 app/views/plantings/_tiny.html.haml           |    2 +-
 app/views/plantings/index.ics.erb             |    6 +-
 app/views/plantings/index.rss.haml            |    2 +-
 app/views/plantings/show.html.haml            |    6 +-
 ...1000000_add_alternate_name_to_plantings.rb |    6 +
 db/schema.rb                                  | 1065 +++++++++--------
 spec/controllers/crops_controller_spec.rb     |   15 +
 spec/models/planting_spec.rb                  |   20 +
 20 files changed, 662 insertions(+), 550 deletions(-)
 create mode 100644 app/assets/javascripts/planting_alternate_name.js.coffee
 create mode 100644 db/migrate/20260921000000_add_alternate_name_to_plantings.rb

diff --git a/app/assets/javascripts/auto_suggest.js.coffee b/app/assets/javascripts/auto_suggest.js.coffee
index 60e9304c0..335e27d8d 100644
--- a/app/assets/javascripts/auto_suggest.js.coffee
+++ b/app/assets/javascripts/auto_suggest.js.coffee
@@ -33,5 +33,5 @@ jQuery ->
       el.data( 'uiAutocomplete' )._renderItem = ( ul, item ) ->
         $( '<li class="list-group-item"></li>' )
           .data( 'item.autocomplete', item )
-          .append( "<a>#{item.name}</a>" )
+          .append( if item.matched_alternate_name then "<a>#{item.matched_alternate_name} <small class=\"text-muted\">(#{item.name})</small></a>" else "<a>#{item.name}</a>" )
           .appendTo( ul )
diff --git a/app/assets/javascripts/planting_alternate_name.js.coffee b/app/assets/javascripts/planting_alternate_name.js.coffee
new file mode 100644
index 000000000..3d777e325
--- /dev/null
+++ b/app/assets/javascripts/planting_alternate_name.js.coffee
@@ -0,0 +1,26 @@
+# When a crop is chosen in the planting form, offer that crop's alternate names.
+# Searching by an alternate name ("lauki") preselects it.
+jQuery ->
+  wrapper = $( '#planting-alternate-name' )
+  return unless wrapper.length
+
+  select = wrapper.find( 'select' )
+  crop_id = $( '#planting_crop_id' )
+  crop_input = $( '#crop' )
+
+  load = ( id, typed ) ->
+    select.empty()
+    return wrapper.addClass( 'd-none' ) unless id
+    $.getJSON wrapper.data( 'source-url' ), { crop_id: id }, ( names ) ->
+      select.append( $( '<option>' ).text( crop_input.val() ).val( '' ) )
+      for alt in names
+        option = $( '<option>' ).text( alt.name ).val( alt.id )
+        option.prop( 'selected', true ) if typed and alt.name.toLowerCase() == typed.toLowerCase()
+        select.append( option )
+      wrapper.toggleClass( 'd-none', names.length == 0 )
+
+  crop_input.on 'autocompleteselect', ( event, ui ) ->
+    typed = ui.item.matched_alternate_name
+    setTimeout ->
+      load( crop_id.val(), typed )
+    , 0
diff --git a/app/controllers/alternate_names_controller.rb b/app/controllers/alternate_names_controller.rb
index 4c975cab8..9217789a0 100644
--- a/app/controllers/alternate_names_controller.rb
+++ b/app/controllers/alternate_names_controller.rb
@@ -9,7 +9,9 @@ class AlternateNamesController < ApplicationController
   # GET /alternate_names
   # GET /alternate_names.json
   def index
-    @alternate_names = AlternateName.all.order(:name).paginate(page: params[:page], per_page: 100)
+    @alternate_names = AlternateName.all.order(:name)
+    @alternate_names = @alternate_names.where(crop_id: params[:crop_id]) if params[:crop_id].present?
+    @alternate_names = @alternate_names.paginate(page: params[:page], per_page: 100)
     respond_with(@alternate_names)
   end
 
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 77b7b1e81..2a8f09687 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -63,7 +63,7 @@ class CropsController < ApplicationController
         render
       end
       format.json do
-        render json: @crops.to_a
+        render json: @crops.map { |crop| crop_search_result(crop) }
       end
     end
   end
@@ -177,6 +177,23 @@ class CropsController < ApplicationController
              end.paginate(page: params[:page], per_page: 50)
   end
 
+  # A search hit, plus the alternate name that matched the term when the
+  # crop's own name didn't ("aubergine" finds eggplant)
+  def crop_search_result(crop)
+    result = crop.as_json
+    return result if word_start_match?(result['name'], @term)
+
+    matched = Array(result['alternate_names']).find { |name| word_start_match?(name, @term) }
+    result['matched_alternate_name'] = matched if matched
+    result
+  end
+
+  def word_start_match?(name, term)
+    name = name.to_s.downcase
+    term = term.to_s.downcase.strip
+    name.start_with?(term) || name.split(/[\s-]+/).any? { |word| word.start_with?(term) }
+  end
+
   private
 
   def notifier
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 053f8de9f..9823d84fe 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -138,7 +138,7 @@ class PlantingsController < DataController
   def planting_params
     params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
     params.require(:planting).permit(
-      :crop_id, :description, :garden_id, :planted_at,
+      :crop_id, :alternate_name_id, :description, :garden_id, :planted_at,
       :parent_seed_id,
       :quantity, :sunniness, :planted_from, :finished,
       :finished_at, :failed, :overall_rating
diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb
index c088faef4..e70a7c4ed 100644
--- a/app/helpers/gardens_helper.rb
+++ b/app/helpers/gardens_helper.rb
@@ -35,7 +35,7 @@ module GardensHelper
       plantings.each do |planting|
         output += "<li>"
         output += planting.quantity.nil? ? "0 " : "#{planting.quantity} "
-        output += link_to planting.crop.name, planting.crop
+        output += link_to planting.display_name, planting.crop
         output += ", planted on #{planting.planted_at}</li>"
       end
       output += '</ul>'
diff --git a/app/models/planting.rb b/app/models/planting.rb
index e898a7966..84ca9b31a 100644
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -21,6 +21,7 @@ class Planting < ApplicationRecord
 
   belongs_to :garden
   belongs_to :crop, counter_cache: true
+  belongs_to :alternate_name, optional: true
   has_many :harvests, dependent: :destroy
   has_many :activities, dependent: :destroy
 
@@ -72,6 +73,7 @@ class Planting < ApplicationRecord
   ## Validations
   validates :garden, presence: true
   validates :crop, presence: true, approved: { message: :crop_must_be_approved }
+  validate :alternate_name_must_belong_to_crop
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
   validate :cannot_be_finished_and_failed
@@ -96,9 +98,14 @@ class Planting < ApplicationRecord
     ].join('-').tr(' ', '-').downcase
   end
 
+  # The name the owner wants to see: their chosen alternate name, else the crop's primary name
+  def display_name
+    alternate_name&.name.presence || crop.name
+  end
+
   # stringify as "beet in Skud's backyard" or similar
   def to_s
-    I18n.t('plantings.string', crop: crop.name, garden: garden.name, owner:)
+    I18n.t('plantings.string', crop: display_name, garden: garden.name, owner:)
   end
 
   def finished?
@@ -155,4 +162,10 @@ class Planting < ApplicationRecord
 
     errors.add(:owner, :same_owner_required)
   end
+
+  def alternate_name_must_belong_to_crop
+    return if alternate_name.blank? || alternate_name.crop_id == crop_id
+
+    errors.add(:alternate_name, :invalid)
+  end
 end
diff --git a/app/views/home/_plantings.html.haml b/app/views/home/_plantings.html.haml
index dbcb112a5..1b18ee447 100644
--- a/app/views/home/_plantings.html.haml
+++ b/app/views/home/_plantings.html.haml
@@ -5,9 +5,9 @@
     = link_to planting_path(slug: planting.slug), class: 'list-group-item list-group-item-action flex-column align-items-start' do
       .d-flex.w-100.justify-content-between.homepage--list-item
         %p.mb-2
-          = image_tag planting.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{planting.crop_name} by #{planting.owner_login_name}"
+          = image_tag planting.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{planting.display_name} by #{planting.owner_login_name}"
         .text-end
-          %h4= planting.crop_name
+          %h4= planting.display_name
           - if planting.planted_from.present?
             %span.badge.text-bg-success= planting.planted_from.pluralize
           %small.text-muted planted by #{planting.owner_login_name}
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 1b4828845..a09cb6725 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -123,7 +123,7 @@
           %ul
             - @super_late.each do |planting|
               %li
-                = link_to planting.crop_name, planting_url(slug: planting.slug)
+                = link_to planting.display_name, planting_url(slug: planting.slug)
                 planted on #{planting.planted_at.to_date}
 
       - if @harvests.any?
diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml
index cd5b05a00..97d862971 100644
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -1,7 +1,7 @@
 - cache planting do
   .card.planting{class: planting.active ? '' : 'card-finished'}
     = link_to planting_path(slug: planting.slug) do
-      = image_tag planting.thumbnail_url ? planting.thumbnail_url : placeholder_image, class: 'img-card', alt: planting.crop_name
+      = image_tag planting.thumbnail_url ? planting.thumbnail_url : placeholder_image, class: 'img-card', alt: planting.display_name
 
     - if member_signed_in? && current_member.id == planting.owner_id
       = link_to planting_path(slug: planting.slug) do
@@ -28,7 +28,7 @@
                 = delete_button(planting, classes: 'dropdown-item text-danger')
     = link_to planting_path(slug: planting.slug) do
       .card-body.text-center
-        %h4= planting.crop_name
+        %h4= planting.display_name
         .text-center= render 'plantings/badges', planting: planting
         = render 'plantings/progress', planting: planting
     .card-footer
diff --git a/app/views/plantings/_form.html.haml b/app/views/plantings/_form.html.haml
index 533240699..83d1b2cc9 100644
--- a/app/views/plantings/_form.html.haml
+++ b/app/views/plantings/_form.html.haml
@@ -25,6 +25,14 @@
           Can't find what you're looking for?
           = link_to "Request new crops.", new_crop_path
 
+      #planting-alternate-name.mb-3{ class: ('d-none' unless @planting.crop&.alternate_names&.any?),
+                                    data: { source_url: alternate_names_path(format: :json) } }
+        = f.label :alternate_name_id, 'What do you call it?'
+        = f.select :alternate_name_id,
+                   options_from_collection_for_select(@planting.crop&.alternate_names&.order(:name) || [], :id, :name, @planting.alternate_name_id),
+                   { include_blank: @planting.crop&.name || '' }, class: 'form-select'
+        %span.form-text Optional. Your plantings will show this name instead of the crop's main name.
+
       .row
         .col-md-8
           - if @garden_locked
diff --git a/app/views/plantings/_image_with_popover.html.haml b/app/views/plantings/_image_with_popover.html.haml
index ce9941371..710395cfa 100644
--- a/app/views/plantings/_image_with_popover.html.haml
+++ b/app/views/plantings/_image_with_popover.html.haml
@@ -6,6 +6,6 @@
             rel: "popover",
             'data-bs-toggle': 'popover',
             'data-bs-trigger': 'hover',
-            'data-bs-title': planting.crop.name,
+            'data-bs-title': planting.display_name,
             'data-bs-content': render('plantings/popover', planting: planting),
             'data-bs-html': true
diff --git a/app/views/plantings/_tiny.html.haml b/app/views/plantings/_tiny.html.haml
index ccffd765a..39f4eadbb 100644
--- a/app/views/plantings/_tiny.html.haml
+++ b/app/views/plantings/_tiny.html.haml
@@ -1,4 +1,4 @@
 = link_to planting do
   .chip.crop-chip
     = crop_icon(planting.crop)
-    = planting.crop.name
+    = planting.display_name
diff --git a/app/views/plantings/index.ics.erb b/app/views/plantings/index.ics.erb
index 0c4ffdffc..27ca8ea14 100644
--- a/app/views/plantings/index.ics.erb
+++ b/app/views/plantings/index.ics.erb
@@ -21,7 +21,7 @@ cal.description = "Plantings by #{@owner.login_name}"
 
   event.dtstart     = planting.created_at
   event.dtend       = finish_date || 1.day.from_now.to_date
-  event.summary     = planting.crop.name
+  event.summary     = planting.display_name
   event.description = lines.join("\n")
   event.ip_class    = "PUBLIC"
   event.url = planting_url(slug: planting.slug)
@@ -34,7 +34,7 @@ cal.description = "Plantings by #{@owner.login_name}"
     todo = Icalendar::Todo.new
     todo.dtstart = predicted_date || finish_date || Date.today
     todo.due = finish_date
-    todo.summary = "Harvest #{planting.crop.name}"
+    todo.summary = "Harvest #{planting.display_name}"
 
     cal.add_todo(todo)
 
@@ -42,7 +42,7 @@ cal.description = "Plantings by #{@owner.login_name}"
     event = Icalendar::Event.new
     event.dtstart = predicted_date || finish_date || Date.today
     event.dtend = finish_date
-    event.summary = "Harvest #{planting.crop.name}"
+    event.summary = "Harvest #{planting.display_name}"
     event.ip_class    = "PUBLIC"
     event.url = planting_url(slug: planting.slug)
 
diff --git a/app/views/plantings/index.rss.haml b/app/views/plantings/index.rss.haml
index b49b0e932..e41b6a057 100644
--- a/app/views/plantings/index.rss.haml
+++ b/app/views/plantings/index.rss.haml
@@ -6,7 +6,7 @@
     %link= plantings_url
     - @plantings.each do |planting|
       %item
-        %title #{planting.crop_name} in #{planting.location}
+        %title #{planting.display_name} in #{planting.location}
         %pubdate= planting.created_at.to_fs(:rfc822)
         %description
           :escaped
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 2315133e9..ebbf1d1ac 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -27,7 +27,7 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Plantings', plantings_path
   %li.breadcrumb-item= link_to @planting.owner, member_plantings_path(@planting.owner)
-  %li.breadcrumb-item.active= link_to @planting.crop.name, @planting
+  %li.breadcrumb-item.active= link_to @planting.display_name, @planting
 
 
 - if @planting.parent_seed.nil? && @matching_seeds && @matching_seeds.any? && @planting.owner == current_member
@@ -45,8 +45,10 @@
         .d-flex.justify-content-between
           %h1.display-3
             = crop_icon(@planting.crop)
-            %strong= @planting.crop.name.titleize
+            %strong= @planting.display_name.titleize
             %small.text-muted= @planting.crop.default_scientific_name
+            - if @planting.alternate_name.present?
+              %small.text-muted= link_to "(#{@planting.crop.name})", @planting.crop
           %tt
             - if @planting.failed?
               %span.badge.text-bg-danger Failed
diff --git a/db/migrate/20260921000000_add_alternate_name_to_plantings.rb b/db/migrate/20260921000000_add_alternate_name_to_plantings.rb
new file mode 100644
index 000000000..1037cfcc7
--- /dev/null
+++ b/db/migrate/20260921000000_add_alternate_name_to_plantings.rb
@@ -0,0 +1,6 @@
+class AddAlternateNameToPlantings < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :plantings, :alternate_name, type: :integer, null: true, index: true,
+                                               foreign_key: { on_delete: :nullify }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 226def983..3011ba8ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,29 +10,29 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
+ActiveRecord::Schema[8.1].define(version: 2026_09_21_000000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
   create_table "active_storage_attachments", force: :cascade do |t|
-    t.string "name", null: false
-    t.string "record_type", null: false
-    t.bigint "record_id", null: false
     t.bigint "blob_id", null: false
     t.datetime "created_at", null: false
+    t.string "name", null: false
+    t.bigint "record_id", null: false
+    t.string "record_type", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
   create_table "active_storage_blobs", force: :cascade do |t|
-    t.string "key", null: false
-    t.string "filename", null: false
-    t.string "content_type"
-    t.text "metadata"
-    t.string "service_name", null: false
     t.bigint "byte_size", null: false
     t.string "checksum"
+    t.string "content_type"
     t.datetime "created_at", null: false
+    t.string "filename", null: false
+    t.string "key", null: false
+    t.text "metadata"
+    t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
@@ -44,17 +44,17 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
 
   create_table "activities", force: :cascade do |t|
     t.string "category"
-    t.string "name"
+    t.datetime "created_at", null: false
     t.string "description"
     t.date "due_date"
     t.boolean "finished"
-    t.bigint "owner_id"
     t.bigint "garden_id"
-    t.bigint "planting_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "slug"
     t.integer "likes_count", default: 0
+    t.string "name"
+    t.bigint "owner_id"
+    t.bigint "planting_id"
+    t.string "slug"
+    t.datetime "updated_at", null: false
     t.index ["garden_id"], name: "index_activities_on_garden_id"
     t.index ["owner_id"], name: "index_activities_on_owner_id"
     t.index ["planting_id"], name: "index_activities_on_planting_id"
@@ -62,331 +62,331 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "alternate_names", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.integer "crop_id", null: false
-    t.integer "creator_id", null: false
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.integer "creator_id", null: false
+    t.integer "crop_id", null: false
     t.string "language"
+    t.string "name", null: false
+    t.datetime "updated_at", precision: nil
     t.index ["creator_id"], name: "index_alternate_names_on_creator_id"
     t.index ["crop_id"], name: "index_alternate_names_on_crop_id"
     t.index ["language"], name: "index_alternate_names_on_language"
   end
 
   create_table "australian_food_classification_data", force: :cascade do |t|
-    t.string "public_food_key"
-    t.string "classification"
-    t.string "food_name"
-    t.decimal "energy_with_dietary_fibre_equated_kj"
-    t.decimal "energy_without_dietary_fibre_equated_kj"
-    t.decimal "moisture_water_g"
-    t.decimal "protein_g"
-    t.decimal "nitrogen_g"
-    t.decimal "fat_total_g"
-    t.decimal "ash_g"
-    t.decimal "total_dietary_fibre_g"
-    t.decimal "alcohol_g"
-    t.decimal "fructose_g"
-    t.decimal "glucose_g"
-    t.decimal "sucrose_g"
-    t.decimal "maltose_g"
-    t.decimal "lactose_g"
-    t.decimal "galactose_g"
-    t.decimal "maltotrios_g"
-    t.decimal "total_sugars_g"
-    t.decimal "added_sugars_g"
-    t.decimal "free_sugars_g"
-    t.decimal "starch_g"
-    t.decimal "dextrin_g"
-    t.decimal "glycerol_g"
-    t.decimal "glycogen_g"
-    t.decimal "inulin_g"
-    t.decimal "erythritol_g"
-    t.decimal "maltitol_g"
-    t.decimal "mannitol_g"
-    t.decimal "xylitol_g"
-    t.decimal "maltodextrin_g"
-    t.decimal "oligosaccharides_g"
-    t.decimal "polydextrose_g"
-    t.decimal "raffinose_g"
-    t.decimal "stachyose_g"
-    t.decimal "sorbitol_g"
-    t.decimal "resistant_starch_g"
-    t.decimal "available_carbohydrate_without_sugar_alcohols_g"
-    t.decimal "available_carbohydrate_with_sugar_alcohols_g"
     t.decimal "acetic_acid_g"
-    t.decimal "citric_acid_g"
-    t.decimal "fumaric_acid_g"
-    t.decimal "lactic_acid_g"
-    t.decimal "malic_acid_g"
-    t.decimal "oxalic_acid_g"
-    t.decimal "propionic_acid_g"
-    t.decimal "quinic_acid_g"
-    t.decimal "shikimic_acid_g"
-    t.decimal "succinic_acid_g"
-    t.decimal "tartaric_acid_g"
-    t.decimal "aluminium_al_ug"
-    t.decimal "antimony_sb_ug"
-    t.decimal "arsenic_as_ug"
-    t.decimal "cadmium_cd_ug"
-    t.decimal "calcium_ca_mg"
-    t.decimal "chromium_cr_ug"
-    t.decimal "chloride_cl_mg"
-    t.decimal "cobalt_co_ug"
-    t.decimal "copper_cu_mg"
-    t.decimal "fluoride_f_ug"
-    t.decimal "iodine_i_ug"
-    t.decimal "iron_fe_mg"
-    t.decimal "lead_pb_ug"
-    t.decimal "magnesium_mg_mg"
-    t.decimal "manganese_mn_mg"
-    t.decimal "mercury_hg_ug"
-    t.decimal "molybdenum_mo_ug"
-    t.decimal "nickel_ni_ug"
-    t.decimal "phosphorus_p_mg"
-    t.decimal "potassium_k_mg"
-    t.decimal "selenium_se_ug"
-    t.decimal "sodium_na_mg"
-    t.decimal "sulphur_s_mg"
-    t.decimal "tin_sn_ug"
-    t.decimal "zinc_zn_mg"
-    t.decimal "retinol_preformed_vitamin_a_ug"
+    t.decimal "added_sugars_g"
+    t.decimal "alanine_mg"
+    t.decimal "alanine_mg_gn"
+    t.decimal "alcohol_g"
     t.decimal "alpha_carotene_ug"
-    t.decimal "beta_carotene_ug"
-    t.decimal "cryptoxanthin_ug"
-    t.decimal "beta_carotene_equivalents_provitamin_a_ug"
-    t.decimal "vitamin_a_retinol_equivalents_ug"
-    t.decimal "lutein_ug"
-    t.decimal "lycopene_ug"
-    t.decimal "xanthophyl_ug"
-    t.decimal "thiamin_b1_mg"
-    t.decimal "riboflavin_b2_mg"
-    t.decimal "niacin_b3_mg"
-    t.decimal "niacin_derived_from_tryptophan_mg"
-    t.decimal "niacin_derived_equivalents_mg"
-    t.decimal "pantothenic_acid_b5_mg"
-    t.decimal "pyridoxine_b6_mg"
-    t.decimal "biotin_b7_ug"
-    t.decimal "cobalamin_b12_ug"
-    t.decimal "folate_natural_ug"
-    t.decimal "folic_acid_ug"
-    t.decimal "total_folates_ug"
-    t.decimal "dietary_folate_equivalents_ug"
-    t.decimal "vitamin_c_mg"
-    t.decimal "cholecalciferol_d3_ug"
-    t.decimal "ergocalciferol_d2_ug"
-    t.decimal "c25_hydroxy_cholecalciferol_25_oh_d3_ug"
-    t.decimal "c25_hydroxy_ergocalciferol_25_oh_d2_ug"
-    t.decimal "vitamin_d3_equivalents_ug"
     t.decimal "alpha_tocopherol_mg"
     t.decimal "alpha_tocotrienol_mg"
+    t.decimal "aluminium_al_ug"
+    t.decimal "antimony_sb_ug"
+    t.decimal "arginine_mg"
+    t.decimal "arginine_mg_gn"
+    t.decimal "arsenic_as_ug"
+    t.decimal "ash_g"
+    t.decimal "aspartic_acid_mg"
+    t.decimal "aspartic_acid_mg_gn"
+    t.decimal "available_carbohydrate_with_sugar_alcohols_g"
+    t.decimal "available_carbohydrate_without_sugar_alcohols_g"
+    t.decimal "beta_carotene_equivalents_provitamin_a_ug"
+    t.decimal "beta_carotene_ug"
     t.decimal "beta_tocopherol_mg"
     t.decimal "beta_tocotrienol_mg"
+    t.decimal "biotin_b7_ug"
+    t.decimal "c10_1_g"
+    t.decimal "c10_1_t"
+    t.decimal "c10_g"
+    t.decimal "c10_t"
+    t.decimal "c11_g"
+    t.decimal "c11_t"
+    t.decimal "c12_1_g"
+    t.decimal "c12_1_t"
+    t.decimal "c12_2_g"
+    t.decimal "c12_2_t"
+    t.decimal "c12_g"
+    t.decimal "c12_t"
+    t.decimal "c13_g"
+    t.decimal "c13_t"
+    t.decimal "c14_1_g"
+    t.decimal "c14_1_t"
+    t.decimal "c14_g"
+    t.decimal "c14_t"
+    t.decimal "c15_1_g"
+    t.decimal "c15_1_t"
+    t.decimal "c15_g"
+    t.decimal "c15_t"
+    t.decimal "c16_1_g"
+    t.decimal "c16_1_t"
+    t.decimal "c16_2w4_mg"
+    t.decimal "c16_2w4_t"
+    t.decimal "c16_3_g"
+    t.decimal "c16_3_t"
+    t.decimal "c16_g"
+    t.decimal "c16_t"
+    t.decimal "c17_1_g"
+    t.decimal "c17_1_t"
+    t.decimal "c17_g"
+    t.decimal "c17_t"
+    t.decimal "c18_1_g"
+    t.decimal "c18_1_t"
+    t.decimal "c18_1w5_mg"
+    t.decimal "c18_1w5_t"
+    t.decimal "c18_1w6_mg"
+    t.decimal "c18_1w6_t"
+    t.decimal "c18_1w7_g"
+    t.decimal "c18_1w7_t"
+    t.decimal "c18_1w9_mg"
+    t.decimal "c18_1w9_t"
+    t.decimal "c18_2w6_g"
+    t.decimal "c18_2w6_t"
+    t.decimal "c18_3w3_g"
+    t.decimal "c18_3w3_t"
+    t.decimal "c18_3w4_g"
+    t.decimal "c18_3w4_t"
+    t.decimal "c18_3w6_mg"
+    t.decimal "c18_3w6_t"
+    t.decimal "c18_4w1_g"
+    t.decimal "c18_4w1_t"
+    t.decimal "c18_4w3_mg"
+    t.decimal "c18_4w3_t"
+    t.decimal "c18_g"
+    t.decimal "c18_t"
+    t.decimal "c19_g"
+    t.decimal "c19_t"
+    t.decimal "c20_1_g"
+    t.decimal "c20_1_t"
+    t.decimal "c20_1w11_mg"
+    t.decimal "c20_1w11_t"
+    t.decimal "c20_1w13_mg"
+    t.decimal "c20_1w13_t"
+    t.decimal "c20_1w9_mg"
+    t.decimal "c20_1w9_t"
+    t.decimal "c20_2_mg"
+    t.decimal "c20_2_t"
+    t.decimal "c20_2w6_mg"
+    t.decimal "c20_2w6_t"
+    t.decimal "c20_3_mg"
+    t.decimal "c20_3_t"
+    t.decimal "c20_3w3_mg"
+    t.decimal "c20_3w3_t"
+    t.decimal "c20_3w6_mg"
+    t.decimal "c20_3w6_t"
+    t.decimal "c20_4_g"
+    t.decimal "c20_4_t"
+    t.decimal "c20_4w3_mg"
+    t.decimal "c20_4w3_t"
+    t.decimal "c20_4w6_mg"
+    t.decimal "c20_4w6_t"
+    t.decimal "c20_5w3_mg"
+    t.decimal "c20_5w3_t"
+    t.decimal "c20_g"
+    t.decimal "c20_t"
+    t.decimal "c21_5w3_g"
+    t.decimal "c21_5w3_t"
+    t.decimal "c21_g"
+    t.decimal "c21_t"
+    t.decimal "c22_1_g"
+    t.decimal "c22_1_t"
+    t.decimal "c22_1w11_mg"
+    t.decimal "c22_1w11_t"
+    t.decimal "c22_1w9_mg"
+    t.decimal "c22_1w9_t"
+    t.decimal "c22_2_g"
+    t.decimal "c22_2_t"
+    t.decimal "c22_2w6_mg"
+    t.decimal "c22_2w6_t"
+    t.decimal "c22_4w6_mg"
+    t.decimal "c22_4w6_t"
+    t.decimal "c22_5w3_mg"
+    t.decimal "c22_5w3_t"
+    t.decimal "c22_5w6_g"
+    t.decimal "c22_5w6_t"
+    t.decimal "c22_6w3_mg"
+    t.decimal "c22_6w3_t"
+    t.decimal "c22_g"
+    t.decimal "c22_t"
+    t.decimal "c23_g"
+    t.decimal "c23_t"
+    t.decimal "c24_1_g"
+    t.decimal "c24_1_t"
+    t.decimal "c24_1w11_mg"
+    t.decimal "c24_1w11_t"
+    t.decimal "c24_1w13_mg"
+    t.decimal "c24_1w13_t"
+    t.decimal "c24_1w9_mg"
+    t.decimal "c24_1w9_t"
+    t.decimal "c24_g"
+    t.decimal "c24_t"
+    t.decimal "c25_hydroxy_cholecalciferol_25_oh_d3_ug"
+    t.decimal "c25_hydroxy_ergocalciferol_25_oh_d2_ug"
+    t.decimal "c4_g"
+    t.decimal "c4_t"
+    t.decimal "c6_g"
+    t.decimal "c6_t"
+    t.decimal "c8_g"
+    t.decimal "c8_t"
+    t.decimal "cadmium_cd_ug"
+    t.decimal "caffeine_mg"
+    t.decimal "calcium_ca_mg"
+    t.decimal "chloride_cl_mg"
+    t.decimal "cholecalciferol_d3_ug"
+    t.decimal "cholesterol_mg"
+    t.decimal "chromium_cr_ug"
+    t.decimal "citric_acid_g"
+    t.string "classification"
+    t.decimal "cobalamin_b12_ug"
+    t.decimal "cobalt_co_ug"
+    t.decimal "copper_cu_mg"
+    t.datetime "created_at", precision: nil, null: false
+    t.decimal "cryptoxanthin_ug"
+    t.decimal "cystine_plus_cysteine_mg"
+    t.decimal "cystine_plus_cysteine_mg_gn"
     t.decimal "delta_tocopherol_mg"
     t.decimal "delta_tocotrienol_mg"
+    t.decimal "dextrin_g"
+    t.decimal "dietary_folate_equivalents_ug"
+    t.decimal "energy_with_dietary_fibre_equated_kj"
+    t.decimal "energy_without_dietary_fibre_equated_kj"
+    t.decimal "ergocalciferol_d2_ug"
+    t.decimal "erythritol_g"
+    t.decimal "fat_total_g"
+    t.decimal "fluoride_f_ug"
+    t.decimal "folate_natural_ug"
+    t.decimal "folic_acid_ug"
+    t.string "food_name"
+    t.decimal "free_sugars_g"
+    t.decimal "fructose_g"
+    t.decimal "fumaric_acid_g"
+    t.decimal "galactose_g"
     t.decimal "gamma_tocopherol_mg"
     t.decimal "gamma_tocotrienol_mg"
-    t.decimal "vitamin_e_mg"
-    t.decimal "c4_t"
-    t.decimal "c6_t"
-    t.decimal "c8_t"
-    t.decimal "c10_t"
-    t.decimal "c11_t"
-    t.decimal "c12_t"
-    t.decimal "c13_t"
-    t.decimal "c14_t"
-    t.decimal "c15_t"
-    t.decimal "c16_t"
-    t.decimal "c17_t"
-    t.decimal "c18_t"
-    t.decimal "c19_t"
-    t.decimal "c20_t"
-    t.decimal "c21_t"
-    t.decimal "c22_t"
-    t.decimal "c23_t"
-    t.decimal "c24_t"
-    t.decimal "total_saturated_fatty_acids_equated_t"
-    t.decimal "c10_1_t"
-    t.decimal "c12_1_t"
-    t.decimal "c14_1_t"
-    t.decimal "c15_1_t"
-    t.decimal "c16_1_t"
-    t.decimal "c17_1_t"
-    t.decimal "c18_1_t"
-    t.decimal "c18_1w5_t"
-    t.decimal "c18_1w6_t"
-    t.decimal "c18_1w7_t"
-    t.decimal "c18_1w9_t"
-    t.decimal "c20_1_t"
-    t.decimal "c20_1w9_t"
-    t.decimal "c20_1w13_t"
-    t.decimal "c20_1w11_t"
-    t.decimal "c22_1_t"
-    t.decimal "c22_1w9_t"
-    t.decimal "c22_1w11_t"
-    t.decimal "c24_1_t"
-    t.decimal "c24_1w9_t"
-    t.decimal "c24_1w11_t"
-    t.decimal "c24_1w13_t"
-    t.decimal "total_monounsaturated_fatty_acids_equated_t"
-    t.decimal "c12_2_t"
-    t.decimal "c16_2w4_t"
-    t.decimal "c16_3_t"
-    t.decimal "c18_2w6_t"
-    t.decimal "c18_3w3_t"
-    t.decimal "c18_3w4_t"
-    t.decimal "c18_3w6_t"
-    t.decimal "c18_4w1_t"
-    t.decimal "c18_4w3_t"
-    t.decimal "c20_2_t"
-    t.decimal "c20_2w6_t"
-    t.decimal "c20_3_t"
-    t.decimal "c20_4_t"
-    t.decimal "c20_3w3_t"
-    t.decimal "c20_3w6_t"
-    t.decimal "c20_4w3_t"
-    t.decimal "c20_4w6_t"
-    t.decimal "c20_5w3_t"
-    t.decimal "c21_5w3_t"
-    t.decimal "c22_2_t"
-    t.decimal "c22_2w6_t"
-    t.decimal "c22_4w6_t"
-    t.decimal "c22_5w3_t"
-    t.decimal "c22_5w6_t"
-    t.decimal "c22_6w3_t"
-    t.decimal "total_polyunsaturated_fatty_acids_equated_t"
-    t.decimal "total_long_chain_omega_3_fatty_acids_equated_t"
-    t.decimal "total_undifferentiated_fatty_acids_t"
-    t.decimal "total_trans_fatty_acids_imputed_t"
-    t.decimal "c4_g"
-    t.decimal "c6_g"
-    t.decimal "c8_g"
-    t.decimal "c10_g"
-    t.decimal "c11_g"
-    t.decimal "c12_g"
-    t.decimal "c13_g"
-    t.decimal "c14_g"
-    t.decimal "c15_g"
-    t.decimal "c16_g"
-    t.decimal "c17_g"
-    t.decimal "c18_g"
-    t.decimal "c19_g"
-    t.decimal "c20_g"
-    t.decimal "c21_g"
-    t.decimal "c22_g"
-    t.decimal "c23_g"
-    t.decimal "c24_g"
-    t.decimal "total_saturated_fatty_acids_equated_g"
-    t.decimal "c10_1_g"
-    t.decimal "c12_1_g"
-    t.decimal "c14_1_g"
-    t.decimal "c15_1_g"
-    t.decimal "c16_1_g"
-    t.decimal "c17_1_g"
-    t.decimal "c18_1_g"
-    t.decimal "c18_1w5_mg"
-    t.decimal "c18_1w6_mg"
-    t.decimal "c18_1w7_g"
-    t.decimal "c18_1w9_mg"
-    t.decimal "c20_1_g"
-    t.decimal "c20_1w9_mg"
-    t.decimal "c20_1w13_mg"
-    t.decimal "c20_1w11_mg"
-    t.decimal "c22_1_g"
-    t.decimal "c22_1w9_mg"
-    t.decimal "c22_1w11_mg"
-    t.decimal "c24_1_g"
-    t.decimal "c24_1w9_mg"
-    t.decimal "c24_1w11_mg"
-    t.decimal "c24_1w13_mg"
-    t.decimal "total_monounsaturated_fatty_acids_equated_g"
-    t.decimal "c12_2_g"
-    t.decimal "c16_2w4_mg"
-    t.decimal "c16_3_g"
-    t.decimal "c18_2w6_g"
-    t.decimal "c18_3w3_g"
-    t.decimal "c18_3w4_g"
-    t.decimal "c18_3w6_mg"
-    t.decimal "c18_4w1_g"
-    t.decimal "c18_4w3_mg"
-    t.decimal "c20_2_mg"
-    t.decimal "c20_2w6_mg"
-    t.decimal "c20_3_mg"
-    t.decimal "c20_3w3_mg"
-    t.decimal "c20_3w6_mg"
-    t.decimal "c20_4_g"
-    t.decimal "c20_4w3_mg"
-    t.decimal "c20_4w6_mg"
-    t.decimal "c20_5w3_mg"
-    t.decimal "c21_5w3_g"
-    t.decimal "c22_5w3_mg"
-    t.decimal "c22_4w6_mg"
-    t.decimal "c22_2_g"
-    t.decimal "c22_2w6_mg"
-    t.decimal "c22_5w6_g"
-    t.decimal "c22_6w3_mg"
-    t.decimal "total_polyunsaturated_fatty_acids_equated_g"
-    t.decimal "total_long_chain_omega_3_fatty_acids_equated_mg"
-    t.decimal "total_undifferentiated_fatty_acids_mass_basis_basis_mg"
-    t.decimal "total_trans_fatty_acids_imputed_mg"
-    t.decimal "caffeine_mg"
-    t.decimal "cholesterol_mg"
-    t.decimal "alanine_mg_gn"
-    t.decimal "arginine_mg_gn"
-    t.decimal "aspartic_acid_mg_gn"
-    t.decimal "cystine_plus_cysteine_mg_gn"
-    t.decimal "glutamic_acid_mg_gn"
-    t.decimal "glycine_mg_gn"
-    t.decimal "histidine_mg_gn"
-    t.decimal "isoleucine_mg_gn"
-    t.decimal "leucine_mg_gn"
-    t.decimal "lysine_mg_gn"
-    t.decimal "methionine_mg_gn"
-    t.decimal "phenylalanine_mg_gn"
-    t.decimal "proline_mg_gn"
-    t.decimal "serine_mg_gn"
-    t.decimal "threonine_mg_gn"
-    t.decimal "tyrosine_mg_gn"
-    t.decimal "tryptophan_mg_gn"
-    t.decimal "valine_mg_gn"
-    t.decimal "alanine_mg"
-    t.decimal "arginine_mg"
-    t.decimal "aspartic_acid_mg"
-    t.decimal "cystine_plus_cysteine_mg"
+    t.decimal "glucose_g"
     t.decimal "glutamic_acid_mg"
+    t.decimal "glutamic_acid_mg_gn"
+    t.decimal "glycerol_g"
     t.decimal "glycine_mg"
+    t.decimal "glycine_mg_gn"
+    t.decimal "glycogen_g"
     t.decimal "histidine_mg"
+    t.decimal "histidine_mg_gn"
+    t.decimal "inulin_g"
+    t.decimal "iodine_i_ug"
+    t.decimal "iron_fe_mg"
     t.decimal "isoleucine_mg"
+    t.decimal "isoleucine_mg_gn"
+    t.decimal "lactic_acid_g"
+    t.decimal "lactose_g"
+    t.decimal "lead_pb_ug"
     t.decimal "leucine_mg"
+    t.decimal "leucine_mg_gn"
+    t.decimal "lutein_ug"
+    t.decimal "lycopene_ug"
     t.decimal "lysine_mg"
+    t.decimal "lysine_mg_gn"
+    t.decimal "magnesium_mg_mg"
+    t.decimal "malic_acid_g"
+    t.decimal "maltitol_g"
+    t.decimal "maltodextrin_g"
+    t.decimal "maltose_g"
+    t.decimal "maltotrios_g"
+    t.decimal "manganese_mn_mg"
+    t.decimal "mannitol_g"
+    t.decimal "mercury_hg_ug"
     t.decimal "methionine_mg"
+    t.decimal "methionine_mg_gn"
+    t.decimal "moisture_water_g"
+    t.decimal "molybdenum_mo_ug"
+    t.decimal "niacin_b3_mg"
+    t.decimal "niacin_derived_equivalents_mg"
+    t.decimal "niacin_derived_from_tryptophan_mg"
+    t.decimal "nickel_ni_ug"
+    t.decimal "nitrogen_g"
+    t.decimal "oligosaccharides_g"
+    t.decimal "oxalic_acid_g"
+    t.decimal "pantothenic_acid_b5_mg"
     t.decimal "phenylalanine_mg"
+    t.decimal "phenylalanine_mg_gn"
+    t.decimal "phosphorus_p_mg"
+    t.decimal "polydextrose_g"
+    t.decimal "potassium_k_mg"
     t.decimal "proline_mg"
+    t.decimal "proline_mg_gn"
+    t.decimal "propionic_acid_g"
+    t.decimal "protein_g"
+    t.string "public_food_key"
+    t.decimal "pyridoxine_b6_mg"
+    t.decimal "quinic_acid_g"
+    t.decimal "raffinose_g"
+    t.decimal "resistant_starch_g"
+    t.decimal "retinol_preformed_vitamin_a_ug"
+    t.decimal "riboflavin_b2_mg"
+    t.decimal "selenium_se_ug"
     t.decimal "serine_mg"
+    t.decimal "serine_mg_gn"
+    t.decimal "shikimic_acid_g"
+    t.decimal "sodium_na_mg"
+    t.decimal "sorbitol_g"
+    t.decimal "stachyose_g"
+    t.decimal "starch_g"
+    t.decimal "succinic_acid_g"
+    t.decimal "sucrose_g"
+    t.decimal "sulphur_s_mg"
+    t.decimal "tartaric_acid_g"
+    t.decimal "thiamin_b1_mg"
     t.decimal "threonine_mg"
-    t.decimal "tyrosine_mg"
+    t.decimal "threonine_mg_gn"
+    t.decimal "tin_sn_ug"
+    t.decimal "total_dietary_fibre_g"
+    t.decimal "total_folates_ug"
+    t.decimal "total_long_chain_omega_3_fatty_acids_equated_mg"
+    t.decimal "total_long_chain_omega_3_fatty_acids_equated_t"
+    t.decimal "total_monounsaturated_fatty_acids_equated_g"
+    t.decimal "total_monounsaturated_fatty_acids_equated_t"
+    t.decimal "total_polyunsaturated_fatty_acids_equated_g"
+    t.decimal "total_polyunsaturated_fatty_acids_equated_t"
+    t.decimal "total_saturated_fatty_acids_equated_g"
+    t.decimal "total_saturated_fatty_acids_equated_t"
+    t.decimal "total_sugars_g"
+    t.decimal "total_trans_fatty_acids_imputed_mg"
+    t.decimal "total_trans_fatty_acids_imputed_t"
+    t.decimal "total_undifferentiated_fatty_acids_mass_basis_basis_mg"
+    t.decimal "total_undifferentiated_fatty_acids_t"
     t.decimal "tryptophan_mg"
-    t.decimal "valine_mg"
-    t.datetime "created_at", precision: nil, null: false
+    t.decimal "tryptophan_mg_gn"
+    t.decimal "tyrosine_mg"
+    t.decimal "tyrosine_mg_gn"
     t.datetime "updated_at", precision: nil, null: false
+    t.decimal "valine_mg"
+    t.decimal "valine_mg_gn"
+    t.decimal "vitamin_a_retinol_equivalents_ug"
+    t.decimal "vitamin_c_mg"
+    t.decimal "vitamin_d3_equivalents_ug"
+    t.decimal "vitamin_e_mg"
+    t.decimal "xanthophyl_ug"
+    t.decimal "xylitol_g"
+    t.decimal "zinc_zn_mg"
     t.index ["public_food_key"], name: "index_australian_food_classification_data_on_public_food_key"
   end
 
   create_table "authentications", id: :serial, force: :cascade do |t|
-    t.integer "member_id", null: false
-    t.string "provider", null: false
-    t.string "uid"
-    t.string "token"
-    t.string "secret"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.integer "member_id", null: false
     t.string "name"
+    t.string "provider", null: false
+    t.string "secret"
+    t.string "token"
+    t.string "uid"
+    t.datetime "updated_at", precision: nil
     t.index ["member_id"], name: "index_authentications_on_member_id"
   end
 
   create_table "blocks", force: :cascade do |t|
-    t.bigint "blocker_id"
     t.bigint "blocked_id"
+    t.bigint "blocker_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["blocked_id"], name: "index_blocks_on_blocked_id"
@@ -395,27 +395,27 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "comfy_cms_categories", id: :serial, force: :cascade do |t|
-    t.integer "site_id", null: false
-    t.string "label", null: false
     t.string "categorized_type", null: false
+    t.string "label", null: false
+    t.integer "site_id", null: false
     t.index ["site_id", "categorized_type", "label"], name: "index_cms_categories_on_site_id_and_cat_type_and_label", unique: true
   end
 
   create_table "comfy_cms_categorizations", id: :serial, force: :cascade do |t|
-    t.integer "category_id", null: false
-    t.string "categorized_type", null: false
     t.integer "categorized_id", null: false
+    t.string "categorized_type", null: false
+    t.integer "category_id", null: false
     t.index ["category_id", "categorized_type", "categorized_id"], name: "index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id", unique: true
   end
 
   create_table "comfy_cms_files", id: :serial, force: :cascade do |t|
-    t.integer "site_id", null: false
     t.integer "block_id"
-    t.string "label", default: "", null: false
-    t.string "file_file_name"
-    t.string "description", limit: 2048
-    t.integer "position", default: 0, null: false
     t.datetime "created_at", precision: nil
+    t.string "description", limit: 2048
+    t.string "file_file_name"
+    t.string "label", default: "", null: false
+    t.integer "position", default: 0, null: false
+    t.integer "site_id", null: false
     t.datetime "updated_at", precision: nil
     t.index ["site_id", "block_id"], name: "index_comfy_cms_files_on_site_id_and_block_id"
     t.index ["site_id", "file_file_name"], name: "index_comfy_cms_files_on_site_id_and_file_file_name"
@@ -424,90 +424,90 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "comfy_cms_fragments", id: :serial, force: :cascade do |t|
-    t.string "identifier", null: false
-    t.text "content"
-    t.string "record_type"
-    t.integer "record_id"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "tag", default: "text", null: false
-    t.datetime "datetime", precision: nil
     t.boolean "boolean", default: false, null: false
+    t.text "content"
+    t.datetime "created_at", precision: nil
+    t.datetime "datetime", precision: nil
+    t.string "identifier", null: false
+    t.integer "record_id"
+    t.string "record_type"
+    t.string "tag", default: "text", null: false
+    t.datetime "updated_at", precision: nil
     t.index ["identifier"], name: "index_comfy_cms_fragments_on_identifier"
     t.index ["record_id", "record_type"], name: "index_comfy_cms_fragments_on_record_id_and_record_type"
   end
 
   create_table "comfy_cms_layouts", id: :serial, force: :cascade do |t|
-    t.integer "site_id", null: false
-    t.integer "parent_id"
     t.string "app_layout"
-    t.string "label", null: false
-    t.string "identifier", null: false
     t.text "content"
-    t.text "css"
-    t.text "js"
-    t.integer "position", default: 0, null: false
     t.datetime "created_at", precision: nil
+    t.text "css"
+    t.string "identifier", null: false
+    t.text "js"
+    t.string "label", null: false
+    t.integer "parent_id"
+    t.integer "position", default: 0, null: false
+    t.integer "site_id", null: false
     t.datetime "updated_at", precision: nil
     t.index ["parent_id", "position"], name: "index_comfy_cms_layouts_on_parent_id_and_position"
     t.index ["site_id", "identifier"], name: "index_comfy_cms_layouts_on_site_id_and_identifier", unique: true
   end
 
   create_table "comfy_cms_pages", id: :serial, force: :cascade do |t|
-    t.integer "site_id", null: false
+    t.integer "children_count", default: 0, null: false
+    t.text "content_cache"
+    t.datetime "created_at", precision: nil
+    t.string "full_path", null: false
+    t.boolean "is_published", default: true, null: false
+    t.string "label", null: false
     t.integer "layout_id"
     t.integer "parent_id"
-    t.integer "target_page_id"
-    t.string "label", null: false
-    t.string "slug"
-    t.string "full_path", null: false
-    t.text "content_cache"
     t.integer "position", default: 0, null: false
-    t.integer "children_count", default: 0, null: false
-    t.boolean "is_published", default: true, null: false
-    t.datetime "created_at", precision: nil
+    t.integer "site_id", null: false
+    t.string "slug"
+    t.integer "target_page_id"
     t.datetime "updated_at", precision: nil
     t.index ["parent_id", "position"], name: "index_comfy_cms_pages_on_parent_id_and_position"
     t.index ["site_id", "full_path"], name: "index_comfy_cms_pages_on_site_id_and_full_path"
   end
 
   create_table "comfy_cms_revisions", id: :serial, force: :cascade do |t|
-    t.string "record_type", null: false
-    t.integer "record_id", null: false
-    t.text "data"
     t.datetime "created_at", precision: nil
+    t.text "data"
+    t.integer "record_id", null: false
+    t.string "record_type", null: false
     t.index ["record_type", "record_id", "created_at"], name: "index_cms_revisions_on_rtype_and_rid_and_created_at"
   end
 
   create_table "comfy_cms_sites", id: :serial, force: :cascade do |t|
-    t.string "label", null: false
-    t.string "identifier", null: false
     t.string "hostname", null: false
-    t.string "path"
+    t.string "identifier", null: false
+    t.string "label", null: false
     t.string "locale", default: "en", null: false
+    t.string "path"
     t.index ["hostname"], name: "index_comfy_cms_sites_on_hostname"
   end
 
   create_table "comfy_cms_snippets", id: :serial, force: :cascade do |t|
-    t.integer "site_id", null: false
-    t.string "label", null: false
-    t.string "identifier", null: false
     t.text "content"
-    t.integer "position", default: 0, null: false
     t.datetime "created_at", precision: nil
+    t.string "identifier", null: false
+    t.string "label", null: false
+    t.integer "position", default: 0, null: false
+    t.integer "site_id", null: false
     t.datetime "updated_at", precision: nil
     t.index ["site_id", "identifier"], name: "index_comfy_cms_snippets_on_site_id_and_identifier", unique: true
     t.index ["site_id", "position"], name: "index_comfy_cms_snippets_on_site_id_and_position"
   end
 
   create_table "comfy_cms_translations", force: :cascade do |t|
+    t.text "content_cache"
+    t.datetime "created_at", precision: nil, null: false
+    t.boolean "is_published", default: true, null: false
+    t.string "label", null: false
+    t.integer "layout_id"
     t.string "locale", null: false
     t.integer "page_id", null: false
-    t.integer "layout_id"
-    t.string "label", null: false
-    t.text "content_cache"
-    t.boolean "is_published", default: true, null: false
-    t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["is_published"], name: "index_comfy_cms_translations_on_is_published"
     t.index ["locale"], name: "index_comfy_cms_translations_on_locale"
@@ -515,22 +515,22 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "comments", id: :serial, force: :cascade do |t|
-    t.integer "commentable_id", null: false
     t.integer "author_id", null: false
     t.text "body", null: false
+    t.integer "commentable_id", null: false
+    t.string "commentable_type"
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.string "commentable_type"
     t.index ["author_id"], name: "index_comments_on_author_id"
     t.index ["commentable_type", "commentable_id"], name: "index_comments_on_commentable_type_and_commentable_id"
   end
 
   create_table "crop_companions", force: :cascade do |t|
+    t.datetime "created_at", precision: nil, null: false
     t.integer "crop_a_id", null: false
     t.integer "crop_b_id", null: false
-    t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
     t.string "source_url"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["crop_a_id", "crop_b_id"], name: "index_crop_companions_on_crop_a_id_and_crop_b_id"
   end
 
@@ -542,35 +542,35 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "crops", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.string "en_wikipedia_url"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "slug"
-    t.integer "parent_id"
-    t.integer "plantings_count", default: 0
-    t.integer "creator_id"
-    t.integer "requester_id"
     t.string "approval_status", default: "approved"
-    t.text "reason_for_rejection"
-    t.text "request_notes"
-    t.text "rejection_notes"
-    t.boolean "perennial", default: false
-    t.integer "median_lifespan"
+    t.datetime "created_at", precision: nil
+    t.integer "creator_id"
+    t.text "description"
+    t.string "en_wikipedia_url"
+    t.string "en_youtube_url"
+    t.integer "growing_degree_days"
+    t.integer "harvests_count", default: 0
+    t.integer "height"
     t.integer "median_days_to_first_harvest"
     t.integer "median_days_to_last_harvest"
+    t.integer "median_lifespan"
+    t.string "name", null: false
     t.jsonb "openfarm_data"
-    t.integer "harvests_count", default: 0
+    t.integer "parent_id"
+    t.boolean "perennial", default: false
     t.integer "photo_associations_count", default: 0
-    t.integer "row_spacing"
-    t.integer "spread"
-    t.integer "height"
-    t.string "sowing_method"
-    t.string "sun_requirements"
-    t.integer "growing_degree_days"
-    t.string "en_youtube_url"
-    t.text "description"
+    t.integer "plantings_count", default: 0
     t.string "public_food_key"
+    t.text "reason_for_rejection"
+    t.text "rejection_notes"
+    t.text "request_notes"
+    t.integer "requester_id"
+    t.integer "row_spacing"
+    t.string "slug"
+    t.string "sowing_method"
+    t.integer "spread"
+    t.string "sun_requirements"
+    t.datetime "updated_at", precision: nil
     t.index ["creator_id"], name: "index_crops_on_creator_id"
     t.index ["name"], name: "index_crops_on_name"
     t.index ["parent_id"], name: "index_crops_on_parent_id"
@@ -580,28 +580,28 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "follows", id: :serial, force: :cascade do |t|
-    t.integer "follower_id"
-    t.integer "followed_id"
     t.datetime "created_at", precision: nil
+    t.integer "followed_id"
+    t.integer "follower_id"
     t.datetime "updated_at", precision: nil
     t.index ["follower_id", "followed_id"], name: "index_follows_on_follower_id_and_followed_id"
   end
 
   create_table "forums", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.text "description", null: false
-    t.integer "owner_id", null: false
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.text "description", null: false
+    t.string "name", null: false
+    t.integer "owner_id", null: false
     t.string "slug"
+    t.datetime "updated_at", precision: nil
     t.index ["owner_id"], name: "index_forums_on_owner_id"
     t.index ["slug"], name: "index_forums_on_slug", unique: true
   end
 
   create_table "garden_collaborators", force: :cascade do |t|
-    t.bigint "member_id"
-    t.bigint "garden_id"
     t.datetime "created_at", null: false
+    t.bigint "garden_id"
+    t.bigint "member_id"
     t.datetime "updated_at", null: false
     t.index ["garden_id"], name: "index_garden_collaborators_on_garden_id"
     t.index ["member_id", "garden_id"], name: "index_garden_collaborators_on_member_id_and_garden_id", unique: true
@@ -609,58 +609,58 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "garden_types", force: :cascade do |t|
+    t.datetime "created_at", precision: nil, null: false
     t.text "name", null: false
     t.text "slug", null: false
-    t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["name"], name: "index_garden_types_on_name", unique: true
     t.index ["slug"], name: "index_garden_types_on_slug", unique: true
   end
 
   create_table "gardens", id: :serial, force: :cascade do |t|
+    t.boolean "active", default: true
+    t.decimal "area"
+    t.string "area_unit"
+    t.datetime "created_at", precision: nil
+    t.text "description"
+    t.integer "garden_type_id"
+    t.float "highest_temp_c"
+    t.float "latitude"
+    t.string "location"
+    t.string "location_wikidata_id"
+    t.float "longitude"
+    t.float "lowest_temp_c"
     t.string "name", null: false
     t.integer "owner_id"
     t.string "slug", null: false
-    t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.text "description"
-    t.boolean "active", default: true
-    t.string "location"
-    t.float "latitude"
-    t.float "longitude"
-    t.decimal "area"
-    t.string "area_unit"
-    t.integer "garden_type_id"
-    t.string "location_wikidata_id"
-    t.float "lowest_temp_c"
-    t.float "highest_temp_c"
     t.index ["garden_type_id"], name: "index_gardens_on_garden_type_id"
     t.index ["owner_id"], name: "index_gardens_on_owner_id"
     t.index ["slug"], name: "index_gardens_on_slug", unique: true
   end
 
   create_table "gardens_photos", id: false, force: :cascade do |t|
-    t.integer "photo_id"
     t.integer "garden_id"
+    t.integer "photo_id"
     t.index ["garden_id", "photo_id"], name: "index_gardens_photos_on_garden_id_and_photo_id"
   end
 
   create_table "harvests", id: :serial, force: :cascade do |t|
-    t.integer "crop_id", null: false
-    t.integer "owner_id", null: false
-    t.date "harvested_at"
-    t.decimal "quantity"
-    t.string "unit"
-    t.text "description"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.integer "crop_id", null: false
+    t.text "description"
+    t.date "harvested_at"
+    t.integer "likes_count", default: 0
+    t.integer "owner_id", null: false
+    t.integer "plant_part_id"
+    t.integer "planting_id"
+    t.decimal "quantity"
+    t.float "si_weight"
     t.string "slug"
+    t.string "unit"
+    t.datetime "updated_at", precision: nil
     t.decimal "weight_quantity"
     t.string "weight_unit"
-    t.integer "plant_part_id"
-    t.float "si_weight"
-    t.integer "planting_id"
-    t.integer "likes_count", default: 0
     t.index ["crop_id"], name: "index_harvests_on_crop_id"
     t.index ["owner_id"], name: "index_harvests_on_owner_id"
     t.index ["plant_part_id"], name: "index_harvests_on_plant_part_id"
@@ -668,17 +668,17 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "harvests_photos", id: false, force: :cascade do |t|
-    t.integer "photo_id"
     t.integer "harvest_id"
+    t.integer "photo_id"
     t.index ["harvest_id", "photo_id"], name: "index_harvests_photos_on_harvest_id_and_photo_id"
   end
 
   create_table "likes", id: :serial, force: :cascade do |t|
-    t.integer "member_id"
-    t.string "likeable_type"
-    t.integer "likeable_id"
     t.string "categories", array: true
     t.datetime "created_at", precision: nil
+    t.integer "likeable_id"
+    t.string "likeable_type"
+    t.integer "member_id"
     t.datetime "updated_at", precision: nil
     t.index ["likeable_id"], name: "index_likes_on_likeable_id"
     t.index ["likeable_type", "likeable_id"], name: "index_likes_on_likeable_type_and_likeable_id"
@@ -686,37 +686,37 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "mailboxer_conversation_opt_outs", id: :serial, force: :cascade do |t|
-    t.string "unsubscriber_type"
-    t.integer "unsubscriber_id"
     t.integer "conversation_id"
     t.datetime "created_at", precision: nil, null: false
+    t.integer "unsubscriber_id"
+    t.string "unsubscriber_type"
     t.datetime "updated_at", precision: nil, null: false
     t.index ["conversation_id"], name: "index_mailboxer_conversation_opt_outs_on_conversation_id"
     t.index ["unsubscriber_id", "unsubscriber_type"], name: "index_mailboxer_conversation_opt_outs_on_unsubscriber_id_type"
   end
 
   create_table "mailboxer_conversations", id: :serial, force: :cascade do |t|
-    t.string "subject", default: ""
     t.datetime "created_at", precision: nil, null: false
+    t.string "subject", default: ""
     t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "mailboxer_notifications", id: :serial, force: :cascade do |t|
-    t.string "type"
-    t.text "body"
-    t.string "subject", default: ""
-    t.string "sender_type"
-    t.integer "sender_id"
-    t.integer "conversation_id"
-    t.boolean "draft", default: false
-    t.string "notification_code"
-    t.string "notified_object_type"
-    t.integer "notified_object_id"
     t.string "attachment"
+    t.text "body"
+    t.integer "conversation_id"
     t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.boolean "global", default: false
+    t.boolean "draft", default: false
     t.datetime "expires", precision: nil
+    t.boolean "global", default: false
+    t.string "notification_code"
+    t.integer "notified_object_id"
+    t.string "notified_object_type"
+    t.integer "sender_id"
+    t.string "sender_type"
+    t.string "subject", default: ""
+    t.string "type"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["conversation_id"], name: "index_mailboxer_notifications_on_conversation_id"
     t.index ["notified_object_id", "notified_object_type"], name: "index_mailboxer_notifications_on_notified_object_id_and_type"
     t.index ["notified_object_type", "notified_object_id"], name: "mailboxer_notifications_notified_object"
@@ -725,18 +725,18 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "mailboxer_receipts", id: :serial, force: :cascade do |t|
-    t.string "receiver_type"
-    t.integer "receiver_id"
-    t.integer "notification_id", null: false
-    t.boolean "is_read", default: false
-    t.boolean "trashed", default: false
-    t.boolean "deleted", default: false
-    t.string "mailbox_type", limit: 25
     t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
-    t.boolean "is_delivered", default: false
+    t.boolean "deleted", default: false
     t.string "delivery_method"
+    t.boolean "is_delivered", default: false
+    t.boolean "is_read", default: false
+    t.string "mailbox_type", limit: 25
     t.string "message_id"
+    t.integer "notification_id", null: false
+    t.integer "receiver_id"
+    t.string "receiver_type"
+    t.boolean "trashed", default: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["notification_id"], name: "index_mailboxer_receipts_on_notification_id"
     t.index ["receiver_id", "receiver_type"], name: "index_mailboxer_receipts_on_receiver_id_and_receiver_type"
   end
@@ -745,51 +745,51 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "members", id: :serial, force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
-    t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at", precision: nil
-    t.datetime "last_sign_in_at", precision: nil
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
+    t.integer "activities_count"
+    t.text "bio"
+    t.string "bluesky_handle"
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "confirmation_token"
     t.datetime "confirmed_at", precision: nil
-    t.datetime "confirmation_sent_at", precision: nil
-    t.string "unconfirmed_email"
-    t.integer "failed_attempts", default: 0
-    t.string "unlock_token"
-    t.datetime "locked_at", precision: nil
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "login_name"
-    t.string "slug"
-    t.boolean "tos_agreement"
-    t.boolean "show_email"
-    t.string "location"
-    t.float "latitude"
-    t.float "longitude"
-    t.boolean "send_notification_email", default: true
-    t.text "bio"
-    t.integer "plantings_count"
-    t.boolean "newsletter"
-    t.boolean "send_planting_reminder", default: true
-    t.string "preferred_avatar_uri"
+    t.datetime "current_sign_in_at", precision: nil
+    t.string "current_sign_in_ip"
+    t.datetime "discarded_at", precision: nil
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "facebook_handle"
+    t.integer "failed_attempts", default: 0
+    t.integer "forums_count"
     t.integer "gardens_count"
     t.integer "harvests_count"
-    t.integer "seeds_count"
-    t.datetime "discarded_at", precision: nil
-    t.integer "photos_count"
-    t.integer "forums_count"
-    t.integer "activities_count"
-    t.string "website_url"
     t.string "instagram_handle"
-    t.string "facebook_handle"
-    t.string "bluesky_handle"
+    t.datetime "last_sign_in_at", precision: nil
+    t.string "last_sign_in_ip"
+    t.float "latitude"
+    t.string "location"
+    t.datetime "locked_at", precision: nil
+    t.string "login_name"
+    t.float "longitude"
+    t.boolean "newsletter"
     t.string "other_url"
+    t.integer "photos_count"
+    t.integer "plantings_count"
+    t.string "preferred_avatar_uri"
+    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at", precision: nil
+    t.string "reset_password_token"
+    t.integer "seeds_count"
     t.boolean "send_harvest_reminder", default: true, null: false
+    t.boolean "send_notification_email", default: true
+    t.boolean "send_planting_reminder", default: true
+    t.boolean "show_email"
+    t.integer "sign_in_count", default: 0
+    t.string "slug"
+    t.boolean "tos_agreement"
+    t.string "unconfirmed_email"
+    t.string "unlock_token"
+    t.datetime "updated_at", precision: nil
+    t.string "website_url"
     t.index ["confirmation_token"], name: "index_members_on_confirmation_token", unique: true
     t.index ["discarded_at"], name: "index_members_on_discarded_at"
     t.index ["email"], name: "index_members_on_email", unique: true
@@ -805,15 +805,15 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "notifications", id: :serial, force: :cascade do |t|
-    t.integer "sender_id"
-    t.integer "recipient_id", null: false
-    t.string "subject"
     t.text "body"
-    t.boolean "read", default: false
-    t.integer "notifiable_id"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.integer "notifiable_id"
     t.string "notifiable_type"
+    t.boolean "read", default: false
+    t.integer "recipient_id", null: false
+    t.integer "sender_id"
+    t.string "subject"
+    t.datetime "updated_at", precision: nil
     t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
     t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
     t.index ["sender_id"], name: "index_notifications_on_sender_id"
@@ -826,32 +826,32 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "photo_associations", id: :serial, force: :cascade do |t|
+    t.datetime "created_at", precision: nil, null: false
+    t.integer "crop_id"
     t.integer "photo_id", null: false
     t.integer "photographable_id", null: false
     t.string "photographable_type", null: false
-    t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "crop_id"
     t.index ["crop_id"], name: "index_photo_associations_on_crop_id"
     t.index ["photographable_id", "photographable_type", "photo_id"], name: "items_to_photos_idx", unique: true
     t.index ["photographable_id", "photographable_type"], name: "photographable_idx"
   end
 
   create_table "photos", id: :serial, force: :cascade do |t|
-    t.integer "owner_id", null: false
-    t.string "thumbnail_url", null: false
-    t.string "fullsize_url", null: false
+    t.integer "comments_count", default: 0
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "title", null: false
+    t.datetime "date_taken", precision: nil
+    t.string "fullsize_url", null: false
     t.string "license_name", null: false
     t.string "license_url"
-    t.string "link_url", null: false
-    t.string "source_id"
-    t.datetime "date_taken", precision: nil
     t.integer "likes_count", default: 0
+    t.string "link_url", null: false
+    t.integer "owner_id", null: false
     t.string "source"
-    t.integer "comments_count", default: 0
+    t.string "source_id"
+    t.string "thumbnail_url", null: false
+    t.string "title", null: false
+    t.datetime "updated_at", precision: nil
     t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
     t.index ["owner_id"], name: "index_photos_on_owner_id"
     t.index ["source_id"], name: "index_photos_on_source_id"
@@ -871,36 +871,38 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "plant_parts", id: :serial, force: :cascade do |t|
-    t.string "name"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "slug"
     t.integer "harvests_count", default: 0
+    t.string "name"
+    t.string "slug"
+    t.datetime "updated_at", precision: nil
     t.index ["slug"], name: "index_plant_parts_on_slug", unique: true
   end
 
   create_table "plantings", id: :serial, force: :cascade do |t|
-    t.integer "garden_id", null: false
-    t.integer "crop_id", null: false
-    t.date "planted_at"
-    t.integer "quantity"
-    t.text "description"
+    t.integer "alternate_name_id"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "slug"
-    t.string "sunniness"
-    t.string "planted_from"
-    t.integer "owner_id"
-    t.boolean "finished", default: false, null: false
-    t.date "finished_at"
-    t.integer "lifespan"
+    t.integer "crop_id", null: false
     t.integer "days_to_first_harvest"
     t.integer "days_to_last_harvest"
-    t.integer "parent_seed_id"
-    t.integer "harvests_count", default: 0
-    t.integer "likes_count", default: 0
+    t.text "description"
     t.boolean "failed", default: false, null: false
+    t.boolean "finished", default: false, null: false
+    t.date "finished_at"
+    t.integer "garden_id", null: false
+    t.integer "harvests_count", default: 0
+    t.integer "lifespan"
+    t.integer "likes_count", default: 0
     t.integer "overall_rating"
+    t.integer "owner_id"
+    t.integer "parent_seed_id"
+    t.date "planted_at"
+    t.string "planted_from"
+    t.integer "quantity"
+    t.string "slug"
+    t.string "sunniness"
+    t.datetime "updated_at", precision: nil
+    t.index ["alternate_name_id"], name: "index_plantings_on_alternate_name_id"
     t.index ["crop_id"], name: "index_plantings_on_crop_id"
     t.index ["garden_id"], name: "index_plantings_on_garden_id"
     t.index ["owner_id"], name: "index_plantings_on_owner_id"
@@ -910,62 +912,62 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
 
   create_table "posts", id: :serial, force: :cascade do |t|
     t.integer "author_id", null: false
-    t.string "subject", null: false
     t.text "body", null: false
+    t.integer "comments_count", default: 0
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "slug"
     t.integer "forum_id"
     t.integer "likes_count", default: 0
-    t.integer "comments_count", default: 0
+    t.string "slug"
+    t.string "subject", null: false
+    t.datetime "updated_at", precision: nil
     t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id"
     t.index ["forum_id"], name: "index_posts_on_forum_id"
     t.index ["slug"], name: "index_posts_on_slug", unique: true
   end
 
   create_table "roles", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.text "description"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+    t.text "description"
+    t.string "name", null: false
     t.string "slug"
+    t.datetime "updated_at", precision: nil
     t.index ["slug"], name: "index_roles_on_slug", unique: true
   end
 
   create_table "scientific_names", id: :serial, force: :cascade do |t|
-    t.string "name", null: false
-    t.integer "crop_id", null: false
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
     t.integer "creator_id"
+    t.integer "crop_id", null: false
     t.integer "gbif_key"
     t.string "gbif_rank"
     t.string "gbif_status"
+    t.string "name", null: false
+    t.datetime "updated_at", precision: nil
     t.string "wikidata_id"
     t.index ["creator_id"], name: "index_scientific_names_on_creator_id"
     t.index ["crop_id"], name: "index_scientific_names_on_crop_id"
   end
 
   create_table "seeds", id: :serial, force: :cascade do |t|
-    t.integer "owner_id", null: false
-    t.integer "crop_id", null: false
-    t.text "description"
-    t.integer "quantity"
-    t.date "plant_before"
     t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
-    t.string "tradable_to", default: "nowhere"
-    t.string "slug"
-    t.integer "days_until_maturity_min"
+    t.integer "crop_id", null: false
     t.integer "days_until_maturity_max"
-    t.text "organic", default: "unknown"
-    t.text "gmo", default: "unknown"
-    t.text "heirloom", default: "unknown"
+    t.integer "days_until_maturity_min"
+    t.text "description"
     t.boolean "finished", default: false
     t.date "finished_at"
+    t.text "gmo", default: "unknown"
+    t.text "heirloom", default: "unknown"
+    t.text "organic", default: "unknown"
+    t.integer "owner_id", null: false
     t.integer "parent_planting_id"
+    t.date "plant_before"
+    t.integer "quantity"
     t.date "saved_at"
+    t.string "slug"
     t.string "source"
+    t.string "tradable_to", default: "nowhere"
+    t.datetime "updated_at", precision: nil
     t.index ["crop_id"], name: "index_seeds_on_crop_id"
     t.index ["owner_id"], name: "index_seeds_on_owner_id"
     t.index ["parent_planting_id"], name: "index_seeds_on_parent_planting_id"
@@ -974,13 +976,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   end
 
   create_table "versions", force: :cascade do |t|
-    t.string "whodunnit"
     t.datetime "created_at"
+    t.string "event", null: false
     t.bigint "item_id", null: false
     t.string "item_type", null: false
-    t.string "event", null: false
     t.text "object"
     t.text "object_changes"
+    t.string "whodunnit"
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 
@@ -994,6 +996,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
   add_foreign_key "mailboxer_receipts", "mailboxer_notifications", column: "notification_id", name: "receipts_on_notification_id"
   add_foreign_key "photo_associations", "crops"
   add_foreign_key "photo_associations", "photos"
+  add_foreign_key "plantings", "alternate_names", on_delete: :nullify
   add_foreign_key "plantings", "seeds", column: "parent_seed_id", name: "parent_seed", on_delete: :nullify
   add_foreign_key "seeds", "plantings", column: "parent_planting_id", name: "parent_planting", on_delete: :nullify
 end
diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb
index 63d8ade62..e06465515 100644
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -94,6 +94,21 @@ describe CropsController do
         it { expect(assigns(:term)).to eq 'tom' }
         it { expect(assigns(:crops).map(&:name)).to eq ['tomato'] }
       end
+
+      describe 'search by an alternate name' do
+        let!(:aubergine) { create(:alternate_eggplant) }
+
+        before do
+          Crop.reindex
+          get :search, params: { term: 'aubergine' }, format: :json
+        end
+
+        it 'says which alternate name matched' do
+          result = response.parsed_body.first
+          expect(result['name']).to eq 'eggplant'
+          expect(result['matched_alternate_name']).to eq 'aubergine'
+        end
+      end
     end
   end
 
diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb
index 671e3affd..82090e883 100644
--- a/spec/models/planting_spec.rb
+++ b/spec/models/planting_spec.rb
@@ -337,6 +337,26 @@ describe Planting do
     end
   end
 
+  context 'alternate name' do
+    let(:alternate) { FactoryBot.create(:alternate_eggplant) }
+    let(:planting) { FactoryBot.build(:planting, crop: alternate.crop) }
+
+    it 'displays the crop name by default' do
+      expect(planting.display_name).to eq 'eggplant'
+    end
+
+    it 'displays the chosen alternate name' do
+      planting.alternate_name = alternate
+      expect(planting.display_name).to eq 'aubergine'
+      expect(planting.to_s).to include 'aubergine'
+    end
+
+    it 'rejects an alternate name from a different crop' do
+      planting.alternate_name = FactoryBot.create(:alternate_name)
+      expect(planting).not_to be_valid
+    end
+  end
+
   context 'quantity' do
     it 'allows integer quantities' do
       @planting = build(:planting, quantity: 99)