fix: fixes group flow

Author: sumedha-bhatt

Access/accessrequest_helper.py

@@ -225,7 +225,7 @@ def get_decline_access_request(request, access_type, request_id):
                     UserAccessMapping.get_pending_access_mapping(request_id=value)
                 )
                 request_ids.extend(current_ids)
-            access_type = access_type.rsplit("-", 1)[0]
+            access_type = "moduleAccess"
         elif access_type == "clubGroupAccess":
             for value in [request_id]:  # ready for bulk decline
                 return_ids.append(value)
@@ -239,6 +239,7 @@ def get_decline_access_request(request, access_type, request_id):
             access_type = "groupAccess"
         else:
             request_ids = [request_id]
+
         for current_request_id in request_ids:
             if access_type == "groupAccess":
                 response = decline_group_access(request, current_request_id, reason)
@@ -300,7 +301,7 @@ def process_individual_requests(
     if len(individual_pending_requests):
         clubbed_requests = {}
         for accessrequest in individual_pending_requests:
-            club_id = accessrequest["requestId"].rsplit("_", 1)[0]
+            club_id = accessrequest["requestId"].rsplit("_")[0]
             if club_id not in clubbed_requests:
                 clubbed_requests[club_id] = {
                     "club_id": club_id,
@@ -329,7 +330,7 @@ def process_group_requests(group_pending_requests, group_requests):
             club_id = (
                 accessrequest["groupName"]
                 + "-"
-                + accessrequest["requestId"].rsplit("-", 1)[-1].rsplit("_", 1)[0]
+                + accessrequest["requestId"].rsplit("-", 1)[-1].rsplit("_")[0]
             )
             needs_access_approve = GroupV2.objects.get(
                 name=accessrequest["groupName"], status="Approved"
@@ -556,7 +557,6 @@ def validate_access_labels(access_labels_json, access_tag):
 
 def _get_approver_permissions(access_tag, access_label=None):
     json_response = {}
-
     access_module = helper.get_available_access_module_from_tag(access_tag)
     approver_permissions = []
     approver_permissions = access_module.fetch_approver_permissions(access_label)
@@ -588,9 +588,9 @@ def accept_user_access_requests(auth_user, request_id):
         )
         return json_response
 
-    requester = access_mapping.user_identity.user.email
-    if auth_user.username == requester:
-        json_response["error"] = USER_REQUEST_PERMISSION_DENIED_ERR_MSG
+    requester = access_mapping.user_identity.user
+    if auth_user.user == requester:
+        json_response["error"] = SELF_APPROVAL_ERROR_MSG
         return json_response
 
     access_label = access_mapping.access.access_label
@@ -686,6 +686,7 @@ def decline_individual_access(request, access_type, request_id, reason):
         decline_new_group = True
     else:
         access_mapping = UserAccessMapping.get_access_request(request_id)
+        access_type = access_mapping.access.access_tag
 
     if not is_request_valid(request_id, access_mapping):
         json_response["error"] = USER_REQUEST_IN_PROCESS_ERR_MSG.format(
@@ -838,7 +839,7 @@ def decline_group_access(request, request_id, reason):
     access_type = group_mapping.access.access_tag
 
     json_response = validate_approver_permissions(
-        group_mapping, access_type, request, request_id
+        group_mapping, access_type, request
     )
     if "error" in json_response:
         return json_response

Access/background_task_manager.py

@@ -60,15 +60,15 @@ def run_access_grant(request_id):
     user_access_mapping = UserAccessMapping.get_access_request(request_id=request_id)
     access_tag = user_access_mapping.access.access_tag
     user = user_access_mapping.user_identity.user
-    approver = user_access_mapping.approver_1.user.username
+    approver = user_access_mapping.approver_1.user
     message = ""
     if not user_access_mapping.user_identity.user.is_active():
         user_access_mapping.decline_access(decline_reason="User is not active")
         logger.debug(
             {
                 "requestId": request_id,
                 "status": "Declined",
-                "by": approver,
+                "by": approver.username,
                 "response": message,
             }
         )

Access/group_helper.py

@@ -490,10 +490,11 @@ def add_user_to_group(request):
             }
 
         else:
+            membership = MembershipV2.get_membership(membership_id=membership_id)
             notifications.send_mulitple_membership_accepted_notification(
                 users_added,
                 data["groupName"][0],
-                data["memberReason"][0],
+                membership,
             )
             if len(selected_users) - len(users_added) == 0:
                 context = {}
@@ -672,7 +673,7 @@ def save_group_access_request(form_data, auth_user):
         )
 
         request_id = (
-            auth_user.username
+            group.name
             + "-"
             + access_tag
             + "-"

Access/models.py

@@ -877,7 +877,7 @@ def decline_access(self, decline_reason=None):
     def approve_access(self):
         self.status = "Approved"
         self.save()
-    
+
     @staticmethod
     def get_by_id(request_id):
         return UserAccessMapping.objects.get(request_id=request_id)
@@ -1076,6 +1076,9 @@ def update_access_status(self, current_status):
     def is_self_approval(self, approver):
         return self.requested_by == approver
 
+    def is_already_processed(self):
+        return self.status in ['Declined','Approved','Processing','Revoked']
+
 
 class AccessV2(models.Model):
     access_tag = models.CharField(max_length=255)

Access/notifications.py

@@ -70,31 +70,17 @@ def send_membership_accepted_notification(user, group, membership):
     destination.append(user.email)
     general.emailSES(destination, subject, body)
 
-def send_mulitple_membership_accepted_notification(user_names, group, membership):
-    subject = MEMBERSHIP_ACCEPTED_SUBJECT.format(user_names, group.name)
+def send_mulitple_membership_accepted_notification(user_names, group_name, membership):
+    subject = MEMBERSHIP_ACCEPTED_SUBJECT.format(user_names, group_name)
     body = helpers.generateStringFromTemplate(
         filename="membershipAcceptedEmailBody.html",
         user_name= ",".join(user_names),
-        group_name=group.name,
-        approver=membership.approver.name,
-    )
-    destination = []
-    destination.append(membership.requested_by.email)
-    destination = destination + user_names
-    general.emailSES(destination, subject, body)
-
-
-def send_mulitple_membership_accepted_notification(user_names, group, membership):
-    subject = MEMBERSHIP_ACCEPTED_SUBJECT.format(user_names, group.name)
-    body = helpers.generateStringFromTemplate(
-        filename="membershipAcceptedEmailBody.html",
-        user_name=",".join(user_names),
-        group_name=group.name,
+        group_name=group_name,
         approver=membership.approver.name,
     )
     destination = []
     destination.append(membership.requested_by.email)
-    destination = destination + user_names
+    destination.append(user_names)
     general.emailSES(destination, subject, body)
 
 
@@ -176,7 +162,7 @@ def send_mail_for_request_decline(
 
 def send_mail_for_request_granted_failure(user, approver, access_type, request_id):
     destination = [user.email]
-    destination.extend(approver.email)
+    destination.append(approver.email)
     subject = USER_ACCESS_REQUEST_GRANT_FAILURE_SUBJECT.format(
         str(user.email), access_type.upper(), request_id
     )

Access/views.py

@@ -351,10 +351,9 @@ def accept_bulk(request, selector):
         input_vals = request.GET.getlist("requestId")
         user = request.user.user
         is_access_approver = user.has_permission("ACCESS_APPROVE")
-        request_ids, return_ids = _get_request_ids_for_bulk_processing(
+        request_ids, return_ids, selector = _get_request_ids_for_bulk_processing(
             input_vals, selector
         )
-
         for value in request_ids:
             request_id = value
             if selector == "groupNew" and is_access_approver:
@@ -367,7 +366,7 @@ def accept_bulk(request, selector):
                 )
             elif selector == "groupAccess":
                 json_response = accept_group_access(request.user, request_id)
-            elif selector.endswith("-club"):
+            elif selector == "moduleAccess":
                 json_response = accept_user_access_requests(request.user, request_id)
             else:
                 raise ValidationError("Invalid request")
@@ -403,6 +402,7 @@ def _get_request_ids_for_bulk_processing(posted_request_ids, selector):
                 UserAccessMapping.get_pending_access_mapping(request_id=value)
             )
             access_request_ids.extend(current_ids)
+        selector = "moduleAccess"
     elif selector == "clubGroupAccess":
         for value in input_vals:
             return_ids.append(value)
@@ -416,7 +416,7 @@ def _get_request_ids_for_bulk_processing(posted_request_ids, selector):
         selector = "groupAccess"
     else:
         access_request_ids = input_vals
-    return access_request_ids, return_ids
+    return access_request_ids, return_ids, selector
 
 
 @login_required
@@ -626,7 +626,7 @@ def individual_resolve(request):
         request_ids = request.GET.getlist('requestId')
         if not request_ids:
             raise Exception("Request id not found in the request")
-        
+
         for request_id in request_ids:
             user_access_mapping = UserAccessMapping.get_by_id(request_id)
             if user_access_mapping.status.lower() in ["grantfailed", "approved"]:
@@ -639,4 +639,3 @@ def individual_resolve(request):
         logger.exception(str(e))
         json_response['error'] = {'error_msg': "Bad request", 'msg': "Error in request not found OR Invalid request type"}
         return render(request,'BSOps/accessStatus.html',json_response)
-    

templates/BSOps/group_access_list_tabs/users_list_tab.html

@@ -74,7 +74,7 @@
   });
 
 function userRemoveConfirm(membership_id){
-  $("#remove-details").html("<h4>Confirm User removal "+ membership_id +"</h4>")
+  $("#remove-details").html("<h4>Confirm removal of user "+ membership_id +"</h4>")
   button_elem = document.getElementsByName("final-remove-button")[0]
   button_elem.id = membership_id
 }
