Delete participant and host feature

apps/hosts/utils.py

@@ -3,6 +3,8 @@
 
 from .models import ChallengeHost, ChallengeHostTeam
 
+get_challenge_host_team_model = get_model_object(ChallengeHostTeam)
+
 
 def get_challenge_host_teams_for_user(user):
     """Returns challenge host team ids for a particular user"""
@@ -26,6 +28,3 @@ def is_user_part_of_host_team(user, host_team):
     return ChallengeHost.objects.filter(
         user=user, team_name=host_team
     ).exists()
-
-
-get_challenge_host_team_model = get_model_object(ChallengeHostTeam)

apps/hosts/views.py

@@ -15,6 +15,7 @@
 
 from accounts.permissions import HasVerifiedEmail
 from base.utils import get_model_object, team_paginated_queryset
+from hosts.utils import get_challenge_host_team_model
 from .filters import HostTeamsFilter
 from .models import ChallengeHost, ChallengeHostTeam
 from .serializers import (
@@ -161,14 +162,7 @@ def challenge_host_list(request, challenge_host_team_pk):
 @permission_classes((permissions.IsAuthenticated, HasVerifiedEmail))
 @authentication_classes((ExpiringTokenAuthentication,))
 def challenge_host_detail(request, challenge_host_team_pk, pk):
-    try:
-        challenge_host_team = ChallengeHostTeam.objects.get(
-            pk=challenge_host_team_pk
-        )
-    except ChallengeHostTeam.DoesNotExist:
-        response_data = {"error": "ChallengeHostTeam does not exist"}
-        return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
-
+    challenge_host_team = get_challenge_host_team_model(challenge_host_team_pk)
     challenge_host = get_challenge_host_model(pk)
 
     if request.method == "GET":
@@ -201,13 +195,24 @@ def challenge_host_detail(request, challenge_host_team_pk, pk):
             response_data = serializer.data
             return Response(response_data, status=status.HTTP_200_OK)
         else:
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     elif request.method == "DELETE":
-        challenge_host.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        if challenge_host_team.created_by == request.user:
+
+            if (challenge_host.user == request.user):  # when the user tries to remove himself
+                response_data = {
+                    "error": "You are not allowed to remove yourself since you are the team admin. Please delete the team if you want to do so!"
+                }
+                return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
+            else:
+                challenge_host.delete()
+                return Response(status=status.HTTP_204_NO_CONTENT)
+        else:
+            response_data = {
+                "error": "Sorry, you do not have permissions to remove this challenge host"
+            }
+            return Response(response_data, status=status.HTTP_401_UNAUTHORIZED)
 
 
 @api_view(["POST"])

apps/participants/serializers.py

@@ -69,7 +69,7 @@ class ParticipantSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Participant
-        fields = ("member_name", "status", "member_id")
+        fields = ("member_name", "status", "member_id", "id")
 
     def get_member_name(self, obj):
         return obj.user.username

apps/participants/views.py

@@ -304,7 +304,7 @@ def delete_participant_from_team(request, participant_team_pk, participant_pk):
         ):  # when the user tries to remove himself
             response_data = {
                 "error": "You are not allowed to remove yourself since you are admin. Please delete the team if you want to do so!"
-            }  # noqa: ignore=E501
+            }
             return Response(
                 response_data, status=status.HTTP_406_NOT_ACCEPTABLE
             )

frontend/src/js/controllers/challengeHostTeamsCtrl.js

@@ -369,6 +369,82 @@
             }, function() {});
         };
 
