Merge pull request #1264 from concord-consortium/187314125-filters-ui-ux

Update UI/UX of the researcher classes filters, cleanup API

rails/app/controllers/api/v1/researcher_classes_controller.rb

@@ -5,24 +5,20 @@ class API::V1::ResearcherClassesController < API::APIController
 
   def index
     authorize [:api, :v1, :report_user]
-
     render :json => query(params, current_user)
   end
 
   private
 
   def query(options, user)
-
     results = {}
 
-    scopes = {
-      teachers: Pundit.policy_scope(user, Portal::Teacher),
-      cohorts: Pundit.policy_scope(user, Admin::Cohort),
-      runnables: Pundit.policy_scope(user, Portal::Offering)
-                  .joins("INNER JOIN external_activities ON external_activities.id = portal_offerings.runnable_id")
-                  .where("portal_offerings.runnable_type = 'ExternalActivity'"),
-      classes: Pundit.policy_scope(user, Portal::Clazz)
-    }
+    teachers = Pundit.policy_scope(user, Portal::Teacher)
+    cohorts = Pundit.policy_scope(user, Admin::Cohort)
+    runnables = Pundit.policy_scope(user, Portal::Offering)
+                .joins("INNER JOIN external_activities ON external_activities.id = portal_offerings.runnable_id")
+                .where("portal_offerings.runnable_type = 'ExternalActivity'")
+    classes = Pundit.policy_scope(user, Portal::Clazz)
 
     cc_teacher_ids = []
     remove_cc_teachers = ActiveModel::Type::Boolean.new.cast(options[:remove_cc_teachers])
@@ -32,86 +28,52 @@ def query(options, user)
         .where("member_type = 'Portal::Teacher' AND school_id IN (?)", cc_school_ids)
         .pluck("member_id")
       if cc_teacher_ids && cc_teacher_ids.length > 0
-        scopes[:teachers] = scopes[:teachers].where("portal_teachers.id NOT IN (?)", cc_teacher_ids)
+        teachers = teachers.where("portal_teachers.id NOT IN (?)", cc_teacher_ids)
       end
     end
 
     ids = {}
-
-    if options[:project_id] && !options[:project_id].empty?
-      ids[:project_id] = options[:project_id].to_i
-    end
-
-    totals = ActiveModel::Type::Boolean.new.cast(options[:totals])
-    if totals
-      results[:totals] = {
-        teachers: scopes[:teachers].count(),
-        cohorts: scopes[:cohorts].count(),
-        runnables: scopes[:runnables].distinct.select(:runnable_id).count()
-      }
-    end
-
-    if options[:teachers] && !options[:teachers].empty?
-      if /\A(\d+,*)+\z/.match(options[:teachers])
-        ids[:teachers] = options[:teachers].split(',').map(&:to_i)
-      elsif options[:teachers].length >= 4
-        like_holder = "%#{options[:teachers]}%"
-        ids[:teachers] = scopes[:teachers]
-          .distinct
-          .joins(:user)
-          .where("(users.login LIKE ?) OR (users.first_name LIKE ?) OR (users.last_name LIKE ?)", like_holder, like_holder, like_holder)
-          .pluck("portal_teachers.id")
-      end
-    end
-
+    ids[:project_id] = options[:project_id].to_i if options[:project_id] && !options[:project_id].empty?
+    ids[:teachers] = options[:teachers].split(',').map(&:to_i) if options[:teachers] && !options[:teachers].empty?
     ids[:cohorts] = options[:cohorts].split(',').map(&:to_i) if options[:cohorts] && !options[:cohorts].empty?
+    ids[:runnables] = options[:runnables].split(',').map(&:to_i) if options[:runnables] && !options[:runnables].empty?
 
-    if options[:runnables] && !options[:runnables].empty?
-      if /\A(\d+,*)+\z/.match(options[:runnables])
-        ids[:runnables] = options[:runnables].split(',').map(&:to_i)
-      elsif options[:runnables].length >= 4
-        ids[:runnables] = scopes[:runnables]
-          .distinct
-          .where("external_activities.name LIKE ?", "%#{options[:runnables]}%")
-          .pluck("runnable_id")
-      end
-    end
-
-    classes_subquery = classes_query(options, user, scopes, ids)
+    classes_subquery = classes_query(options, user, classes, ids)
     classes_ids_subbquery = classes_subquery.select(:id)
 
-    if options[:load_all]
-      case options[:load_all]
+    if options[:load_only]
+      # Load results just for one field
+      case options[:load_only]
       when "teachers"
-        results[:hits] = {teachers: teacher_query(options, user, scopes, classes_ids_subbquery)}
+        results[:hits] = {teachers: teacher_query(options, user, teachers, classes_ids_subbquery)}
       when "cohorts"
-        results[:hits] = {cohorts: cohorts_query(options, user, scopes, classes_ids_subbquery)}
+        results[:hits] = {cohorts: cohorts_query(options, user, cohorts, classes_ids_subbquery)}
       when "runnables"
