fix: pre-commit suggestions incorporated

Author: khushhalm

Access/accessrequest_helper.py

@@ -58,7 +58,7 @@ def getGrantFailedRequests(request):
     except Exception as e:
         return process_error_response(request, e)
 
-    
+
 
 def getPendingRevokeFailures(request):
     if request.GET.get('username'):

Access/group_helper.py

@@ -134,7 +134,7 @@ def updateOwner(request, group, context):
     logger.debug("updating owners for group "+ group.name + " requested by "+ request.user.username)
     data=request.POST
     data=dict(data.lists())
-    
+
     if "owners" not in data:
         data["owners"] = []
     destination = [request.user.user.email]
@@ -159,7 +159,7 @@ def updateOwner(request, group, context):
 def isAllowedGroupAdminFunctions(request,groupMembers):
     ownersEmail = [member.user.email for member in groupMembers.filter(is_owner = True)]
     is_approver = len(User.objects.filter(role=Role.objects.get(label='TEAMS:ACCESSAPPROVE'),state=1, email=request.user.user.email)) > 0
-    
+
     if request.user.user.email not in ownersEmail and not (request.user.is_superuser or request.user.user.is_ops or is_approver):
         return False
     return True
@@ -175,7 +175,7 @@ def check_user_is_group_owner(user_name, group):
         return False
 
 def approveNewGroupRequest(request, group_id):
-    
+
     try:
         group_object = GroupV2.objects.get(group_id=group_id, status='Pending')
     except Exception as e:
@@ -196,7 +196,7 @@ def approveNewGroupRequest(request, group_id):
             group_object.approver = request.user.user
             group_object.status = 'Approved'
             group_object.save()
-            
+
             MembershipV2.objects.filter(group=group_object, status="Pending").update(status="Approved", approver=request.user.user)
             initial_members = list(MembershipV2.objects.filter(group=group_object).values_list("user__user__username", flat=True))
 
@@ -228,7 +228,7 @@ def approveNewGroupRequest(request, group_id):
         logger.error("Error in Approving New Group request.")
         context = {}
         context['error'] = "Error Occured while Approving group creation. Please contact admin - "+str(e)
-        return context    
+        return context
 
 def get_user_group(request, group_name):
     try:
@@ -245,7 +245,7 @@ def get_user_group(request, group_name):
         groupMembers = MembershipV2.objects.filter(group=group).filter(status="Approved").only('user')
         if not isAllowedGroupAdminFunctions(request, groupMembers):
             raise Exception("Permission denied, you're not owner of this group")
-    
+
         groupMembers = get_users_from_groupmembers(groupMembers)
         context['groupMembers'] = groupMembers
         context['groupName'] = group_name
@@ -255,14 +255,14 @@ def get_user_group(request, group_name):
         logger.error("Error in Add New User to Group request.")
         context = {}
         context['error'] = {'error_msg': 'Internal Error', 'msg': "Error Occured while loading the page. Please contact admin, " + str(e)}
-        return context        
+        return context
 
 def get_users_from_groupmembers(group_members):
     return [member.user for member in group_members]
 
 def add_user_to_group(request):
     try:
-        
+
         data = request.POST
         data = dict(data.lists())
         group = GroupV2.objects.filter(name=data['groupName'][0]).filter(status='Approved')[0]
@@ -297,7 +297,7 @@ def add_user_to_group(request):
                 return json_response
 
             sendMailForGroupApproval(membership_id, user_email, str(request.user), data['groupName'][0], request.META['HTTP_HOST'], data['memberReason'][0])
-        
+
         context = {}
         context['status'] = {'title':'Request Submitted', 'msg': 'Once Approved the newly added members will be granted the same permissions as the group'}
         return context
@@ -309,7 +309,7 @@ def add_user_to_group(request):
         return context
 
 def is_user_in_group(user_email, group_members_email):
-    return user_email in group_members_email    
+    return user_email in group_members_email
 
 def sendMailForGroupApproval(membership_id, userEmail, requester, group_name, http_host, reason ):
     primary_approver , otherApprover = helpers.getApprovers()
@@ -320,10 +320,10 @@ def sendMailForGroupApproval(membership_id, userEmail, requester, group_name, ht
 
 
 def generateUserAddToGroupEmailBody(user_email, primary_approver, other_approver, requester, group_name, reason):
-    return helpers.generateStringFromTemplate(filename="add_user_to_group_mail.html", 
+    return helpers.generateStringFromTemplate(filename="add_user_to_group_mail.html",
                                             user_email = user_email,
-                                            primary_approver = primary_approver, 
-                                            other_approver = other_approver, 
+                                            primary_approver = primary_approver,
+                                            other_approver = other_approver,
                                             requester = requester,
                                             group_name = group_name,
                                             reason = reason)

Access/models.py

@@ -343,7 +343,7 @@ def getAccessRequestDetails(self, access_module):
         access_request_data["accessMeta"] = access_module.combine_labels_meta(access_labels)
 
         return access_request_data
-    
+
     def updateMetaData(self, key, data):
         with transaction.atomic():
             mapping = UserAccessMapping.objects.select_for_update().get(request_id=self.request_id)

Access/tests/test_access_views_helper.py

@@ -244,14 +244,14 @@ def test_executeGroupAccess(
             "mod1",
             True,
             "GrantFailed",
-        ),        
+        ),
         (
             test_run_access_grant_approveException,
             "1",
             "mod1",
             True,
             "GrantFailed",
-        ),        
+        ),
     ],
 )
 
