From d465b87da64b177e6be4dfbd8b9e93f806f11d32 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sat, 30 Dec 2023 06:20:22 -0800 Subject: [PATCH] Hotfix so weapon key search translates ints to arrays (#140) --- .env | 1 + app/controllers/api/v1/weapon_keys_controller.rb | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..acffc1d --- /dev/null +++ b/.env @@ -0,0 +1 @@ +RAILS_LOG_TO_STDOUT=true diff --git a/app/controllers/api/v1/weapon_keys_controller.rb b/app/controllers/api/v1/weapon_keys_controller.rb index 4d44720..cf885e9 100644 --- a/app/controllers/api/v1/weapon_keys_controller.rb +++ b/app/controllers/api/v1/weapon_keys_controller.rb @@ -5,14 +5,18 @@ module Api class WeaponKeysController < Api::V1::ApiController def all conditions = {}.tap do |hash| - hash[:series] = request.params['series'] unless request.params['series'].blank? - hash[:slot] = request.params['slot'] unless request.params['slot'].blank? - hash[:group] = request.params['group'] unless request.params['group'].blank? + hash[:series] = request.params['series'].to_i unless request.params['series'].blank? + hash[:slot] = request.params['slot'].to_i unless request.params['slot'].blank? + hash[:group] = request.params['group'].to_i unless request.params['group'].blank? end - render json: WeaponKeyBlueprint.render( - WeaponKey.where(conditions) - ) + # Build the query based on the conditions + weapon_keys = WeaponKey.all + weapon_keys = weapon_keys.where('? = ANY(series)', conditions[:series]) if conditions.key?(:series) + weapon_keys = weapon_keys.where(slot: conditions[:slot]) if conditions.key?(:slot) + weapon_keys = weapon_keys.where(group: conditions[:group]) if conditions.key?(:group) + + render json: WeaponKeyBlueprint.render(weapon_keys) end end end