Merge branch 'dev' into merge-crops

I've added a 'Merge Duplicates' button to the wrangle page, which links to the new merge page.

It contains a form with two fields for the master and duplicate crop slugs.

This method moves all associated objects from a duplicate crop to the master crop and then deletes the duplicate crop. The entire operation is wrapped in a database transaction.

I've updated the `merge` action in `crops_controller.rb` to prevent a crop from being merged with itself. The implementation of the controller action is now complete.

Gemfile.lock

@@ -122,8 +122,8 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1252.0)
-    aws-sdk-core (3.248.0)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -131,11 +131,11 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.128.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.224.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -236,7 +236,7 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (5.0.4)
+    dalli (5.0.2)
       logger
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
@@ -247,7 +247,7 @@ GEM
     date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.4)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
@@ -286,7 +286,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -297,7 +297,7 @@ GEM
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.7.0)
+    friendly_id (5.6.0)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -355,7 +355,7 @@ GEM
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.3)
+    icalendar (2.12.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -366,7 +366,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.2)
-    irb (1.18.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
@@ -376,7 +376,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.5)
+    json (2.19.4)
     json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
@@ -453,13 +453,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.19.3)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.17.1)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -630,7 +630,7 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.86.2)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -650,7 +650,7 @@ GEM
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.35.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -670,7 +670,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.3.0)
+    rubyzip (3.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -690,7 +690,7 @@ GEM
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.44.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -725,7 +725,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.7.0)
     timecop (0.9.11)
-    timeout (0.6.1)
+    timeout (0.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

app/controllers/api/v1/crops_controller.rb

@@ -3,36 +3,6 @@
 module Api
   module V1
     class CropsController < BaseController
-      def search
-        term = params[:term]
-        page = params.dig(:page, :number) || 1
-        per_page = params.dig(:page, :size) || Crop.per_page
-
-        search_results = CropSearchService.search(
-          term,
-          page:     page,
-          per_page: per_page,
-          load:     true
-        )
-
-        resources = search_results.map do |crop|
-          Api::V1::CropResource.new(crop, context)
-        end
-
-        serializer = JSONAPI::ResourceSerializer.new(Api::V1::CropResource)
-
-        data = resources.map do |resource|
-          serializer.object_hash(resource, {})
-        end
-
-        render json: {
-          data: data,
-          meta: {
-            record_count: search_results.total_count,
-            page_count:   search_results.total_pages
-          }
-        }
-      end
     end
   end
 end

app/controllers/crops_controller.rb

@@ -39,6 +39,30 @@ class CropsController < ApplicationController
     respond_with @crops
   end
 
+  def merge
+    authorize! :merge, Crop
+    if request.post?
+      master_crop = Crop.find_by(slug: params[:master_crop_slug])
+      duplicate_crop = Crop.find_by(slug: params[:duplicate_crop_slug])
+
+      if master_crop && duplicate_crop
+        if master_crop == duplicate_crop
+          flash[:alert] = "You cannot merge a crop with itself."
+          render :merge
+        else
+          master_crop.merge_with(duplicate_crop)
+          flash[:notice] = "Successfully merged #{duplicate_crop.name} into #{master_crop.name}."
+          redirect_to wrangle_crops_path
+        end
+      else
+        flash[:alert] = "Could not find one of the crops."
+        render :merge
+      end
+    else
+      # GET request, just render the form
+    end
+  end
+
   def gbif
     @crop = Crop.find(params[:crop_slug])
     @crop.update_gbif_data!

app/controllers/gardens_controller.rb

@@ -57,23 +57,12 @@ class GardensController < DataController
     redirect_to(member_gardens_path(@garden.owner))
   end
 
-  def fetch_wikidata
-    if @garden.populate_wikidata_info
-      @garden.save
-      flash[:notice] = "Wikidata information updated."
-    else
-      flash[:alert] = "Could not find Wikidata information for this location."
-    end
-    redirect_to @garden
-  end
-
   private
 
   def garden_params
     params.require(:garden).permit(
       :name, :slug, :description, :active,
-      :location, :latitude, :longitude, :area, :area_unit, :garden_type_id,
-      :location_wikidata_id, :lowest_temp_c, :highest_temp_c
+      :location, :latitude, :longitude, :area, :area_unit, :garden_type_id
     )
   end
 end

app/controllers/harvests_controller.rb

@@ -38,9 +38,9 @@ class HarvestsController < DataController
   end
 
   def new
-    @harvest = Harvest.new(new_harvest_params.merge(harvested_at: Time.zone.today))
-    @planting = @harvest.planting
-    @crop = @harvest.crop
+    @harvest = Harvest.new(harvested_at: Time.zone.today)
+    @planting = Planting.find_by(slug: params[:planting_slug]) if params[:planting_slug]
+    @crop = Crop.find_by(id: params[:crop_id])
     respond_with(@harvest)
   end
 
@@ -52,7 +52,7 @@ class HarvestsController < DataController
   def create
     @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
     @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
-    update_planting_rating if @harvest.save
+    @harvest.save
     if params[:return] == 'planting'
       respond_with(@harvest, location: @harvest.planting)
     else
@@ -61,7 +61,7 @@ class HarvestsController < DataController
   end
 
   def update
-    update_planting_rating if @harvest.update(harvest_params)
+    @harvest.update(harvest_params)
     respond_with(@harvest)
   end
 
@@ -76,17 +76,7 @@ class HarvestsController < DataController
     params.require(:harvest)
       .permit(:planting_id, :crop_id, :harvested_at, :description,
               :quantity, :unit, :weight_quantity, :weight_unit,
-              :plant_part_id, :slug, :si_weight, :overall_rating)
-      .merge(owner_id: current_member.id)
-  end
-
-  def new_harvest_params
-    return {} unless params[:harvest]
-
-    params.require(:harvest)
-      .permit(:planting_id, :crop_id, :harvested_at, :description,
-              :quantity, :unit, :weight_quantity, :weight_unit,
-            :plant_part_id, :slug, :si_weight, :overall_rating)
+              :plant_part_id, :slug, :si_weight)
       .merge(owner_id: current_member.id)
   end
 
