OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

Refactor fits and not_fits in Item::Search::Query

Browse source 
Just restructuring a bit in anticipation of changes we're gonna make
for alt style support in here!
This commit is contained in:
Emi Matchu 2024-02-27 14:05:37 -08:00
parent f3e10dea7f
commit 671a79d158
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/models/item/search/query.rb
View file

@ -44,8 +44,8 @@ class Item
color_name, species_name = value.split("-") color_name, species_name = value.split("-")
pet_type = load_pet_type_by_name(color_name, species_name) pet_type = load_pet_type_by_name(color_name, species_name)
filters << (is_positive ? filters << (is_positive ?
Filter.fits(pet_type.body_id, color_name, species_name) : Filter.fits_pet_type(pet_type, color_name:, species_name:) :
Filter.not_fits(pet_type.body_id, color_name, species_name)) Filter.not_fits_pet_type(pet_type, color_name:, species_name:))
when 'species' when 'species'
begin begin
species = Species.find_by_name!(value) species = Species.find_by_name!(value)
@ -131,11 +131,9 @@ class Item
raise NotImplementedError if value[:alt_style_id].present? raise NotImplementedError if value[:alt_style_id].present?
pet_type = load_pet_type_by_color_and_species( pet_type = load_pet_type_by_color_and_species(
value[:color_id], value[:species_id]) value[:color_id], value[:species_id])
color = Color.find value[:color_id]
species = Species.find value[:species_id]
filters << (is_positive ? filters << (is_positive ?
Filter.fits(pet_type.body_id, color.name, species.name) : Filter.fits_pet_type(pet_type) :
Filter.not_fits(pet_type.body_id, color.name, species.name)) Filter.not_fits_pet_type(pet_type))
when 'user_closet_hanger_ownership' when 'user_closet_hanger_ownership'
case value case value
when 'true' when 'true'
@ -227,16 +225,14 @@ class Item
self.new Item.not_restricts(value), "-restricts:#{q value}" self.new Item.not_restricts(value), "-restricts:#{q value}"
end end
def self.fits(body_id, color_name, species_name) def self.fits_pet_type(pet_type, color_name: nil, species_name: nil)
# NOTE: Some color syntaxes are weird, like `fits:"polka dot-aisha"`! value = pet_type_to_filter_text(pet_type, color_name:, species_name:)
value = "#{color_name}-#{species_name}".downcase self.new Item.fits(pet_type.body_id), "fits:#{q value}"
self.new Item.fits(body_id), "fits:#{q value}"
end end
def self.not_fits(body_id, color_name, species_name) def self.not_fits_pet_type(pet_type, color_name: nil, species_name: nil)
# NOTE: Some color syntaxes are weird, like `fits:"polka dot-aisha"`! value = pet_type_to_filter_text(pet_type, color_name:, species_name:)
value = "#{color_name}-#{species_name}".downcase self.new Item.not_fits(pet_type.body_id), "-fits:#{q value}"
self.new Item.not_fits(body_id), "-fits:#{q value}"
end end
def self.fits_species(body_id, species_name) def self.fits_species(body_id, species_name)
@ -293,6 +289,16 @@ class Item
def self.q(value) def self.q(value)
/\s/.match(value) ? '"' + value + '"' : value /\s/.match(value) ? '"' + value + '"' : value
end end
def self.pet_type_to_filter_text(pet_type, color_name: nil, species_name: nil)
# Load the color & species name if needed, or use them from the params
# if already known (e.g. from parsing a "fits:blue-acara" text query).
color_name ||= pet_type.color.name
species_name ||= pet_type.species.name
# NOTE: Some color syntaxes are weird, like `fits:"polka dot-aisha"`!
value = "#{color_name}-#{species_name}".downcase
end
end end
end end
end end