+        // Delete a particular host
+        vm.confirmMemberDelete = function (ev, hostTeamId, hostId) {
+            ev.stopPropagation();
+            // Appending dialog to document.body to cover sidenav in docs app
+            var confirm = $mdDialog.confirm()
+                .title('Would you like to remove this member?')
+                .textContent('Note: This action will remove the member from team.')
+                .ariaLabel('Lucky day')
+                .targetEvent(ev)
+                .ok('Yes')
+                .cancel("No");
+
+            $mdDialog.show(confirm).then(function () {
+                vm.startLoader();
+                var parameters = {};
+                parameters.url = 'hosts/challenge_host_team/' + hostTeamId + '/challenge_host/' + hostId;
+                parameters.method = 'DELETE';
+                parameters.data = {};
+                parameters.token = userKey;
+                parameters.callback = {
+                    onSuccess: function () {
+                        vm.team.error = false;
+                        $rootScope.notify("info", "Member removed successfully");
+                        var parameters = {};
+                        parameters.url = 'hosts/challenge_host_team';
+                        parameters.method = 'GET';
+                        parameters.token = userKey;
+                        parameters.callback = {
+                            onSuccess: function (response) {
+                                var status = response.status;
+                                var details = response.data;
+                                if (status == 200) {
+                                    vm.existTeam = details;
+
+                                    // condition for pagination
+                                    if (vm.existTeam.next === null) {
+                                        vm.isNext = 'disabled';
+                                        vm.currentPage = vm.existTeam.count / 10;
+                                    } else {
+                                        vm.isNext = '';
+                                        vm.currentPage = parseInt(vm.existTeam.next.split('page=')[1] - 1);
+                                    }
+
+                                    if (vm.existTeam.previous === null) {
+                                        vm.isPrev = 'disabled';
+                                    } else {
+                                        vm.isPrev = '';
+                                    }
+
+                                    if (vm.existTeam.count === 0) {
+                                        vm.showPagination = false;
+                                        vm.paginationMsg = "No team exists for now. Start by creating a new team!";
+                                    } else {
+                                        vm.showPagination = true;
+                                        vm.paginationMsg = "";
+                                    }
+                                }
+
+                                vm.stopLoader();
+                            }
+                        };
+                        utilities.sendRequest(parameters);
+                    },
+                    onError: function (response) {
+                        var error = response.data['error'];
+                        vm.stopLoader();
+                        $rootScope.notify("error", error);
+                    }
+                };
+
+                utilities.sendRequest(parameters);
+
+            }, function () {
+            });
+        };
+
         vm.inviteOthers = function(ev, hostTeamId) {
             ev.stopPropagation();
             // Appending dialog to document.body 

frontend/src/js/controllers/teamsCtrl.js

@@ -244,6 +244,7 @@
 
         };
 
+        // Delete participant along with members
         vm.confirmDelete = function(ev, participantTeamId) {
             ev.stopPropagation();
             // Appending dialog to document.body to cover sidenav in docs app
@@ -324,6 +325,84 @@
             });
         };
 