@@ -113,10 +103,4 @@ class HarvestsController < DataController
     @harvest.planting.update_harvest_days!
     @harvest.crop.update_harvest_medians
   end
-
-  def update_planting_rating
-    return if @harvest.planting.nil? || params[:harvest][:overall_rating].blank?
-
-    @harvest.planting.update(overall_rating: params[:harvest][:overall_rating])
-  end
 end

app/models/ability.rb

@@ -75,6 +75,7 @@ class Ability
     # only crop wranglers can create/edit/destroy crops
     if member.role? :crop_wrangler
       can :wrangle, Crop
+      can :merge, Crop
       can :manage, Crop
       can :manage, CropCompanion
       can :manage, ScientificName
@@ -123,7 +124,6 @@ class Ability
     can :create,  GardenCollaborator, garden: { owner_id: member.id }
     can :update,  GardenCollaborator, garden: { owner_id: member.id }
     can :destroy, GardenCollaborator, garden: { owner_id: member.id }
-    can :destroy, GardenCollaborator, member_id: member.id
 
     can :create,  Activity
     can :update,  Activity, owner_id: member.id

app/models/crop.rb

@@ -165,11 +165,28 @@ class Crop < ApplicationRecord
   end
 
   def all_companions
-    @all_companions ||= if parent
-                          (companions + parent.all_companions).uniq
-                        else
-                          companions
-                        end
+    return companions unless parent
+
+    (companions + parent.all_companions).uniq
+  end
+
+  def merge_with(other_crop)
+    Crop.transaction do
+      other_crop.alternate_names.update_all(crop_id: id)
+      other_crop.scientific_names.update_all(crop_id: id)
+      other_crop.plantings.update_all(crop_id: id)
+      other_crop.seeds.update_all(crop_id: id)
+      other_crop.harvests.update_all(crop_id: id)
+      other_crop.photo_associations.update_all(crop_id: id)
+      other_crop.varieties.update_all(parent_id: id)
+      other_crop.crop_posts.update_all(crop_id: id)
+
+      # Companions can be crop_a or crop_b
+      CropCompanion.where(crop_a_id: other_crop.id).update_all(crop_a_id: id)
+      CropCompanion.where(crop_b_id: other_crop.id).update_all(crop_b_id: id)
+
+      other_crop.destroy
+    end
   end
 
   before_destroy :destroy_reverse_companionships

