1808 modify search endpoint

app/controllers/services_controller.rb

@@ -11,14 +11,66 @@ class ServicesController < ApplicationController
 
   def index
     if params[:category_id]
-      all_services = find_by_category(params[:category_id])
+      all_services = find_by_categories(params[:category_id], params[:eligibility_id])
     elsif params[:eligibility_id]
       all_services = find_by_eligibility(params[:eligibility_id])
     end
 
     render json: ServicesWithResourcePresenter.present(all_services)
   end
 
+  # rubocop:disable AbcSize
+  # rubocop:disable MethodLength
+  # rubocop:disable PerceivedComplexity
+  def find_by_categories(categories_id_string, eligibilities_id_string)
+    query_string = ""
+    if categories_id_string.include? ","
+      category_ids = categories_id_string.split ","
+      first_cat = true
+      category_ids.each do |cat_id|
+        if first_cat
+          query_string = "services.id in (select service_id from categories_services where category_id=" + cat_id + ")"
+          first_cat = false
+        else
+          query_string = query_string +
+                         " and services.id in (select service_id from categories_services where category_id=" + cat_id + ")"
+        end
+      end
+    else
+      query_string = "services.id in (select service_id from categories_services where category_id=" + cat_id + ")"
+    end
+
+    if eligibilities_id_string
+      if eligibilities_id_string.include? ","
+        eligibility_ids = eligibilities_id_string.split ","
+        eligibility_ids.each do |elig_id|
+          query_string = query_string +
+                         " and services_id in (select service_id from eligibilities_services where eligibility_id=" +
+                         elig_id + ")"
+        end
+      else
+        query_string = query_string +
+                       " and services_id in (select service_id from eligibilities_services where eligibility_id=" +
+                       eligibilities_id_string + ")"
+      end
+    end
+    find_services(query_string)
+  end
+  # rubocop:enable AbcSize
+  # rubocop:enable MethodLength
+  # rubocop:enable PerceivedComplexity
+
+  def find_services(query_string)
+    services.includes(
+      resource: [
+        :addresses, :phones, :categories, :notes,
+        schedule: :schedule_days,
+        services: [:notes, :categories, :addresses, :eligibilities, { schedule: :schedule_days }],
+        ratings: [:review]
+      ]
+    ).where(query_string)
+  end
+
   def find_by_category(category_id_string)
     services.includes(
       resource: [