@@ -261,7 +261,7 @@ def test_run_access_grant(mocker, testName, accessType ,userState, response, res
         requestObject = mocker.MagicMock()
         requestObject.user.state = userState
         requestObject.save.return_value = True
-    
+
     elif testName == test_run_access_grant_accessApproved:
         requestObject = mocker.MagicMock()
         requestObject.user.state = userState
@@ -303,4 +303,3 @@ def test_run_access_grant(mocker, testName, accessType ,userState, response, res
     assert requestObject.status == response_status
     if response_status == "GrantFailed":
         general.emailSES.call_count == 1
-

Access/tests/test_accessrequest_helper.py

@@ -111,7 +111,7 @@ def requestGet(val):
         mocker.patch("Access.models.User.objects.get", return_value=mocker.MagicMock())
     elif testname == Test_pendingFailure_Exception:
         mocker.patch("Access.models.UserAccessMapping.objects.filter", return_value=None, side_effect = Exception(getUserExceptionString))
-        
+
     context = accessrequest_helper.getGrantFailedRequests(request)
     assert str(context) == expectedOutput
 
@@ -137,7 +137,7 @@ def requestGet(val):
             if val == 'username':
                 return True
             return False
-        
+
         request.GET.get = requestGet
 
         orderByPatch = mocker.MagicMock()
@@ -150,9 +150,9 @@ def requestGet(val):
             if val == 'access_type':
                 return "request_type"
             return False
-        
+
         request.GET.get = requestGet
-        
+
         orderByPatch = mocker.MagicMock()
         orderByPatch.order_by.return_value = failures
         mocker.patch("Access.models.User.objects.get", return_value=mocker.MagicMock())
@@ -163,12 +163,12 @@ def requestGet(val):
             if val == 'access_type' or val == 'username':
                 return False
             return True
-        
+
         request.GET.get = requestGet
-        
+
         orderByPatch = mocker.MagicMock()
         orderByPatch.order_by.return_value = failures
-        mocker.patch("Access.models.UserAccessMapping.objects.filter", return_value=orderByPatch)        
+        mocker.patch("Access.models.UserAccessMapping.objects.filter", return_value=orderByPatch)
 
     elif testname == test_pendingRevoke_Exception:
         request.GET.get.return_value = True

Access/tests/test_group_helper.py

@@ -170,7 +170,7 @@ def test_updateOwner(mocker):
             test_approveNewGroupRequest_ThrowsException,
             "{'error': 'Error Occured while Approving group creation. Please contact admin - sendEmailError'}",
             "grp1", False, True,
-        ),        
+        ),
     ]
 )
 