app/models/garden.rb

@@ -21,7 +21,6 @@ class Garden < ApplicationRecord
   after_validation :cleanup_area
   after_validation :geocode
   after_validation :empty_unwanted_geocodes
-  after_validation :populate_wikidata_info, if: :will_save_change_to_location?
   after_save :mark_inactive_garden_plantings_as_finished
 
   scope :active, -> { where(active: true) }
@@ -93,19 +92,6 @@ class Garden < ApplicationRecord
     end
   end
 
-  def populate_wikidata_info
-    return false if location.blank?
-
-    wd_id = WikidataService.find_wikidata_id(location)
-    return false if wd_id.blank?
-
-    self.location_wikidata_id = wd_id
-    temps = WikidataService.fetch_temps(wd_id)
-    self.highest_temp_c = temps[:highest_temp_c]
-    self.lowest_temp_c = temps[:lowest_temp_c]
-    true
-  end
-
   protected
 
   def strip_blanks

app/models/harvest.rb

@@ -8,8 +8,6 @@ class Harvest < ApplicationRecord
   include SearchHarvests
   include Likeable
 
-  attr_accessor :overall_rating
-
   friendly_id :harvest_slug, use: %i(slugged finders)
 
   # Constants

app/services/crop_search_service.rb

@@ -2,7 +2,7 @@
 
 class CropSearchService
   # Crop.search(string)
-  def self.search(query, page: 1, per_page: 12, current_member: nil, **options)
+  def self.search(query, page: 1, per_page: 12, current_member: nil)
     search_params = {
       page:,
       per_page:,
@@ -12,7 +12,7 @@ class CropSearchService
       includes:     %i(scientific_names alternate_names),
       misspellings: { edit_distance: 2 },
       load:         false
-    }.merge(options)
+    }
     # prioritise crops the member has planted
     search_params[:boost_where] = { planters_ids: current_member.id } if current_member
 

app/services/wikidata_service.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-require 'json'
-
-class WikidataService
-  CELSIUS_UNIT_ID = 'http://www.wikidata.org/entity/Q25267'
-  FAHRENHEIT_UNIT_ID = 'http://www.wikidata.org/entity/Q42289'
-
-  def self.find_wikidata_id(location_name)
-    return nil if location_name.blank?
-
-    uri = URI("https://www.wikidata.org/w/api.php?action=wbsearchentities&search=#{URI.encode_www_form_component(location_name)}&language=en&format=json")
-    req = Net::HTTP::Get.new(uri)
-    req['User-Agent'] = "Growstuff (https://www.growstuff.org; admin@growstuff.org)"
-
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-      http.request(req)
-    end
-
-    data = JSON.parse(response.body)
-    data.dig('search', 0, 'id')
-  rescue StandardError => e
-    Rails.logger.error "WikidataService.find_wikidata_id error: #{e.message}"
-    nil
-  end
-
-  def self.fetch_temps(wikidata_id)
-    return {} if wikidata_id.blank?
-
-    uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=claims&format=json")
-    req = Net::HTTP::Get.new(uri)
-    req['User-Agent'] = "Growstuff (https://www.growstuff.org; admin@growstuff.org)"
-
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-      http.request(req)
-    end
-
-    data = JSON.parse(response.body)
-    claims = data.dig('entities', wikidata_id, 'claims') || {}
-
-    highest_temp = extract_temp(claims['P6591'])
-    lowest_temp = extract_temp(claims['P7422'])
-
-    {
-      highest_temp_c: highest_temp,
-      lowest_temp_c: lowest_temp
-    }
-  rescue StandardError => e
-    Rails.logger.error "WikidataService.fetch_temps error: #{e.message}"
-    {}
-  end
-
-  def self.extract_temp(claim_data)
-    return nil if claim_data.blank?
-
-    # We take the first value
-    main_snak = claim_data.first&.dig('mainsnak')
-    return nil unless main_snak&.dig('datavalue', 'type') == 'quantity'
-
-    quantity_data = main_snak.dig('datavalue', 'value')
-    amount = quantity_data['amount'].to_f
-    unit = quantity_data['unit']
-
-    case unit
-    when CELSIUS_UNIT_ID
-      amount
-    when FAHRENHEIT_UNIT_ID
-      (amount - 32) * 5.0 / 9.0
-    else
-      nil
-    end
-  end
-end

