Remove a user from a consultation

consultation_analyser/consultations/api/views/consultation.py

@@ -290,7 +290,7 @@ def get_consultation_folders(self, request) -> Response:
         detail=True,
         methods=["post"],
         url_path="add-users",
-        permission_classes=[HasDashboardAccess],
+        permission_classes=[IsAdminUser],
     )
     def add_users(self, request, pk=None) -> Response:
         """
@@ -329,3 +329,53 @@ def add_users(self, request, pk=None) -> Response:
             {"message": f"Successfully added {found_user_count} users to consultation"},
             status=status.HTTP_201_CREATED,
         )
+
+    @action(
+        detail=True,
+        methods=["delete"],
+        url_path="users/(?P<user_id>[^/.]+)",
+        url_name="remove-user",
+        permission_classes=[IsAdminUser],
+    )
+    def remove_user(self, request, pk=None, user_id=None) -> Response:
+        """
+        Remove a user from this consultation
+        URL: /api/consultations/{consultation_id}/users/{user_id}/
+        """
+        try:
+            consultation = self.get_object()
+        except Http404:
+            return Response({"error": "Consultation not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        if not user_id:
+            return Response(
+                {"error": "User ID is required"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Validate user_id is numeric as we have to rely on regex checks
+        try:
+            user_id_int = int(user_id)
+        except (ValueError, TypeError):
+            return Response(
+                {"error": "Invalid user ID provided"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        try:
+            user = User.objects.get(pk=user_id_int)
+        except User.DoesNotExist:
+            return Response(
+                {"error": "User not found"}, status=status.HTTP_404_NOT_FOUND
+            )
+
+        if not consultation.users.filter(id=user.id).exists():
+            return Response(
+                {"error": "User is not assigned to this consultation"},
+                status=status.HTTP_404_NOT_FOUND
+            )
+
+        consultation.users.remove(user)
+
+        return Response(
+            {"message": f"Successfully removed user {user.email} from consultation"},
+            status=status.HTTP_200_OK,
+        )

frontend/src/components/screens/AddUserToConsultationForm.svelte

@@ -3,7 +3,10 @@
 
   import { slide } from "svelte/transition";
 
-  import { getApiAddUserToConsultation, Routes } from "../../global/routes";
+  import {
+    getApiAddUserToConsultation,
+    getSupportConsultationDetails,
+  } from "../../global/routes";
 
   import type { User } from "../../global/types";
   import Button from "../inputs/Button/Button.svelte";
@@ -29,7 +32,6 @@
 
   const handleSubmit = async () => {
     errors = {};
-    console.log(selectedUsers);
 
     if (selectedUsers.length == 0) {
       errors["general"] = "Please select a user to add";
@@ -57,7 +59,7 @@
 
         errors = {};
         selectedUsers = [];
-        window.location.href = `${Routes.SupportConsultations}/${consultationId}`;
+        window.location.href = getSupportConsultationDetails(consultationId);
       } catch (err: unknown) {
         errors["general"] =
           err instanceof Error ? err.message : "An unknown error occurred";

frontend/src/components/screens/AddUserToConsultationForm.test.ts

@@ -0,0 +1,127 @@
+import { describe, expect, it, vi, afterEach } from "vitest";
+import { render, screen, fireEvent } from "@testing-library/svelte";
+import AddUserToConsultationForm from "./AddUserToConsultationForm.svelte";
+import type { User } from "../../global/types";
+
+// Mock fetch
+const mockFetch = vi.fn();
+global.fetch = mockFetch;
+
+describe("AddUserToConsultationForm", () => {
+  const mockUsers: User[] = [
+    {
+      id: 1,
+      email: "[email protected]",
+      is_staff: false,
+      has_dashboard_access: false,
+      created_at: "2023-01-01T00:00:00Z",
+    },
+    {
+      id: 2,
+      email: "[email protected]",
+      is_staff: true,
+      has_dashboard_access: true,
+      created_at: "2023-01-01T00:00:00Z",
+    },
+  ];
+
+  const consultationId = "test-consultation-123";
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should render with users list", () => {
+    render(AddUserToConsultationForm, {
+      users: mockUsers,
+      consultationId,
+    });
+
+    expect(screen.getByText("[email protected]")).toBeTruthy();
+    expect(screen.getByText("[email protected]")).toBeTruthy();
+    expect(screen.getByText("Add user(s)")).toBeTruthy();
+  });
+
+  it("should show error when no users selected", async () => {
+    render(AddUserToConsultationForm, {
+      users: mockUsers,
+      consultationId,
+    });
+
+    const submitButton = screen.getByText("Add user(s)");
+    await fireEvent.click(submitButton);
+
+    expect(screen.getByText("Please select a user to add")).toBeTruthy();
+  });
+
+  it("should submit selected users successfully", async () => {
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      json: () =>
+        Promise.resolve({
+          message: "Successfully added 1 users to consultation",
+        }),
+    });
+
+    // Mock window.location.href
+    Object.defineProperty(window, "location", {
+      value: { href: "" },
+      writable: true,
+    });
+
+    render(AddUserToConsultationForm, {
+      users: mockUsers,
+      consultationId,
+    });
+
+    // Select first user
+    const checkbox = screen.getByLabelText("[email protected]");
+    await fireEvent.click(checkbox);
+
+    // Submit form
+    const submitButton = screen.getByText("Add user(s)");
+    await fireEvent.click(submitButton);
+
+    expect(mockFetch).toHaveBeenCalledWith(
+      `/api/consultations/${consultationId}/add-users/`,
+      expect.objectContaining({
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ user_ids: ["1"] }),
+      }),
+    );
+  });
+
+  it("should handle API errors", async () => {
+    mockFetch.mockResolvedValueOnce({
+      ok: false,
+      status: 400,
+    });
+
+    render(AddUserToConsultationForm, {
+      users: mockUsers,
+      consultationId,
+    });
+
+    // Select first user
+    const checkbox = screen.getByLabelText("[email protected]");
+    await fireEvent.click(checkbox);
+
+    // Submit form
+    const submitButton = screen.getByText("Add user(s)");
+    await fireEvent.click(submitButton);
+
+    expect(screen.getByText("Error: 400")).toBeTruthy();
+  });
+
+  it("should handle empty users list", () => {
+    render(AddUserToConsultationForm, {
+      users: [],
+      consultationId,
+    });
+
+    expect(screen.getByText("Add user(s)")).toBeTruthy();
+    // Should not show any checkboxes
+    expect(screen.queryByRole("checkbox")).toBeNull();
+  });
+});

frontend/src/components/screens/RemoveUserFromConsultationForm.svelte

@@ -0,0 +1,66 @@
+<script lang="ts">
+  import clsx from "clsx";
+
+  import { slide } from "svelte/transition";
+
+  import {
+    getApiRemoveUserFromConsultation,
+    getSupportConsultationDetails,
+  } from "../../global/routes";
+
+  import Button from "../inputs/Button/Button.svelte";
+  import Text from "../Text/Text.svelte";
+  import type { ConsultationResponse, User } from "../../global/types";
+
+  let sending: boolean = false;
+  let errors: Record<string, string> = {};
+
+  export let consultation: ConsultationResponse;
+  export let user: User;
+
+  const handleSubmit = async () => {
+    errors = {};
+    sending = true;
+    try {
+      const response = await fetch(
+        getApiRemoveUserFromConsultation(consultation.id, user.id.toString()),
+        {
+          method: "DELETE",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        },
+      );
+
+      if (!response.ok) {
+        throw new Error(`Error: ${response.status}`);
+      }
+      window.location.href = getSupportConsultationDetails(consultation.id);
+    } catch (err: unknown) {
+      errors["general"] =
+        err instanceof Error ? err.message : "An unknown error occurred";
+    } finally {
+      sending = false;
+    }
+  };
+</script>
+
+<form class={clsx(["flex", "flex-col", "gap-4"])}>
+  {#if "general" in errors}
+    <small class="text-sm text-red-500" transition:slide={{ duration: 300 }}>
+      {errors.general}
+    </small>
+  {/if}
+  <Text
+    >Are you sure you want to remove <strong>{user.email}</strong> from
+    <strong>{consultation.title}</strong>?</Text
+  >
+  <Button
+    type="submit"
+    variant="primary"
+    handleClick={handleSubmit}
+    disabled={sending}
+  >
+    {sending ? "Removing..." : "Yes, remove them"}
+  </Button>
+</form>