feat: add remove team member functionality (#230)

* feat: add remove team member functionality

- Introduced RemoveTeamMemberView to handle the removal of users from teams via a DELETE request.
- Implemented the remove_member_from_team method in TeamService to manage the removal logic and handle exceptions.
- Updated URLs to include the new endpoint for removing team members.
- Added unit tests for the RemoveTeamMemberView to ensure proper functionality and error handling.

This feature enhances team management capabilities by allowing for the dynamic removal of members from teams.

* refactor: clean up imports in team_repository and test files

- Removed unused logging import from team_repository.py to streamline the code.
- Updated test_team.py to remove the import of RemoveTeamMemberView, reflecting its removal from the test scope.

These changes enhance code clarity and maintainability by eliminating unnecessary dependencies.

* refactor: improve code formatting and organization in team-related files

- Added missing commas in import statements and OpenApiParameter definitions for consistency.
- Standardized the use of whitespace in the UserTeamDetailsRepository and TeamService classes to enhance readability.
- Updated test cases to reflect changes in the TeamService import structure.

These adjustments contribute to cleaner code and improved maintainability across the team management functionality.

---------

Co-authored-by: Amit Prakash <[email protected]>

Author: amit-flx

todo/repositories/user_team_details_repository.py

@@ -0,0 +1,31 @@
+from bson import ObjectId
+from todo.repositories.common.mongo_repository import MongoRepository
+
+
+class UserTeamDetailsRepository(MongoRepository):
+    collection_name = "user_team_details"
+
+    @classmethod
+    def remove_member_from_team(cls, user_id: str, team_id: str) -> bool:
+        collection = cls.get_collection()
+        try:
+            user_id_obj = ObjectId(user_id)
+        except Exception:
+            user_id_obj = user_id
+        try:
+            team_id_obj = ObjectId(team_id)
+        except Exception:
+            team_id_obj = team_id
+        queries = [
+            {"user_id": user_id_obj, "team_id": team_id_obj},
+            {"user_id": user_id, "team_id": team_id_obj},
+            {"user_id": user_id_obj, "team_id": team_id},
+            {"user_id": user_id, "team_id": team_id},
+        ]
+        for query in queries:
+            print(f"DEBUG: Trying user_team_details delete query: {query}")
+            result = collection.delete_one(query)
+            print(f"DEBUG: delete_one result: deleted={result.deleted_count}")
+            if result.deleted_count > 0:
+                return True
+        return False

todo/services/team_service.py

@@ -379,3 +379,15 @@ def add_team_members(cls, team_id: str, member_ids: List[str], added_by_user_id:
 
         except Exception as e:
             raise ValueError(f"Failed to add team members: {str(e)}")
+
+    class TeamOrUserNotFound(Exception):
+        pass
+
+    @classmethod
+    def remove_member_from_team(cls, user_id: str, team_id: str):
+        from todo.repositories.user_team_details_repository import UserTeamDetailsRepository
+
+        success = UserTeamDetailsRepository.remove_member_from_team(user_id=user_id, team_id=team_id)
+        if not success:
+            raise cls.TeamOrUserNotFound()
+        return True

todo/tests/unit/views/test_team.py

@@ -134,3 +134,34 @@ def test_join_team_by_invite_code_validation_error(self):
         response = self.view.post(mock_request)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertIn("invite_code", response.data)
+
+
+class RemoveTeamMemberViewTests(TestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.team_id = "507f1f77bcf86cd799439012"
+        self.user_id = "507f1f77bcf86cd799439011"
+        self.url = f"/teams/{self.team_id}/members/{self.user_id}/"
+
+    @patch("todo.views.team.TeamService.remove_member_from_team")
+    def test_remove_member_success(self, mock_remove):
+        mock_remove.return_value = True
+        response = self.client.delete(self.url)
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+        mock_remove.assert_called_once_with(user_id=self.user_id, team_id=self.team_id)
+
+    @patch("todo.views.team.TeamService.remove_member_from_team")
+    def test_remove_member_not_found(self, mock_remove):
+        from todo.services.team_service import TeamService
+
+        mock_remove.side_effect = TeamService.TeamOrUserNotFound()
+        response = self.client.delete(self.url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+        self.assertIn("not found", response.data["detail"])
+
+    @patch("todo.views.team.TeamService.remove_member_from_team")
+    def test_remove_member_generic_error(self, mock_remove):
+        mock_remove.side_effect = Exception("Something went wrong")
+        response = self.client.delete(self.url)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Something went wrong", response.data["detail"])

todo/urls.py

@@ -12,6 +12,7 @@
     AddTeamMembersView,
     TeamInviteCodeView,
     TeamActivityTimelineView,
+    RemoveTeamMemberView,
 )
 from todo.views.watchlist import WatchlistListView, WatchlistDetailView, WatchlistCheckView
 from todo.views.task_assignment import TaskAssignmentView, TaskAssignmentDetailView
@@ -42,3 +43,7 @@
     path("auth/logout", LogoutView.as_view(), name="google_logout"),
     path("users", UsersView.as_view(), name="users"),
 ]
+
+urlpatterns += [
+    path("teams/<str:team_id>/members/<str:user_id>", RemoveTeamMemberView.as_view(), name="remove_team_member"),
+]

todo/views/team.py

@@ -449,3 +449,33 @@ def get(self, request: Request, team_id: str):
                 entry["status_to"] = log.status_to
             timeline.append(entry)
         return Response({"timeline": timeline}, status=status.HTTP_200_OK)
+
+
+class RemoveTeamMemberView(APIView):
+    @extend_schema(
+        summary="Remove a user from a team",
+        description="Removes the specified user from the specified team.",
+        parameters=[
+            OpenApiParameter(name="team_id", type=str, location=OpenApiParameter.PATH, description="ID of the team"),
+            OpenApiParameter(
+                name="user_id", type=str, location=OpenApiParameter.PATH, description="ID of the user to remove"
+            ),
+        ],
+        responses={
+            204: OpenApiResponse(description="User removed from team successfully."),
+            404: OpenApiResponse(description="Team or user not found."),
+            400: OpenApiResponse(description="Bad request or other error."),
+        },
+        tags=["teams"],
+    )
+    def delete(self, request, team_id, user_id):
+        print(f"DEBUG: RemoveTeamMemberView.delete called with team_id={team_id}, user_id={user_id}")
+        from todo.services.team_service import TeamService
+
+        try:
+            TeamService.remove_member_from_team(user_id=user_id, team_id=team_id)
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        except TeamService.TeamOrUserNotFound:
+            return Response({"detail": "Team or user not found."}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            return Response({"detail": str(e)}, status=status.HTTP_400_BAD_REQUEST)