app/views/crops/_harvests.html.haml

@@ -17,7 +17,7 @@
       %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
       - if crop.approved?
         - if current_member
-          %li.list-group-item= link_to "Harvest #{crop.name}", new_harvest_path(harvest: { crop_id: crop.id }), class: 'btn btn-block'
+          %li.list-group-item= link_to "Harvest #{crop.name}", new_harvest_path(crop_id: crop.id), class: 'btn btn-block'
         - else
           %li.list-group-item.active
             = icon 'fas', 'user'

app/views/crops/merge.html.haml

@@ -0,0 +1,14 @@
+- content_for :title, "Merge Crops"
+
+%h1 Merge Crops
+
+= form_tag merge_crops_path, method: :post do
+  .form-group
+    = label_tag :master_crop_slug, "Master Crop (the one to keep)"
+    = text_field_tag :master_crop_slug, nil, class: 'form-control'
+
+  .form-group
+    = label_tag :duplicate_crop_slug, "Duplicate Crop (the one to delete)"
+    = text_field_tag :duplicate_crop_slug, nil, class: 'form-control'
+
+  = submit_tag "Merge", class: 'btn btn-primary'

app/views/crops/show.html.haml

@@ -36,11 +36,10 @@
       = cute_icon
       = render 'predictions', crop: @crop
     - if @crop.all_companions.any?
-      - cache [@crop, 'companions'] do
-        %section.companions
-          %h2 Companions
-          - @crop.all_companions.each do |companion|
-            = render 'crops/tiny', crop: companion
+      %section.companions
+        %h2 Companions
+        - @crop.all_companions.each do |companion|
+          = render 'crops/tiny', crop: companion
 
     - if crop_or_parent(@crop, :en_youtube_url).present?
       %section.youtube

app/views/crops/wrangle.html.haml

@@ -4,6 +4,7 @@
 
 %nav.nav
   = link_to "Full crop hierarchy", hierarchy_crops_path, class: 'nav-link'
+  = link_to "Merge Duplicates", merge_crops_path, class: 'btn'
   = link_to "Add Crop", new_crop_path, class: 'btn'
 
 %section.crop_wranglers

app/views/gardens/show.html.haml

@@ -102,8 +102,6 @@
           %strong Collaborators:
           - if can?(:create, GardenCollaborator.new(garden: @garden))
             = link_to "Manage", garden_garden_collaborators_path(@garden)
-          - elsif current_member.present? && (collab = @garden.garden_collaborators.find_by(member: current_member))
-            = link_to "Leave garden", garden_garden_collaborator_path(@garden, collab), method: :delete, class: 'text-danger', data: { confirm: 'Are you sure you want to leave this garden?' }
           - if @garden.garden_collaborators.any?
             %ul
               - @garden.garden_collaborators.each do |collabator|
@@ -124,31 +122,6 @@
             %strong Garden type:
             = @garden.garden_type.name
 
