review stuff

Author: claynicholson

app/controllers/admin/build_reviews_controller.rb

@@ -41,8 +41,8 @@ def show
 
   def show_random
     base = Project.active.build_pending
-    reviewed = base.with_valid_build_review
-    unreviewed = base.without_valid_build_review
+    reviewed = apply_ysws_filter(base.with_valid_build_review)
+    unreviewed = apply_ysws_filter(base.without_valid_build_review)
 
     us_filter = ->(scope) {
       scope.where("COALESCE(NULLIF((SELECT idv_country FROM users WHERE users.id = projects.user_id), ''), (SELECT country FROM ahoy_visits WHERE ahoy_visits.user_id = projects.user_id AND country IS NOT NULL AND country != '' ORDER BY started_at DESC LIMIT 1)) IN ('US', 'United States')")
@@ -55,8 +55,8 @@ def show_random
         random_pick_id(us_filter.call(unreviewed)) ||
         random_pick_id(unreviewed)
       else
-        random_pick_id(us_filter.call(unreviewed.not_led)) ||
-        random_pick_id(unreviewed.not_led)
+        random_pick_id(us_filter.call(unreviewed)) ||
+        random_pick_id(unreviewed)
       end
 
     if project_id

app/controllers/admin/design_reviews_controller.rb

@@ -38,8 +38,8 @@ def show
 
   def show_random
     base = Project.active.design_pending
-    reviewed = base.with_valid_design_review
-    unreviewed = base.without_valid_design_review
+    reviewed = apply_ysws_filter(base.with_valid_design_review)
+    unreviewed = apply_ysws_filter(base.without_valid_design_review)
 
     us_filter = ->(scope) {
       scope.where("COALESCE(NULLIF((SELECT idv_country FROM users WHERE users.id = projects.user_id), ''), (SELECT country FROM ahoy_visits WHERE ahoy_visits.user_id = projects.user_id AND country IS NOT NULL AND country != '' ORDER BY started_at DESC LIMIT 1)) IN ('US', 'United States')")
@@ -52,8 +52,8 @@ def show_random
         random_pick_id(us_filter.call(unreviewed)) ||
         random_pick_id(unreviewed)
       else
-        random_pick_id(us_filter.call(unreviewed.not_led)) ||
-        random_pick_id(unreviewed.not_led)
+        random_pick_id(us_filter.call(unreviewed)) ||
+        random_pick_id(unreviewed)
       end
 
     if project_id
@@ -113,4 +113,28 @@ def require_reviewer_perms!
       redirect_to main_app.root_path, alert: "You are not authorized to access this page."
     end
   end
+
+  def normalized_ysws_filter
+    case params[:ysws_type]
+    when "hackpad", "led"
+      params[:ysws_type]
+    else
+      nil
+    end
+  end
+
+  def apply_ysws_filter(scope)
+    case normalized_ysws_filter
+    when "hackpad"
+      scope.where(ysws: "hackpad")
+    when "led"
+      scope.where(ysws: "led")
+    else
+      if current_user.admin?
+        scope
+      else
+        scope.where("ysws IS NULL OR ysws != ?", "led")
+      end
+    end
+  end
 end

config/routes.rb

@@ -197,12 +197,12 @@ def self.matches?(request)
       get "/" => "static_pages#index", as: :root
 
       get "design_reviews", to: "design_reviews#index", as: :design_reviews
-      get "design_reviews/random", to: "design_reviews#show_random", as: :random_design_review
+      get "design_reviews/random(/:ysws_type)", to: "design_reviews#show_random", as: :random_design_review
       get "design_reviews/:id", to: "design_reviews#show", as: :design_review
       post "design_reviews/:id", to: "design_reviews#create", as: :design_review_create
 
       get "build_reviews", to: "build_reviews#index", as: :build_reviews
-      get "build_reviews/random", to: "build_reviews#show_random", as: :random_build_review
+      get "build_reviews/random(/:ysws_type)", to: "build_reviews#show_random", as: :random_build_review
       get "build_reviews/:id", to: "build_reviews#show", as: :build_review
       post "build_reviews/:id", to: "build_reviews#create", as: :build_review_create