@@ -91,7 +91,7 @@ <h4 class="modal-title"></h4>
       <!-- Modal body -->
       <div class="modal-body generic-access-modal-body">
         <div id="remove-details"></div><br>
-        <button class="btn btn-danger user-remove-button" name="final-remove-button" id="">Confirm Offboarding</button></a>
+        <button class="btn btn-danger user-remove-button" name="final-remove-button" id="">Confirm</button></a>
       </div>
     </div>
   </div>

templates/BSOps/pendingRequests.html

@@ -366,98 +366,6 @@ <h2 id="declineHeading"></h2>
 
 <div class="wrapper">
     <div class="panel-group" id="pending-accordion">
-        {% if repoRequest|length %}
-        <div class="panel panel-default">
-            <div class="panel-heading page-header">
-                <div class="container-fluid">
-                    <h2 class="h5 no-margin-bottom"><a data-toggle="collapse" href="#collapse11"
-                            data-parent="#pending-accordion">Github Repo Creation Pending : </a>
-                        <span class="h6 badge badge-light">{{ repoRequest|length }}</span>
-
-                    </h2>
-                </div>
-            </div>
-            <div id="collapse11" class="panel-collapse collapse">
-                <div class="panel-body">
-                    {% if repoRequest %}
-                    <div class="page-header bulkHeader mx-4">
-                        <div class="row">
-                            <div class="checkbox col-1">
-                                <label>
-                                    <!-- checkbox classes should also contain this value -->
-                                    <input class="bulkAcceptAll-checkbox" value="github" type="checkbox">
-                                    <span class="cr"><i class="cr-icon fa fa-check"></i></span>
-                                </label>
-                            </div>
-                            <div class="col-9">
-                                <h2 class="h4">Bulk Operation</h2>
-                            </div>
-                            <div class="col-2 pl-5">
-                                <!-- checkbox classes should also contain this id -->
-                                <button class="card-link btn btn-primary bulkAccept-button" id="github">Bulk
-                                    Accept</button>
-                            </div>
-                        </div>
-                    </div>
-                    {% endif %}
-
-
-                    {% for request in repoRequest %}
-                    <div class="row">
-                        <div class="card col-xs-12 col-md-12">
-                            <div class="card-body" style="color:white;">
-                                <div class="row">
-                                    <div class="checkbox col-1 pl-1">
-                                        <label id="{{ request.requestId }}-checkbox">
-                                            <input class="github" type="checkbox" value="{{ request.requestId }}">
-                                            <span class="cr"><i class="cr-icon fa fa-check"></i></span>
-                                        </label>
-                                    </div>
-                                    <div class="col-8">
-                                        <div class="row">
-                                            <div class="col-6">
-                                                <h4 class="card-title">{{request.requestId}}</h4>
-                                                <p>Requested By: {{request.requester}}</p>
-                                                <p>Requested On: {{ request.requested_on }} UTC</p>
-                                                <br>
-                                            </div>
-                                            <div class="col-6">
-                                                <p class="text-success">Github Repo Details</p>
-                                                <p>Git user name: {{request.requestInfo.gitusername}}</p>
-                                                <p>Repo Name: {{request.requestInfo.githubRepoName}}</p>
-                                                <p>Repo Description: {{request.requestInfo.githubRepoDesc}}</p>
-                                                <p>Repo type: {{request.requestInfo.githubRepoType}}</p>
-                                                <p>Master Branch Protection:
-                                                    {{request.requestInfo.masterBranchProtection}}</p>
-                                                <p>README enabled: {{request.requestInfo.readmeEnabled}}</p>
-                                                <p>Deny Default Access: {{request.requestInfo.denyDefaultAccess}}</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-3">
-                                        <div class="row float-right" id="{{ request.requestId }}-action">
-                                            <button class="card-link btn btn-primary accept-button" id="github"
-                                                value="{{request.requestId}}">Accept</button>
-                                            <button class="card-link btn btn-danger decline-button"
-                                                id="github/{{request.requestId}}"
-                                                value="{{request.requestId}}">Decline</button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    {% endfor %}
-                    {% if not repoRequest %}
-                    <div class="page-header mx-3">
-                        <p>None pending</p>
-                    </div>
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-        {% endif %}
-
         <!-- group stuff start -->
         {% if newGroupPending|length %}
         <div class="panel panel-default">