-        - if @garden.location_wikidata_id.present?
-          %hr
-          %p
-            %small
-              Data about this location from 
-              = link_to "wikidata", "https://www.wikidata.org/wiki/#{@garden.location_wikidata_id}", target: '_blank', rel: 'noopener noreferrer'
-
-          %p
-            %strong Highest temperature:
-            - if @garden.highest_temp_c.present?
-              = "#{ @garden.highest_temp_c.round(1) }°C"
-            - else
-              Not known
-          %p
-            %strong Lowest temperature:
-            - if @garden.lowest_temp_c.present?
-              = "#{ @garden.lowest_temp_c.round(1) }°C"
-            - else
-              Not known
-
-        - elsif can?(:edit, @garden) && @garden.location.present?
-          .alert.alert-info
-            %p Wikidata information is missing for this location.
-            = button_to "Fetch Wikidata info", fetch_wikidata_garden_path(@garden), method: :post, class: 'btn btn-info btn-sm'
-
     .card
       .card-header
         %h4 #{@garden.owner}'s gardens

app/views/harvests/_form.html.haml

@@ -52,17 +52,6 @@
           = f.select(:weight_unit, Harvest::WEIGHT_UNITS_VALUES, { include_blank: false }, class: 'form-control')
       = f.text_area :description, rows: 6, label: 'Notes'
 
-      - if @planting.present?
-        .row
-          .col-md-12
-            = f.range_field :overall_rating, min: 1, max: 5, value: @planting.overall_rating, include_blank: 'Leave blank', label: 'Overall Rating - Planting', list: "rating-list", title: "How well is the planting going?"
-            %datalist{"id": "rating-list"}
-              %option{"value": "1"} Poor
-              %option{"value": "2"}
-              %option{"value": "3"}
-              %option{"value": "4"}
-              %option{"value": "5"} Great
-
     .card-footer
       .text-right= f.submit 'Save'
 

app/views/harvests/_modal.html.haml

@@ -13,7 +13,7 @@
           .index-cards
             - harvest.crop.plant_parts.order(:name).each do |plant_part|
               .card
-                = link_to new_harvest_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}) do
+                = link_to harvests_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), method: :post do
                   .card-title.text-center
                     %h3= plant_part_icon(plant_part.name)
                     %h3= plant_part.name
@@ -22,12 +22,10 @@
         %h6 All Plant parts
         %nav.nav
           - PlantPart.all.order(:name).each do |plant_part|
-            = link_to new_harvest_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), class: 'nav-link border' do
+            = link_to harvests_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), method: :post, class: 'nav-link border' do
               = plant_part_icon(plant_part.name)
               = plant_part
 
-
-
 %a.btn#modalHarvestButton{"data-bs-target" => "#modelHarvestForm", "data-bs-toggle" => "modal", href: ""}
   = harvest_icon
   Record harvest

app/views/home/_plantings.html.haml

@@ -1,6 +1,5 @@
 %h2= t('.recently_planted')
 - Planting.homepage_records(6).each do |planting|
-  - next unless planting['thumbnail_url'].present?
   = 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

app/views/shared/_flash_messages.html.haml

@@ -3,4 +3,4 @@
     %button.close{ type: "button", "data-bs-dismiss" => "alert" }
       %span{ "aria-hidden" => true } ×
       %span.sr-only Close
-    = sanitize(content)
+    = content

config/routes.rb

@@ -32,7 +32,6 @@ Rails.application.routes.draw do
 
   resources :gardens, concerns: :has_photos, param: :slug do
     get 'timeline' => 'charts/gardens#timeline', constraints: { format: 'json' }
-    post 'fetch_wikidata' => 'gardens#fetch_wikidata', on: :member
 
     resources :garden_collaborators
   end
@@ -89,6 +88,8 @@ Rails.application.routes.draw do
     collection do
       get 'requested'
       get 'wrangle'
+      get 'merge'
+      post 'merge'
       get 'hierarchy'
       get 'search'
       get 'data_improvement'
