From 14a1b88a934b69a75354980a405e18fd7d7ae62d Mon Sep 17 00:00:00 2001
From: rvoss <voss@bfpi.de>
Date: Fri, 21 Jul 2023 11:30:12 +0200
Subject: [PATCH 1/2] Ticket #47: Frontend Kategorieauswahl

---
 app/assets/javascripts/forms.coffee    | 2 +-
 app/controllers/services_controller.rb | 9 +--------
 app/helpers/requests_helper.rb         | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/forms.coffee b/app/assets/javascripts/forms.coffee
index afa4c4fc..373dabd2 100644
--- a/app/assets/javascripts/forms.coffee
+++ b/app/assets/javascripts/forms.coffee
@@ -4,7 +4,7 @@ $ ->
 
   KS.content().on 'change', 'select[data-update]', ->
     if (target = $("##{ $(@).data('update') }"))? && (url = target.data('src'))?
-      $.ajax(url: url, dataType: 'json', data: category: $(@).val()).done (response) ->
+      $.ajax(url: url, dataType: 'json', data: { category: $(@).val(), lat: $('#request_lat').val(), long: $('#request_long').val()}).done (response) ->
         target.html('').append "<option disabled='disabled' selected='selected' class='placeholder'>#{
           target.data('placeholder') }</option>"
         $(response).each ->
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index f1f28b27..cc8387f5 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -3,14 +3,7 @@ class ServicesController < ApplicationController
   respond_to :json
 
   def index
-    services = Service.collection.to_a.dup
-    if (type = params[:type]).present?
-      services.reject! { |s| s.type != type }
-    end
-    if (category = params[:category]).present?
-      services.reject! { |s| s.group != category }
-    end
-    respond_with services
+    respond_with Service.where(lat: params[:lat], long: params[:long], group: params[:category], keywords: params[:type])
   rescue ActionController::UnknownFormat
     head :not_acceptable
   end
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 40c31225..6a02c1e1 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -40,10 +40,10 @@ def categories(type, current = nil)
   end
 
   def services(category = nil, current = nil)
-   services = Service.collection.select { |s| s.group == category }.map { |s|
+    services = Service.collection.select { |s| s.group == category }.map { |s|
       [s.service_name, s.service_code]
     }.insert 0, [t('placeholder.select.service'), disabled: true, class: :placeholder]
-   options_for_select services, current
+    options_for_select services, current
   end
 
   def service

From a68c979cad461676193426bc7eeda224319dab56 Mon Sep 17 00:00:00 2001
From: Niels Bennke <bennke@bfpi.de>
Date: Wed, 2 Apr 2025 08:20:07 +0200
Subject: [PATCH 2/2] =?UTF-8?q?permit=20f=C3=BCr=20passende=20Parameter=20?=
 =?UTF-8?q?nutzen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/services_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index cc8387f5..1a149eb1 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -3,7 +3,7 @@ class ServicesController < ApplicationController
   respond_to :json
 
   def index
-    respond_with Service.where(lat: params[:lat], long: params[:long], group: params[:category], keywords: params[:type])
+    respond_with Service.where(params.permit(:lat, :long).merge(group: params[:category], keywords: params[:type]))
   rescue ActionController::UnknownFormat
     head :not_acceptable
   end