@@ -709,8 +617,8 @@ <h4 class="card-title">{{group.group_club_id}}</h4>
                                             <h6 class="text-warning">Approving EKS access also creates aws account for
                                                 the user if it does not exists.</h6>
                                             {% endif %}
-                                            <p><b style="color: yellow;">{{ eachAccessDetails.accessType }} - </b> {{
-                                                eachAccessDetails.accessCategory }}</p>
+                                            <p><b style="color: yellow;">{{ eachAccessDetails.accessType }} - </b>
+                                                {{ eachAccessDetails.accessCategory }}</p>
                                             {% if eachAccessDetails.accessMeta %}
                                             <p>
                                             <table class="table" style="color: white;">
@@ -846,10 +754,10 @@ <h5>Accesses</h5>
                                             <div id="{{ accessData.requestId }}-action">
                                                 {% if eachRequest.accessData|length > 1 %}
                                                 <button class="card-link btn btn-primary accept-button"
-                                                    id="{{ eachRequest.access_tag }}"
+                                                    id="moduleAccess"
                                                     value="{{ accessData.requestId }}">Accept</button>
                                                 <button class="card-link btn btn-danger decline-button"
-                                                    id="{{ eachRequest.access_tag }}/{{ accessData.requestId }}"
+                                                    id="moduleAccess/{{ accessData.requestId }}"
                                                     value="{{ accessData.requestId }}">Decline</button>
                                                 {% endif %}
                                             </div>