@@ -158,7 +159,6 @@ Rails.application.routes.draw do
   namespace :api do
     namespace :v1 do
       jsonapi_resources :activities
-      get "crops/search", to: "crops#search"
       jsonapi_resources :crops
       jsonapi_resources :gardens
       jsonapi_resources :harvests

db/migrate/20250511035341_add_wikidata_and_temps_to_gardens.rb

@@ -1,7 +0,0 @@
-class AddWikidataAndTempsToGardens < ActiveRecord::Migration[7.2]
-  def change
-    add_column :gardens, :location_wikidata_id, :string
-    add_column :gardens, :lowest_temp_c, :float
-    add_column :gardens, :highest_temp_c, :float
-  end
-end

db/schema.rb

@@ -631,9 +631,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
     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

spec/controllers/harvests_controller_spec.rb

@@ -115,21 +115,6 @@ describe HarvestsController, :search do
 
         it { expect(Harvest.last.planting.id).to eq(planting.id) }
       end
-
-      describe "updates planting rating" do
-        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
-
-        it "updates the planting rating when provided" do
-          post :create, params: {
-            harvest: valid_attributes.merge(
-              planting_id:    planting.id,
-              crop_id:        planting.crop_id,
-              overall_rating: 4
-            )
-          }
-          expect(planting.reload.overall_rating).to eq(4)
-        end
-      end
     end
 
     describe "with invalid params" do
@@ -186,18 +171,6 @@ describe HarvestsController, :search do
 
         it { expect(response).to redirect_to(harvest) }
       end
-
-      describe "updates planting rating" do
-        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
-        let(:harvest) do
-          create(:harvest, valid_attributes.merge(planting_id: planting.id, crop_id: planting.crop_id))
-        end
-
-        it "updates the planting rating when provided" do
-          put :update, params: { slug: harvest.to_param, harvest: { overall_rating: 3 } }
-          expect(planting.reload.overall_rating).to eq(3)
-        end
-      end
     end
 
     describe "with invalid params" do

spec/features/harvests/harvesting_a_crop_spec.rb

@@ -54,8 +54,6 @@ describe "Harvesting a crop", :js, :search do
         visit crop_path(maize)
         click_link "Record harvest"
         click_link plant_part.name
-        # We then navigate to the new_harvest_path, and save.
-        click_button "Save"
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
@@ -71,22 +69,9 @@ describe "Harvesting a crop", :js, :search do
         click_link plant_part.name
       end
 
-      it "saves" do
-        # We then navigate to the new_harvest_path, and save.
-        click_button "Save"
-
-        expect(page).to have_content "harvest was successfully created."
-        expect(page).to have_content planting.garden.name
-        expect(page).to have_content "maize"
-      end
-
-      it "updates the planting rating" do
-        find_by_id('harvest_overall_rating').set 4
-        click_button "Save"
-        
-        expect(page).to have_content "harvest was successfully created."
-        expect(planting.reload.overall_rating).to eq 4
-      end
+      it { expect(page).to have_content "harvest was successfully created." }
+      it { expect(page).to have_content planting.garden.name }
+      it { expect(page).to have_content "maize" }
     end
 
     context "Editing a harvest" do

spec/models/garden_collaborator_ability_spec.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require 'cancan/matchers'
-
-describe Ability do
-  let(:member) { create(:member) }
-  let(:ability) { described_class.new(member) }
-
-  context 'garden collaborators' do
-    let(:garden) { create(:garden) }
-    let(:garden_collaborator) { create(:garden_collaborator, garden: garden, member: member) }
-    let(:other_member) { create(:member) }
-    let(:other_garden_collaborator) { create(:garden_collaborator, garden: garden, member: other_member) }
-
-    it 'can remove themselves as a collaborator' do
-      expect(ability).to be_able_to(:destroy, garden_collaborator)
-    end
-
-    it 'cannot remove others as a collaborator if not garden owner' do
-      expect(ability).not_to be_able_to(:destroy, other_garden_collaborator)
-    end
-
-    context 'as garden owner' do
-      let(:garden) { create(:garden, owner: member) }
-
-      it 'can remove others as a collaborator' do
-        expect(ability).to be_able_to(:destroy, other_garden_collaborator)
-      end
-    end
-  end
-end