@@ -186,7 +186,7 @@ def test_approveNewGroupRequest(mocker, testname, expectedoutput,groupID, reques
         mock_groupObject.status="Declined"
         mock_groupObject.approver.user.username = "username2"
         mocker.patch("Access.models.GroupV2.objects.get", return_value=mock_groupObject)
-        
+
     elif testname == test_approveNewGroupRequest_UserApprovingHisOwn:
         request.user.username = "username1"
         mock_groupObject = mocker.MagicMock()
@@ -204,7 +204,7 @@ def test_approveNewGroupRequest(mocker, testname, expectedoutput,groupID, reques
         mock_groupObject.requester.user.username = "username3"
         mock_groupObject.save.return_value = True
         mock_groupObject.requester.email = "requester@email.com"
-        
+
         mock_membership_update = mocker.MagicMock()
         mock_membership_update.update.return_value = True
         mock_membership_update.values_list.return_value = ["member1"]
@@ -222,7 +222,7 @@ def test_approveNewGroupRequest(mocker, testname, expectedoutput,groupID, reques
         mock_groupObject.requester.user.username = "username3"
         mock_groupObject.save.return_value = True
         mock_groupObject.requester.email = "requester@email.com"
-        
+
         mock_membership_update = mocker.MagicMock()
         mock_membership_update.update.return_value = True
         mock_membership_update.values_list.return_value = ["member1"]
@@ -246,7 +246,7 @@ def test_approveNewGroupRequest(mocker, testname, expectedoutput,groupID, reques
         assert models.MembershipV2.objects.filter.call_count == 2
         assert general.emailSES.call_count == 1
         assert helpers.generateStringFromTemplate.call_count == 2
-        
+
 
 test_get_user_group_group_not_found = "GroupNotFound"
 test_get_user_group_cannot_access_group = "UserIsNotOwnerOfGroupOrSuperUser"
@@ -267,7 +267,7 @@ def test_approveNewGroupRequest(mocker, testname, expectedoutput,groupID, reques
             test_get_user_group_can_access_group,
             "TestGroupName1",
             "{'groupMembers': 'user1', 'groupName': 'TestGroupName1'}",
-        ),        
+        ),
     ]
 )
 def test_get_user_group(mocker, test_name, group_name, expected_output):
@@ -289,12 +289,12 @@ def test_get_user_group(mocker, test_name, group_name, expected_output):
         mock_membership_filter1 = mocker.MagicMock()
         mock_group_member = mocker.MagicMock()
         mock_group_member.filter.return_value = ["member1@email.com"]
-        
+
         mock_membership_filter1.filter.return_value = mock_membership_only_filter
 
         mocker.patch("Access.models.MembershipV2.objects.filter", return_value=mock_membership_filter1)
         mocker.patch("Access.group_helper.isAllowedGroupAdminFunctions", return_value = False)
-    
+
     elif test_name == test_get_user_group_can_access_group:
         request.user.user.email = "member1@email.com"
         request.user.is_superuser = True
@@ -309,7 +309,7 @@ def test_get_user_group(mocker, test_name, group_name, expected_output):
         mocker.patch("Access.group_helper.isAllowedGroupAdminFunctions", return_value = True)
 
         mock_membership_only_filter = mocker.MagicMock()
-        
+
         def mock_get_users_from_groupmembers(groupMembers):
             return "user1"
 
@@ -319,10 +319,10 @@ def mock_get_users_from_groupmembers(groupMembers):
 
         mock_group_member = mocker.MagicMock()
         mock_group_member.filter.return_value = [mock_member]
-        mock_membership_only_filter.only.return_value = mock_group_member        
+        mock_membership_only_filter.only.return_value = mock_group_member
         mock_membership_filter1.filter.return_value = mock_membership_only_filter
 
-        
+
     context = group_helper.get_user_group(request, group_name)
     assert str(context) == expected_output
 
@@ -353,7 +353,7 @@ def mock_get_users_from_groupmembers(groupMembers):
             test_add_user_to_group_doesnot_need_approval,
             "groupName=TestGroupName&selectedUserList=member2@member2.com&memberReason=somereason",
             "is now being processed', 'desc': 'A email will be sent after the requested access are granted'}}",
-        ),    
+        ),
 ]
 )
 def test_add_user_to_group(mocker, test_name, post_data, expected_output):
@@ -414,7 +414,7 @@ def test_add_user_to_group(mocker, test_name, post_data, expected_output):
         request.POST = QueryDict(post_data)
         request.user.email = "member1@member1.com"
         request.user.is_superuser = True
-        
+
 
         mock_member = mocker.MagicMock()
         mock_member.user.email = "member2@member2.com"
@@ -487,7 +487,7 @@ def test_add_user_to_group(mocker, test_name, post_data, expected_output):
         mock_thread.start.return_value = True
 
         mocker.patch("threading.Thread", return_value = mock_thread)
-    
+
 
     context = group_helper.add_user_to_group(request)
     assert expected_output in str(context)

Access/views.py

@@ -82,7 +82,7 @@ def groupAccessList(request, groupName):
     context = group_helper.getGroupAccessList(request, groupName)
     if context['error']:
         return render(request,"BSOps/accessStatus.html",context)
-        
+
     return render(request,"BSOps/groupAccessList.html",context)
 
 

BrowserStackAutomation/urls.py

@@ -30,7 +30,7 @@
     groupRequestAccess,
     groupAccessList,
     approveNewGroup,
-    add_user_to_group,  
+    add_user_to_group,
 )
 
 urlpatterns = [
@@ -50,7 +50,7 @@
     re_path(r"^access/requestAccess$", requestAccess, name="requestAccess"),
     re_path(r"^group/requestAccess$", groupRequestAccess, name="groupRequestAccess"),
     re_path(r'^group/access/list/(?P<groupName>[\w -]+)$', groupAccessList, name='groupAccessList'),
-    re_path(r'^group/new/accept/(?P<requestId>.*)$', approveNewGroup, name="approveNewGroup"),    
+    re_path(r'^group/new/accept/(?P<requestId>.*)$', approveNewGroup, name="approveNewGroup"),
     re_path(r'^group/adduser/(?P<groupName>[\w -]+)$', add_user_to_group, name='addUserToGroup'),
 
 ]

bootprocess/admin.py

@@ -5,4 +5,4 @@
 admin.site.register(Permission)
 admin.site.register(UserAccessMapping)
 admin.site.register(Role)
-admin.site.register(AccessV2)
+admin.site.register(AccessV2)

bootprocess/views_helper.py

@@ -16,7 +16,7 @@
 
 def getDashboardData(request):
     user = access_user.objects.get(user__username=request.user)
-    
+
     # Add users to DEFAULT_ACCESS_GROUP if the user is not already on the group
     user_membership = str(
         MembershipV2.objects.filter(user=user).filter(status="Approved")