Shipcy banned users (publiclab#7181)

* Update admin_controller.rb * modified useremail function to include banned users * Update modified useremail function to include banned users * Update modified useremail function to include banned users * Update modified useremail function to include banned users * Update modified useremail function to include banned users * Update app/controllers/modified useremail function to include banned users Co-Authored-By: Sparks <[email protected]> * Update modified useremail function to include banned users * rename admin_controller.rb back * Update admin_controller_test.rb * Update codecov.yml Co-authored-by: Shipra Choudhary <[email protected]> Co-authored-by: Sparks <[email protected]> Co-authored-by: Jeffrey Warren <[email protected]>
stacytonui · Jan 10, 2020 · 6ae4850 · 6ae4850
1 parent 08ab5c0
commit 6ae4850
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -60,20 +60,26 @@ def reset_user_password
     end
   end
 
-  def useremail
-    if logged_in_as(['admin', 'moderator'])
-      if params[:address]
-        # address was submitted. find the username(s) and return.
-        @address = params[:address]
-        @users = User.where(email: params[:address])
-                 .where(status: [1, 4])
-      end
-    else
-      # unauthorized. instead of return ugly 403, just send somewhere else
-      redirect_to '/dashboard'
-    end
+  def useremail 
+   if logged_in_as(['admin', 'moderator']) 
+     if params[:address] 
+       # address was submitted. find the username(s) and return. 
+       @address = params[:address] 
+       if params[:include_banned]
+         @users = User.where(email: params[:address]) 
+           .where('created_at > (?)', DateTime.new(2015)) # since 2015, whether banned or not
+       else
+         @users = User.where(email: params[:address]) 
+           .where(status: [1, 4]) 
+       end
+     end 
+   else 
+     # unauthorized. instead of return ugly 403, just send somewhere else 
+     redirect_to '/dashboard' 
+   end
   end
 
+
   def spam
     if logged_in_as(['admin', 'moderator'])
       @nodes = Node.paginate(page: params[:page])

diff --git a/codecov.yml b/codecov.yml
@@ -10,7 +10,9 @@ coverage:
     project: 
       default:
         threshold: 1%
-    patch: on
+    patch:
+      default:
+        threshold: 50%
 
 ignore:
   - app/assets/stylesheets/
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
@@ -662,4 +662,21 @@ def teardown
     assert_response :success
     assert_not_nil assigns(:comments)
   end
+
+  test 'admin user should be able to view page to search users by email' do
+    UserSession.create(users(:admin))
+
+    get :useremail
+
+    assert_response :success
+  end
+
+  test 'admin user should be able to search users by email' do
+    UserSession.create(users(:admin))
+
+    get :useremail, params: { address: '[email protected]', include_banned: 'true' }
+
+    assert_response :success
+    assert_not_nil assigns(:users)
+  end
 end