+        // Delete only a particular member
+        vm.confirmMemberDelete = function (ev, participantTeamId, participantId) {
+            ev.stopPropagation();
+            // Appending dialog to document.body to cover sidenav in docs app
+            var confirm = $mdDialog.confirm()
+                .title('Would you like to remove this member?')
+                .textContent('Note: This action will remove the member from team.')
+                .ariaLabel('Lucky day')
+                .targetEvent(ev)
+                .ok('Yes')
+                .cancel("No");
+
+            $mdDialog.show(confirm).then(function () {
+                vm.startLoader();
+                var parameters = {};
+                parameters.url = 'participants/participant_team/' + participantTeamId + '/participant/' + participantId;
+                parameters.method = 'DELETE';
+                parameters.data = {};
+                parameters.token = userKey;
+                parameters.callback = {
+                    onSuccess: function () {
+
+                        vm.team.error = false;
+                        $rootScope.notify("info", "Member removed successfully");
+
+                        var parameters = {};
+                        parameters.url = 'participants/participant_team';
+                        parameters.method = 'GET';
+                        parameters.token = userKey;
+                        parameters.callback = {
+                            onSuccess: function (response) {
+                                var status = response.status;
+                                var details = response.data;
+                                if (status == 200) {
+                                    vm.existTeam = details;
+
+                                    // condition for pagination
+                                    if (vm.existTeam.next === null) {
+                                        vm.isNext = 'disabled';
+                                        vm.currentPage = vm.existTeam.count / 10;
+                                    } else {
+                                        vm.isNext = '';
+                                        vm.currentPage = parseInt(vm.existTeam.next.split('page=')[1] - 1);
+                                    }
+
+                                    if (vm.existTeam.previous === null) {
+                                        vm.isPrev = 'disabled';
+                                    } else {
+                                        vm.isPrev = '';
+                                    }
+
+                                    if (vm.existTeam.count === 0) {
+                                        vm.showPagination = false;
+                                        vm.paginationMsg = "No team exists for now. Start by creating a new team!";
+                                    } else {
+                                        vm.showPagination = true;
+                                        vm.paginationMsg = "";
+                                    }
+                                }
+
+                                vm.stopLoader();
+                            }
+                        };
+                        utilities.sendRequest(parameters);
+                    },
+                    onError: function (response) {
+                        var error = response.data['error'];
+                        vm.stopLoader();
+                        $rootScope.notify("error", error);
+                    }
+                };
+
+                utilities.sendRequest(parameters);
+
+            }, function () {
+            });
+        };
+    // End of delete member
 
         vm.inviteOthers = function(ev, participantTeamId) {
             ev.stopPropagation();

frontend/src/views/web/challenge-host-teams.html

@@ -33,7 +33,9 @@
                             </div>
                             <div class="collapsible-body">
                                 <h6><b>Team Members:</b></h6>
-                                <p ng-repeat="member in value.members">{{member.user}}</p>
+                                <p ng-repeat="member in value.members">{{member.user}}
+                                    <a class="show-member-title pointer" ng-if="value.created_by == web.name" ng-click="challengeHostTeams.confirmMemberDelete($event, value.id, member.id)"><i class="fa fa-trash list-icon text-highlight w-300 right"></i></a>
+                                </p>
                             </div>
                         </li>
                     </ul>

frontend/src/views/web/teams.html

@@ -31,7 +31,9 @@
                             </div>
                             <div class="collapsible-body">
                                 <h6><b>Team Members:</b></h6>
-                                <p ng-repeat="member in value.members">{{member.member_name}}</p>
+                                <p ng-repeat="member in value.members">{{member.member_name}}  
+                                    <a class="show-member-title pointer" ng-if="value.created_by == web.name" ng-click="teams.confirmMemberDelete($event, value.id, member.id)"><i class="fa fa-trash list-icon text-highlight w-300 right"></i></a>
+                                </p>
                             </div>
                         </li>
                     </ul>

frontend/tests/controllers-test/challengeHostTeamsCtrl.test.js

@@ -429,6 +429,31 @@ describe('Unit tests for challenge host team controller', function () {
         });
     });
 
+    describe('Unit tests for confirmMemberDelete function', function () {
+        beforeEach(function () {
+            spyOn($mdDialog, 'show').and.callFake(function () {
+                var deferred = $injector.get('$q').defer();
+                return deferred.promise;
+            });
+        });
+
+        it('open dialog to confirm delete', function () {
+            var hostTeamId = 1;
+            var hostId = 1;
+            var ev = new Event('$click');
+            var confirm = $mdDialog.confirm()
+                .title('Would you like to remove this member?')
+                .textContent('Note: This action will remove the member from team.')
+                .ariaLabel('Lucky day')
+                .targetEvent(ev)
+                .ok('Yes')
+                .cancel("No");
+            vm.confirmMemberDelete(ev, hostTeamId, hostId);
+            expect($mdDialog.show).toHaveBeenCalledWith(confirm);
+        });
+    });
+
+
     describe('Unit tests for inviteOthers function', function () {
          beforeEach(function () {
             spyOn($mdDialog, 'show').and.callFake(function () {

frontend/tests/controllers-test/teamsCtrl.test.js

@@ -327,6 +327,31 @@ describe('Unit tests for teams controller', function () {
         });
     });
 
+    describe('Unit tests for confirmMemberDelete function', function () {
+        beforeEach(function () {
+            spyOn($mdDialog, 'show').and.callFake(function () {
+                var deferred = $injector.get('$q').defer();
+                return deferred.promise;
+            });
+        });
+
+        it('open dialog to confirm delete', function () {
+            var participantTeamId = 1;
+            var participantId = 1;
+            var ev = new Event('$click');
+            var confirm = $mdDialog.confirm()
+                .title('Would you like to remove this member?')
+                .textContent('Note: This action will remove the member from team.')
+                .ariaLabel('Lucky day')
+                .targetEvent(ev)
+                .ok('Yes')
+                .cancel("No");
+            vm.confirmMemberDelete(ev, participantTeamId, participantId);
+            expect($mdDialog.show).toHaveBeenCalledWith(confirm);
+        });
+    });
+
+
     describe('Unit tests for inviteOthers function', function () {
         beforeEach(function () {
             spyOn($mdDialog, 'show').and.callFake(function () {