spec/requests/api/v1/crops_search_spec.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe 'Crops Search' do
-  subject { JSON.parse response.body }
-
-  let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
-  let!(:cabbage) { create(:crop, name: 'Cabbage', approval_status: 'approved') }
-  let!(:apple)   { create(:crop, name: 'Apple', approval_status: 'approved') }
-
-  describe 'GET /api/v1/crops/search' do
-    before do
-      Crop.reindex
-    end
-
-    it 'returns crops matching the search term' do
-      get '/api/v1/crops/search', params: { term: 'Cabbage' }, headers: headers
-      expect(response).to have_http_status(:ok)
-      expect(subject['data'].size).to eq(1)
-      expect(subject['data'].first['attributes']['name']).to eq('Cabbage')
-    end
-
-    it 'returns empty data if no crops match' do
-      get '/api/v1/crops/search', params: { term: 'NonExistent' }, headers: headers
-      expect(response).to have_http_status(:ok)
-      expect(subject['data']).to be_empty
-    end
-
-    it 'includes meta information' do
-      get '/api/v1/crops/search', params: { term: 'Cabbage' }, headers: headers
-      expect(subject['meta']).to include('record_count' => 1, 'page_count' => 1)
-    end
-  end
-end

swagger/v1/swagger.json

@@ -9,85 +9,6 @@
     "/crops": {
       "get": {
         "summary": "crops List",
-    "/crops/search": {
-      "get": {
-        "summary": "crops Search",
-        "tags": [
-          "crops"
-        ],
-        "produces": [
-          "application/vnd.api+json"
-        ],
-        "parameters": [
-          {
-            "name": "term",
-            "in": "query",
-            "type": "string",
-            "description": "Search term",
-            "required": true
-          },
-          {
-            "name": "page[number]",
-            "in": "query",
-            "type": "string",
-            "description": "Page num",
-            "required": false
-          },
-          {
-            "name": "page[size]",
-            "in": "query",
-            "type": "string",
-            "description": "Page size",
-            "required": false
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Get search results",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "data": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "type": "string",
-                        "description": "ID"
-                      },
-                      "type": {
-                        "type": "string",
-                        "description": "Type"
-                      },
-                      "attributes": {
-                        "type": "object",
-                        "properties": {
-                          "name": {
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "meta": {
-                  "type": "object",
-                  "properties": {
-                    "record_count": {
-                      "type": "integer"
-                    },
-                    "page_count": {
-                      "type": "integer"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
         "tags": [
           "crops"
         ],

yarn.lock

@@ -735,9 +735,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-uri@^3.0.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.2.tgz#8af3d4fc9d3e71b11572cc2673b514a7d1a8c8ec"
-  integrity sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
+  integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
 
 fastq@^1.6.0:
   version "1.20.1"
@@ -915,9 +915,9 @@ inherits@2, inherits@~2.0.3:
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ip-address@^10.0.1:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206"
-  integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
+  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -1396,9 +1396,9 @@ supports-preserve-symlinks-flag@^1.0.0:
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 systeminformation@^5.25.11:
-  version "5.31.6"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.31.6.tgz#2da4979a7262974fd068a3a306ded30aed6127c0"
-  integrity sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA==
+  version "5.31.5"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.31.5.tgz#e839fa6b40620a8bee010eb9d9d55c2d5f7042c8"
+  integrity sha512-5SyLdip4/3alxD4Kh+63bUQTJmu7YMfYQTC+koZy7X73HgNqZSD2P4wOZQWtUncvPvcEmnfIjCoygN4MRoEejQ==
 
 to-regex-range@^5.0.1:
   version "5.0.1"