-        results[:hits] = {runnables: runnables_query(options, user, scopes, classes_ids_subbquery)}
+        results[:hits] = {runnables: runnables_query(options, user, runnables, classes_ids_subbquery)}
       end
-    elsif (ids.has_key?(:teachers) || ids.has_key?(:cohorts) || ids.has_key?(:runnables))
+    else
       results[:hits] = {
-        teachers: teacher_query(options, user, scopes, classes_ids_subbquery),
-        cohorts: cohorts_query(options, user, scopes, classes_ids_subbquery),
-        runnables: runnables_query(options, user, scopes, classes_ids_subbquery),
+        teachers: teacher_query(options, user, teachers, classes_ids_subbquery),
+        cohorts: cohorts_query(options, user, cohorts, classes_ids_subbquery),
+        runnables: runnables_query(options, user, runnables, classes_ids_subbquery),
         classes: classes_mapping(classes_subquery)
       }
     end
 
     return results
   end
 
-  def teacher_query(options, user, scopes, clazz_ids_subquery)
-    scopes[:teachers]
+  def teacher_query(options, user, scope, clazz_ids_subquery)
+    scope
       .joins("INNER JOIN portal_teacher_clazzes ON portal_teacher_clazzes.teacher_id = portal_teachers.id")
       .where(portal_teacher_clazzes: { clazz_id: clazz_ids_subquery })
       .distinct
       .joins(:user)
       .select("portal_teachers.id, CONCAT(users.first_name, ' ', users.last_name, ' (', users.login ,')') AS label")
   end
 
-  def cohorts_query(options, user, scopes, clazz_ids_subquery)
-    scopes[:cohorts]
+  def cohorts_query(options, user, scope, clazz_ids_subquery)
+    scope
       .joins("INNER JOIN admin_cohort_items ON admin_cohort_items.item_type = 'Portal::Teacher' AND admin_cohort_items.admin_cohort_id = admin_cohorts.id")
       .joins("INNER JOIN portal_teacher_clazzes ON admin_cohort_items.item_id = portal_teacher_clazzes.teacher_id")
       .where(portal_teacher_clazzes: { clazz_id: clazz_ids_subquery })
@@ -121,41 +83,41 @@ def cohorts_query(options, user, scopes, clazz_ids_subquery)
       .order("label")
   end
 
-  def runnables_query(options, user, scopes, clazz_ids_subquery)
-    scopes[:runnables]
+  def runnables_query(options, user, scope, clazz_ids_subquery)
+    scope
       .joins("INNER JOIN portal_teacher_clazzes ptc2 ON portal_offerings.clazz_id = ptc2.clazz_id")
       .where(portal_teacher_clazzes: { clazz_id: clazz_ids_subquery })
       .distinct
       .select("external_activities.id, external_activities.name as label")
   end
 
-  def classes_query(options, user, scopes, ids)
-    query_scope = scopes[:classes]
+  def classes_query(options, user, scope, ids)
+    scope = scope
       .joins("INNER JOIN portal_teacher_clazzes ptc2 ON portal_clazzes.id = ptc2.clazz_id")
       .joins("INNER JOIN admin_cohort_items aci ON aci.item_id = ptc2.teacher_id")
       .joins("INNER JOIN admin_cohorts ON admin_cohorts.id = aci.admin_cohort_id")
       .where("aci.item_type = 'Portal::Teacher' AND admin_cohorts.project_id = ?", ids[:project_id])
 
     if ids.has_key?(:cohorts)
-      query_scope = query_scope
+      scope = scope
         .joins("INNER JOIN portal_teacher_clazzes ptc2 ON portal_clazzes.id = ptc2.clazz_id")
         .joins("INNER JOIN admin_cohort_items aci ON aci.item_id = ptc2.teacher_id")
         .where("aci.item_type = 'Portal::Teacher' AND aci.admin_cohort_id IN (?)", ids[:cohorts])
     end
 
     if ids.has_key?(:teachers)
-      query_scope = query_scope
+      scope = scope
         .joins("INNER JOIN portal_teacher_clazzes ptc2 ON portal_clazzes.id = ptc2.clazz_id")
         .where("ptc2.teacher_id IN (?)", ids[:teachers])
     end
 
     if ids.has_key?(:runnables)
-      query_scope = query_scope
+      scope = scope
         .joins("INNER JOIN portal_offerings ON portal_offerings.clazz_id = portal_clazzes.id")
         .where("portal_offerings.runnable_type = 'ExternalActivity' AND portal_offerings.runnable_id IN (?)", ids[:runnables])
     end
 
-    query_scope.distinct
+    scope.distinct
   end
 
   def classes_mapping(classes_query)
@@ -169,9 +131,4 @@ def classes_mapping(classes_query)
       hash
     end
   end
-
-  def query_not_limited?(options, ids)
-    !options[:load_all] && !ids.has_key?(:teachers) && !ids.has_key?(:cohorts) && !ids.has_key?(:runnables)
-  end
-
 end