From c0ce1d0a13d9b809b90e6c13fd54bbb151262b1f Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Fri, 27 Sep 2024 14:15:41 +0200
Subject: [PATCH 01/18] feat: Add user story for writeup UI

---
 .../dev-docs/technical-docs/UserStories.md    | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/docs/dev-docs/technical-docs/UserStories.md b/docs/docs/dev-docs/technical-docs/UserStories.md
index a9b727e8..83152633 100644
--- a/docs/docs/dev-docs/technical-docs/UserStories.md
+++ b/docs/docs/dev-docs/technical-docs/UserStories.md
@@ -1,18 +1,19 @@
 # User Stories
 
-Some users of the system will be known as *concerned parties*. These concerned parties have very similar needs, however they may fall into two main categories depending on how a dispute is initiated:
+Some users of the system will be known as _concerned parties_. These concerned parties have very similar needs, however they may fall into two main categories depending on how a dispute is initiated:
+
 - **Complainants:** Users that wish to initiate a dispute process with another user
 - **Respondants:** Users with whom a dispute process has been initiated by a complainant
 
-It is worth noting that *concerned parties* only refer to complainants and respondents, i.e. they do not include the other user types detailed below.
-
+It is worth noting that _concerned parties_ only refer to complainants and respondents, i.e. they do not include the other user types detailed below.
 
 ## Concerned Parties
+
 > As a Concerned party I want to manage my contact details so that I am reachable in the event of a dispute
 
 > As a Concerned party I want to be notified of an update in a dispute I am involved in so that I am well-informed of the status of the dispute.
 
-> As a Concerned Party, I want to be look at an archive of previously resolved cases such that I can clearly see how 
+> As a Concerned Party, I want to be look at an archive of previously resolved cases such that I can clearly see how
 
 > As a Concerned Party, I want to search the archive for disputes related to my case, such that I can get a sense of precedence
 
@@ -22,8 +23,8 @@ It is worth noting that *concerned parties* only refer to complainants and respo
 
 > As a Concerned Party, I want to view the events of previously resolved dispute to get a better sense of the flow of a dispute.
 
-
 ### Complainant
+
 > As a Complainant I want to initiate a dispute so that I can begin resolving the dispute
 
 > As a Complainant I want to upload documents to provide evidence to justify a dispute
@@ -32,8 +33,8 @@ It is worth noting that *concerned parties* only refer to complainants and respo
 
 > As a Complainant I want to upload documents to refute counter-evidence provided by the Respondant so that both parties are in agreement of the evidence at hand
 
-
 ### Respondent
+
 > As a Respondant I want to receive a notification about the dispute so that I can begin resolving the dispute
 
 > As a Respondant I want to upload documents to refute evidence provided by Complainant
@@ -42,8 +43,8 @@ It is worth noting that *concerned parties* only refer to complainants and respo
 
 > As a Respondant I want to be notified when a dispute is submitted against me so that I can provide a response to the complainant.
 
-
 ## Experts/Mediators
+
 > As a Mediator I want to be assigned a dispute so that I can begin mediation
 
 > As a Mediator I want to see the documents provided by the Complainant and Respondant so that I can ensure due course was followed
@@ -54,7 +55,10 @@ It is worth noting that *concerned parties* only refer to complainants and respo
 
 > As a Mediator I want to be able to deny an assignment to a dispute when there is a conflict of interest so that the dispute remains unbiased.
 
+> As an Expert I want to submit a writeup for a dispute so that I can resolve the dispute
+
 ## Organisation Owner
+
 > As an organisation owner I want to create an organisation so that I can manage that organisation
 
 > As an organisation owner I want to specify a set of workflows for my organisation so that all disputes follow due process
@@ -63,10 +67,10 @@ It is worth noting that *concerned parties* only refer to complainants and respo
 
 > As an organisation owner I want to see all ongonig disputes so that I am well informed of them
 
-
 ## Admin
+
 > As an admin I want to see the available mediators at any given point so that I can manage the active mediators
 
 > As an admin I want to manage expert pools so that I can mediators are correctly assigned
 
-> As an admin I want to manage organisations so that I can ensure they are structured correctly
\ No newline at end of file
+> As an admin I want to manage organisations so that I can ensure they are structured correctly

From fb49c7ff7ab3cbbc8e8c8d19c2275172e744e49b Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Fri, 27 Sep 2024 18:04:01 +0200
Subject: [PATCH 02/18] feat: Add workflow title

---
 .../app/(pages)/workflows/designer/page.tsx   |  6 +-
 .../components/workflow/workflow-title.tsx    | 58 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 admin-frontend/src/components/workflow/workflow-title.tsx

diff --git a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
index c5b81398..80f83444 100644
--- a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
+++ b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
@@ -20,6 +20,7 @@ import { type GraphState, type GraphTrigger, type GraphInstance } from "@/lib/ty
 import { graphToWorkflow, workflowToGraph } from "@/lib/api/workflow";
 import { workflowSchema } from "@/lib/schema/workflow";
 import { Textarea } from "@/components/ui/textarea";
+import WorkflowTitle from "@/components/workflow/workflow-title";
 
 const initialNodes: GraphState[] = [
   {
@@ -169,7 +170,10 @@ function InnerProvider() {
   }
 
   return (
-    <div className="h-full grid grid-cols-[1fr_3fr]">
+    <div className="h-full grid grid-cols-[1fr_3fr] grid-rows-[auto_1fr]">
+      <div className="col-span-2 border-b dark:border-primary-500/30 border-primary-500/20">
+        <WorkflowTitle value="New workflow" onValueChange={alert} />
+      </div>
       <div className="p-2 space-y-2 flex flex-col">
         <Textarea
           className="grow resize-none font-mono"
diff --git a/admin-frontend/src/components/workflow/workflow-title.tsx b/admin-frontend/src/components/workflow/workflow-title.tsx
new file mode 100644
index 00000000..3ad109a8
--- /dev/null
+++ b/admin-frontend/src/components/workflow/workflow-title.tsx
@@ -0,0 +1,58 @@
+import { FormEvent, useEffect, useRef, useState } from "react";
+import { Input } from "../ui/input";
+import { cn } from "@/lib/utils";
+
+export default function WorkflowTitle({
+  value,
+  onValueChange = () => {},
+  disabled,
+}: {
+  value: string;
+  onValueChange?: (value: string) => void;
+  disabled?: boolean;
+}) {
+  const [isEditing, setEditing] = useState(false);
+  useEffect(() => {
+    if (disabled) {
+      setEditing(false);
+    }
+  }, [disabled]);
+
+  const inputRef = useRef<HTMLInputElement | null>(null);
+  function onCommit(event: FormEvent<HTMLFormElement> | undefined = undefined) {
+    if (event) {
+      event.preventDefault();
+    }
+
+    setEditing(false);
+    const newValue = inputRef.current!.value.trim();
+    if (newValue.length > 0 && value != newValue) {
+      onValueChange(newValue);
+    }
+  }
+  function onEdit() {
+    if (!disabled) {
+      setEditing(true);
+    }
+  }
+
+  const classes = "p-3 font-bold tracking-wide text-xl";
+
+  return (
+    <form className={cn("p-2", disabled && "opacity-50")} onSubmit={onCommit}>
+      {!isEditing ? (
+        <h2 className={classes} onClick={onEdit} onFocus={onEdit}>
+          {value}
+        </h2>
+      ) : (
+        <Input
+          autoFocus
+          ref={inputRef}
+          onBlur={() => onCommit()}
+          defaultValue={value}
+          className={cn(classes, "w-fit")}
+        />
+      )}
+    </form>
+  );
+}

From 6a5903f0f4272c972ac8fe31108e6264db4a7640 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Fri, 27 Sep 2024 18:10:37 +0200
Subject: [PATCH 03/18] feat: Add save button

---
 admin-frontend/src/app/(pages)/workflows/designer/page.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
index 80f83444..00cc955f 100644
--- a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
+++ b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
@@ -21,6 +21,7 @@ import { graphToWorkflow, workflowToGraph } from "@/lib/api/workflow";
 import { workflowSchema } from "@/lib/schema/workflow";
 import { Textarea } from "@/components/ui/textarea";
 import WorkflowTitle from "@/components/workflow/workflow-title";
+import { SaveIcon } from "lucide-react";
 
 const initialNodes: GraphState[] = [
   {
@@ -171,8 +172,12 @@ function InnerProvider() {
 
   return (
     <div className="h-full grid grid-cols-[1fr_3fr] grid-rows-[auto_1fr]">
-      <div className="col-span-2 border-b dark:border-primary-500/30 border-primary-500/20">
+      <div className="col-span-2 border-b dark:border-primary-500/30 border-primary-500/20 flex items-center gap-2">
         <WorkflowTitle value="New workflow" onValueChange={alert} />
+        <Button variant="ghost" title="Save">
+          <SaveIcon size="1.2rem" />
+        </Button>
+        <span className="opacity-50 text-sm">Unsaved</span>
       </div>
       <div className="p-2 space-y-2 flex flex-col">
         <Textarea

From b961c1732d93cf2ab5d3f91919eecec8ed28aa3a Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Fri, 27 Sep 2024 18:43:51 +0200
Subject: [PATCH 04/18] feat: Add non-null clauses to disputes table

---
 initdb/init.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/initdb/init.sql b/initdb/init.sql
index a296156b..82c89dd5 100644
--- a/initdb/init.sql
+++ b/initdb/init.sql
@@ -91,12 +91,12 @@ CREATE TYPE dispute_status AS ENUM (
 CREATE TABLE disputes (
 	id SERIAL PRIMARY KEY,
 	case_date DATE DEFAULT CURRENT_DATE,
-	workflow BIGINT REFERENCES active_workflows(id),
+	workflow BIGINT REFERENCES active_workflows(id) NOT NULL,
 	status dispute_status DEFAULT 'Awaiting Respondant',
 	title VARCHAR(255) NOT NULL,
-	description TEXT,
-	complainant BIGINT REFERENCES users(id),
-	respondant BIGINT REFERENCES users(id),
+	description TEXT NOT NULL,
+	complainant BIGINT REFERENCES users(id) NOT NULL,
+	respondant BIGINT REFERENCES users(id) NOT NULL,
     date_resolved DATE DEFAULT NULL
 );
 

From 30a4345bf3c4030a8636ebe5d81dea77117fa5e5 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Fri, 27 Sep 2024 18:47:32 +0200
Subject: [PATCH 05/18] fix: Queries not invalidated on status change

---
 admin-frontend/src/app/(pages)/disputes/modal.tsx | 3 +++
 admin-frontend/src/app/(pages)/disputes/page.tsx  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin-frontend/src/app/(pages)/disputes/modal.tsx b/admin-frontend/src/app/(pages)/disputes/modal.tsx
index 0e63f31c..122041b7 100644
--- a/admin-frontend/src/app/(pages)/disputes/modal.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/modal.tsx
@@ -44,6 +44,9 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
         ...old,
         status: variables,
       }));
+      client.invalidateQueries({
+        queryKey: ["disputeTable"],
+      });
       toast({
         title: "Status updated successfully",
       });
diff --git a/admin-frontend/src/app/(pages)/disputes/page.tsx b/admin-frontend/src/app/(pages)/disputes/page.tsx
index 76b6fa70..e91e4b03 100644
--- a/admin-frontend/src/app/(pages)/disputes/page.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/page.tsx
@@ -25,7 +25,7 @@ export default function Disputes({ searchParams }: { searchParams: unknown }) {
     throw new Error(JSON.stringify(searchError));
   }
 
-  const client = new QueryClient();
+  const [client] = useState(new QueryClient());
 
   const [filter, setFilter] = useState<DisputeFilter[]>([]);
   const [page, setPage] = useState<number>(0);

From 73b9f4f41213a61d0e4d050816dad88ebecadf0d Mon Sep 17 00:00:00 2001
From: MichaelHorwitz <michael@horwitz.co.za>
Date: Sat, 28 Sep 2024 12:39:47 +0200
Subject: [PATCH 06/18] feat: edge label and type

---
 admin-frontend/src/app/(pages)/workflows/designer/page.tsx | 4 ----
 admin-frontend/src/lib/api/workflow.ts                     | 6 ++++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
index ba1ce672..fabf0cc4 100644
--- a/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
+++ b/admin-frontend/src/app/(pages)/workflows/designer/page.tsx
@@ -166,8 +166,6 @@ function InnerProvider() {
     setError(undefined);
     const [nodes, edges] = await workflowToGraph(data);
     let idTrack : number = 100
-    console.log("huh")
-
     const dagreGraph = new dagre.graphlib.Graph();
     const nodeWidth = 200
     const nodeHeight = 100
@@ -182,7 +180,6 @@ function InnerProvider() {
     dagre.layout(dagreGraph);
     for (let node of nodes){
       const nodeWithPosition = dagreGraph.node(node.id);
-      console.log(nodeWithPosition.x);
       node.position = {
         x: nodeWithPosition.x,
         y: nodeWithPosition.y,
@@ -195,7 +192,6 @@ function InnerProvider() {
       sourceNode?.data.edges.push({id: currHandleId})
       edge.sourceHandle = currHandleId
     }
-
     reactFlow.setNodes(nodes);
     reactFlow.setEdges(edges);
   }
diff --git a/admin-frontend/src/lib/api/workflow.ts b/admin-frontend/src/lib/api/workflow.ts
index 26d3fc93..51e4dd42 100644
--- a/admin-frontend/src/lib/api/workflow.ts
+++ b/admin-frontend/src/lib/api/workflow.ts
@@ -90,7 +90,7 @@ export async function graphToWorkflow({
               .map((edge) => [
                 edge.id,
                 {
-                  label: "oi blud, do somfin",
+                  label: edge.data ? edge.data.trigger : "default",
                   next_state: edge.target,
                 },
               ])
@@ -114,7 +114,9 @@ export async function workflowToGraph(
       const trigger : GraphTrigger = {
         id: (currId++).toString(),
         source: stateKey,
-        target: event.next_state
+        target: event.next_state,
+        data: {trigger: event.label},
+        type: "custom-edge",
       }
       triggers.push(trigger)
     }

From 49932c90cc52402a70b9d28eb54750ca95e4c414 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 12:48:44 +0200
Subject: [PATCH 07/18] feat: Stub UI for expert list with objections

---
 .../src/app/(pages)/disputes/modal.tsx        | 110 +++++++++++++++++-
 .../src/app/(pages)/disputes/table.tsx        |   4 +-
 .../src/components/admin/status-badge.tsx     |  19 +++
 .../src/components/admin/status-dropdown.tsx  |  69 +++++------
 admin-frontend/src/lib/api/dispute.ts         |   7 +-
 admin-frontend/src/lib/types/dispute.ts       |  12 ++
 6 files changed, 180 insertions(+), 41 deletions(-)

diff --git a/admin-frontend/src/app/(pages)/disputes/modal.tsx b/admin-frontend/src/app/(pages)/disputes/modal.tsx
index 122041b7..8e5e8b43 100644
--- a/admin-frontend/src/app/(pages)/disputes/modal.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/modal.tsx
@@ -3,18 +3,20 @@
 import { Button } from "@/components/ui/button";
 
 import { DialogClose, DialogHeader, DialogTitle } from "@/components/ui/dialog";
-import { X } from "lucide-react";
+import { UserIcon, X } from "lucide-react";
 import Sidebar from "@/components/admin/sidebar";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
-import { StatusBadge, StatusDropdown } from "@/components/admin/status-dropdown";
+import { DisputeStatusBadge, StatusBadge } from "@/components/admin/status-badge";
 import {
   type UserDetails,
   type DisputeDetails,
   DisputeStatus,
   DisputeDetailsResponse,
+  ExpertSummary,
+  ObjectionStatus,
 } from "@/lib/types/dispute";
 import { changeDisputeStatus, getDisputeDetails } from "@/lib/api/dispute";
 import { useToast } from "@/lib/hooks/use-toast";
@@ -28,6 +30,8 @@ import {
 import { Download, EllipsisVertical, FileText, Trash } from "lucide-react";
 import Link from "next/link";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { ObjectionStatusBadge } from "@/components/admin/status-badge";
+import { DisputeStatusDropdown, ObjectionStatusDropdown } from "@/components/admin/status-dropdown";
 
 export default function DisputeDetails({ id: disputeId }: { id: string }) {
   const { toast } = useToast();
@@ -73,13 +77,15 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
             </DialogClose>
           </div>
           <div className="flex gap-2 items-center">
-            <StatusDropdown
+            <DisputeStatusDropdown
               initialValue={data.status}
               onSelect={(val) => status.mutate(val)}
               disabled={status.isPending}
             >
-              <StatusBadge dropdown value={data.status} />
-            </StatusDropdown>
+              <DisputeStatusBadge dropdown variant={data.status}>
+                {data.status}
+              </DisputeStatusBadge>
+            </DisputeStatusDropdown>
             <span>{data.date_filed}</span>
           </div>
 
@@ -124,6 +130,52 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
               </section>
             </CardContent>
           </Card>
+          <Card>
+            <CardHeader>
+              <CardTitle>Experts</CardTitle>
+              <CardDescription>See who is assigned to the case.</CardDescription>
+            </CardHeader>
+            <CardContent>
+              <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
+                <ExpertAssignment id={1} fullname="John doe" status="Approved" />
+              </ul>
+              <CardTitle className="mt-5 text-lg">Objections</CardTitle>
+              <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
+                <Objection
+                  id={0}
+                  ticket_id={0}
+                  expert_name={"Jonny Test"}
+                  user_name={"Finn Human"}
+                  date_submitted={"today"}
+                  status={"Review"}
+                />
+                <Objection
+                  id={0}
+                  ticket_id={0}
+                  expert_name={"Jonny Test"}
+                  user_name={"Finn Human"}
+                  date_submitted={"today"}
+                  status={"Review"}
+                />
+                <Objection
+                  id={0}
+                  ticket_id={0}
+                  expert_name={"Jonny Test"}
+                  user_name={"Finn Human"}
+                  date_submitted={"today"}
+                  status={"Review"}
+                />
+                <Objection
+                  id={0}
+                  ticket_id={0}
+                  expert_name={"Jonny Test"}
+                  user_name={"Finn Human"}
+                  date_submitted={"today"}
+                  status={"Review"}
+                />
+              </ul>
+            </CardContent>
+          </Card>
         </div>
       </Sidebar>
     )
@@ -186,3 +238,51 @@ function Evidence({
     </li>
   );
 }
+
+function ExpertAssignment({ id, fullname, status }: ExpertSummary) {
+  return (
+    <li className="grid grid-cols-[auto_1fr_auto] gap-2 items-center px-3 py-2 border border-primary-500/30 rounded-md">
+      <UserIcon size="1.7rem" />
+      <span className="truncate">{fullname}</span>
+      <StatusBadge variant="success">Gucci</StatusBadge>
+    </li>
+  );
+}
+
+function Objection({
+  id,
+  ticket_id,
+  expert_name,
+  user_name,
+  date_submitted,
+  status,
+}: {
+  id: number;
+  ticket_id: number;
+  expert_name: string;
+  user_name: string;
+  date_submitted: string;
+  status: ObjectionStatus;
+}) {
+  return (
+    <li className="grid grid-cols-[1fr_auto] gap-2 items-center px-3 py-2 border border-primary-500/30 rounded-md">
+      <div>
+        <Link
+          className="hover:underline truncate"
+          href={{ pathname: "/tickets", query: { id: ticket_id.toString() } }}
+        >
+          {expert_name}
+        </Link>
+        <br />
+        <span className="truncate opacity-50">
+          by {user_name}, {date_submitted}
+        </span>
+      </div>
+      <ObjectionStatusDropdown>
+        <ObjectionStatusBadge dropdown variant={status}>
+          {status}
+        </ObjectionStatusBadge>
+      </ObjectionStatusDropdown>
+    </li>
+  );
+}
diff --git a/admin-frontend/src/app/(pages)/disputes/table.tsx b/admin-frontend/src/app/(pages)/disputes/table.tsx
index 326ea13f..a615148a 100644
--- a/admin-frontend/src/app/(pages)/disputes/table.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/table.tsx
@@ -12,7 +12,7 @@ import { getDisputeList } from "@/lib/api/dispute";
 import { useQuery } from "@tanstack/react-query";
 import { AdminDisputesResponse, DisputeFilter, Filter, type AdminDispute } from "@/lib/types";
 
-import { StatusBadge } from "@/components/admin/status-dropdown";
+import { DisputeStatusBadge } from "@/components/admin/status-badge";
 import { LinkIcon } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useState } from "react";
@@ -79,7 +79,7 @@ function DisputeRow(props: AdminDispute) {
         <Link href={{ pathname: "/disputes", query: { id: props.id } }}>{props.title}</Link>
       </TableCell>
       <TableCell>
-        <StatusBadge value={props.status} />
+        <DisputeStatusBadge variant={props.status}>{props.status}</DisputeStatusBadge>
       </TableCell>
       <TableCell>
         <Link
diff --git a/admin-frontend/src/components/admin/status-badge.tsx b/admin-frontend/src/components/admin/status-badge.tsx
index f67eeec3..a9da5bea 100644
--- a/admin-frontend/src/components/admin/status-badge.tsx
+++ b/admin-frontend/src/components/admin/status-badge.tsx
@@ -4,6 +4,7 @@ import { cn } from "@/lib/utils";
 import { FunctionComponent, HTMLAttributes } from "react";
 import { ChevronDown } from "lucide-react";
 import { TicketStatus } from "@/lib/types/tickets";
+import { DisputeStatus, ObjectionStatus } from "@/lib/types";
 
 const statusVariants = cva("", {
   variants: {
@@ -87,3 +88,21 @@ export const TicketStatusBadge = mapStatus<TicketStatus>({
   Solved: "success",
   "On Hold": "warning",
 });
+
+export const DisputeStatusBadge = mapStatus<DisputeStatus>({
+  "Awaiting Respondant": "warning",
+  Active: "success",
+  Review: "error",
+  Refused: "error",
+  Appeal: "inactive",
+  Settled: "inactive",
+  Withdrawn: "inactive",
+  Transfer: "inactive",
+  Other: "inactive",
+});
+
+export const ObjectionStatusBadge = mapStatus<ObjectionStatus>({
+  Review: "warning",
+  Overruled: "inactive",
+  Sustained: "success",
+});
diff --git a/admin-frontend/src/components/admin/status-dropdown.tsx b/admin-frontend/src/components/admin/status-dropdown.tsx
index 3d000b8b..24165f82 100644
--- a/admin-frontend/src/components/admin/status-dropdown.tsx
+++ b/admin-frontend/src/components/admin/status-dropdown.tsx
@@ -12,8 +12,13 @@ import { ChevronDown } from "lucide-react";
 import { ReactNode } from "react";
 
 import { TICKET_STATUS, TicketStatus } from "@/lib/types/tickets";
-import { TicketStatusBadge } from "./status-badge";
-import { DISPUTE_STATUS, DisputeStatus } from "@/lib/types/dispute";
+import { DisputeStatusBadge, ObjectionStatusBadge, TicketStatusBadge } from "./status-badge";
+import {
+  DISPUTE_STATUS,
+  DisputeStatus,
+  OBJECTION_STATUS,
+  ObjectionStatus,
+} from "@/lib/types/dispute";
 
 const statusVariants = cva("", {
   variants: {
@@ -60,36 +65,7 @@ export interface StatusProps {
   dropdown?: boolean;
 }
 
-export function StatusBadge({ value, dropdown = false }: StatusProps) {
-  const variant = STATUS_VARIANTS.find(({ status }) => status == value)?.variant;
-  if (!variant) {
-    throw new Error("Unhandled dispute status: " + value);
-  }
-
-  return dropdown ? (
-    <Badge
-      className={cn(
-        "pl-1",
-        statusVariants({
-          variant,
-        })
-      )}
-      asChild
-    >
-      <button>
-        {dropdown && <ChevronDown size="1rem" />}
-        {value}
-      </button>
-    </Badge>
-  ) : (
-    <Badge className={statusVariants({ variant })}>
-      {dropdown && <ChevronDown size="1rem" />}
-      {value}
-    </Badge>
-  );
-}
-
-export function StatusDropdown({
+export function DisputeStatusDropdown({
   onSelect = () => {},
   initialValue,
   children,
@@ -108,7 +84,7 @@ export function StatusDropdown({
       <DropdownMenuContent className="rounded-md">
         {DISPUTE_STATUS.filter((status) => status !== initialValue).map((value) => (
           <DropdownMenuItem key={value} onSelect={() => onSelect(value)}>
-            <StatusBadge value={value} />
+            <DisputeStatusBadge variant={value}>{value}</DisputeStatusBadge>
           </DropdownMenuItem>
         ))}
       </DropdownMenuContent>
@@ -140,3 +116,30 @@ export function TicketStatusDropdown({
     </DropdownMenu>
   );
 }
+
+export function ObjectionStatusDropdown({
+  onSelect = () => {},
+  initialValue,
+  children,
+  disabled,
+}: {
+  onSelect?: (status: ObjectionStatus) => void;
+  initialValue?: ObjectionStatus;
+  children: ReactNode;
+  disabled?: boolean;
+}) {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger disabled={disabled} className="disabled:opacity-50">
+        {children}
+      </DropdownMenuTrigger>
+      <DropdownMenuContent className="rounded-md">
+        {OBJECTION_STATUS.filter((status) => status !== initialValue).map((value) => (
+          <DropdownMenuItem key={value} onSelect={() => onSelect(value)}>
+            <ObjectionStatusBadge variant={value}>{value}</ObjectionStatusBadge>
+          </DropdownMenuItem>
+        ))}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/admin-frontend/src/lib/api/dispute.ts b/admin-frontend/src/lib/api/dispute.ts
index 18141d1d..16c453da 100644
--- a/admin-frontend/src/lib/api/dispute.ts
+++ b/admin-frontend/src/lib/api/dispute.ts
@@ -15,7 +15,12 @@ export async function getDisputeList(req: AdminDisputesRequest): Promise<AdminDi
     headers: {
       Authorization: `Bearer ${getAuthToken()}`,
     },
-    body: JSON.stringify(req),
+    body: JSON.stringify({
+      ...req,
+      sort: {
+        attr: "title",
+      },
+    }),
   }).then(validateResult<AdminDisputesResponse>);
 }
 
diff --git a/admin-frontend/src/lib/types/dispute.ts b/admin-frontend/src/lib/types/dispute.ts
index f3239a41..366558cb 100644
--- a/admin-frontend/src/lib/types/dispute.ts
+++ b/admin-frontend/src/lib/types/dispute.ts
@@ -13,6 +13,9 @@ export const DISPUTE_STATUS = [
 ] as const;
 export type DisputeStatus = (typeof DISPUTE_STATUS)[number];
 
+export const OBJECTION_STATUS = ["Review", "Overruled", "Sustained"] as const;
+export type ObjectionStatus = (typeof OBJECTION_STATUS)[number];
+
 export type DisputeFilter = Filter<"status" | "workflow">;
 export type DisputeSort = Sort<"title" | "status" | "workflow" | "date_filed" | "date_resolved">;
 
@@ -83,11 +86,20 @@ export interface UserDetails {
   address: string;
 }
 
+export type ExpertStatus = "Approved" | "Rejected" | "Review";
+export interface ExpertSummary {
+  id: number;
+  fullname: string;
+  status: ExpertStatus;
+}
+
 export interface DisputeDetails extends AdminDispute {
   description: string;
   evidence: Evidence[];
   complainant: UserDetails;
   respondent: UserDetails;
+
+  experts: ExpertSummary[];
 }
 
 export type DisputeDetailsResponse = DisputeDetails;

From 318cb8a27437ac30aa8b1408991c2366348dd906 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 13:08:24 +0200
Subject: [PATCH 08/18] feat: Add dispute ID to ticket response

---
 api/handlers/ticket/model.go | 5 ++---
 api/models/responseModels.go | 5 +++--
 api/models/utilityModels.go  | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/handlers/ticket/model.go b/api/handlers/ticket/model.go
index f74785fb..35eea0a9 100644
--- a/api/handlers/ticket/model.go
+++ b/api/handlers/ticket/model.go
@@ -43,8 +43,6 @@ func NewHandler(db *gorm.DB, envReader env.Env) Ticket {
 	}
 }
 
-
-
 func (t *ticketModelReal) createTicket(userID int64, dispute int64, subject string, message string) (models.Ticket, error) {
 	logger := utilities.NewLogger().LogWithCaller()
 
@@ -158,7 +156,7 @@ func (t *ticketModelReal) getAdminTicketDetails(ticketID int64) (models.TicketsB
 	logger := utilities.NewLogger().LogWithCaller()
 	tickets := models.TicketsByUser{}
 	var IntermediateTick = models.TicketIntermediate{}
-	err := t.db.Raw("SELECT t.id, t.created_at, t.subject, t.status, t.initial_message, u.id AS user_id, u.first_name, u.surname FROM tickets t JOIN users u ON t.created_by = u.id WHERE t.id = ?", ticketID).Scan(&IntermediateTick).Error
+	err := t.db.Raw("SELECT t.id, t.dispute_id, t.created_at, t.subject, t.status, t.initial_message, u.id AS user_id, u.first_name, u.surname FROM tickets t JOIN users u ON t.created_by = u.id WHERE t.id = ?", ticketID).Scan(&IntermediateTick).Error
 	if err != nil {
 		logger.WithError(err).Error("Error retrieving ticket")
 		return tickets, err
@@ -183,6 +181,7 @@ func (t *ticketModelReal) getAdminTicketDetails(ticketID int64) (models.TicketsB
 	}
 
 	tickets = models.TicketsByUser{
+		DisputeID: IntermediateTick.DisputeID,
 		TicketSummaryResponse: models.TicketSummaryResponse{
 			ID:          strconv.Itoa(int(IntermediateTick.Id)),
 			User:        models.TicketUser{ID: strconv.Itoa(int(IntermediateTick.UserID)), FullName: IntermediateTick.FirstName + " " + IntermediateTick.Surname},
diff --git a/api/models/responseModels.go b/api/models/responseModels.go
index 6123165f..635525a5 100644
--- a/api/models/responseModels.go
+++ b/api/models/responseModels.go
@@ -91,8 +91,9 @@ type TicketMessage struct {
 
 type TicketsByUser struct {
 	TicketSummaryResponse
-	Body     string          `json:"body"`
-	Messages []TicketMessage `json:"messages"`
+	DisputeID int64           `json:"dispute_id"`
+	Body      string          `json:"body"`
+	Messages  []TicketMessage `json:"messages"`
 }
 
 type GetWorkflowResponse struct {
diff --git a/api/models/utilityModels.go b/api/models/utilityModels.go
index bde40dd2..b8b7004e 100644
--- a/api/models/utilityModels.go
+++ b/api/models/utilityModels.go
@@ -94,6 +94,7 @@ type AdminIntermediate struct {
 
 type TicketIntermediate struct {
 	Id             int64     `gorm:"column:id"`
+	DisputeID      int64     `gorm:"column:dispute_id"`
 	CreatedAt      time.Time `gorm:"column:created_at"`
 	Subject        string    `gorm:"column:subject"`
 	Status         string    `gorm:"column:status"`

From e1dd91cbf81072877247a02bd79b2f53eca8d500 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 13:08:34 +0200
Subject: [PATCH 09/18] feat: Im not sure

---
 .../src/app/(pages)/disputes/modal.tsx        | 24 ++++++++++++-------
 .../src/app/(pages)/tickets/details.tsx       |  8 +++++--
 .../src/app/(pages)/tickets/page.tsx          |  2 +-
 .../src/components/admin/status-badge.tsx     |  8 ++++++-
 admin-frontend/src/lib/api/dispute.ts         |  7 +++++-
 admin-frontend/src/lib/types/dispute.ts       |  2 +-
 admin-frontend/src/lib/types/tickets.ts       |  2 ++
 7 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/admin-frontend/src/app/(pages)/disputes/modal.tsx b/admin-frontend/src/app/(pages)/disputes/modal.tsx
index 8e5e8b43..98c0195c 100644
--- a/admin-frontend/src/app/(pages)/disputes/modal.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/modal.tsx
@@ -9,7 +9,11 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
-import { DisputeStatusBadge, StatusBadge } from "@/components/admin/status-badge";
+import {
+  DisputeStatusBadge,
+  ExpertStatusBadge,
+  StatusBadge,
+} from "@/components/admin/status-badge";
 import {
   type UserDetails,
   type DisputeDetails,
@@ -137,13 +141,15 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
             </CardHeader>
             <CardContent>
               <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
-                <ExpertAssignment id={1} fullname="John doe" status="Approved" />
+                {data.experts.map((exp) => (
+                  <ExpertAssignment key={exp.id} {...exp} />
+                ))}
               </ul>
               <CardTitle className="mt-5 text-lg">Objections</CardTitle>
               <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
                 <Objection
                   id={0}
-                  ticket_id={0}
+                  ticket_id={1}
                   expert_name={"Jonny Test"}
                   user_name={"Finn Human"}
                   date_submitted={"today"}
@@ -151,7 +157,7 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
                 />
                 <Objection
                   id={0}
-                  ticket_id={0}
+                  ticket_id={1}
                   expert_name={"Jonny Test"}
                   user_name={"Finn Human"}
                   date_submitted={"today"}
@@ -159,7 +165,7 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
                 />
                 <Objection
                   id={0}
-                  ticket_id={0}
+                  ticket_id={1}
                   expert_name={"Jonny Test"}
                   user_name={"Finn Human"}
                   date_submitted={"today"}
@@ -167,7 +173,7 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
                 />
                 <Objection
                   id={0}
-                  ticket_id={0}
+                  ticket_id={1}
                   expert_name={"Jonny Test"}
                   user_name={"Finn Human"}
                   date_submitted={"today"}
@@ -239,12 +245,12 @@ function Evidence({
   );
 }
 
-function ExpertAssignment({ id, fullname, status }: ExpertSummary) {
+function ExpertAssignment({ id, full_name, status }: ExpertSummary) {
   return (
     <li className="grid grid-cols-[auto_1fr_auto] gap-2 items-center px-3 py-2 border border-primary-500/30 rounded-md">
       <UserIcon size="1.7rem" />
-      <span className="truncate">{fullname}</span>
-      <StatusBadge variant="success">Gucci</StatusBadge>
+      <span className="truncate">{full_name}</span>
+      <ExpertStatusBadge variant={status}>{status}</ExpertStatusBadge>
     </li>
   );
 }
diff --git a/admin-frontend/src/app/(pages)/tickets/details.tsx b/admin-frontend/src/app/(pages)/tickets/details.tsx
index ae5e0f0b..e98e2c8f 100644
--- a/admin-frontend/src/app/(pages)/tickets/details.tsx
+++ b/admin-frontend/src/app/(pages)/tickets/details.tsx
@@ -21,6 +21,7 @@ import { Textarea } from "@/components/ui/textarea";
 import { Button } from "@/components/ui/button";
 import { FormEvent } from "react";
 import { TICKET_DETAILS_KEY, TICKET_LIST_KEY } from "@/lib/constants";
+import Link from "next/link";
 
 export default function TicketDetails({ ticketId }: { ticketId: number }) {
   const { data, error } = useQuery({
@@ -81,13 +82,16 @@ export default function TicketDetails({ ticketId }: { ticketId: number }) {
     <Sidebar open className="p-6 md:pl-8 rounded-l-2xl flex flex-col">
       {data && (
         <>
-          <SidebarHeader title={data.subject} className="flex gap-2 items-center">
+          <SidebarHeader title={data.subject} className="flex gap-2 items-center flex-wrap">
             <TicketStatusDropdown onSelect={status.mutate}>
               <TicketStatusBadge variant={data.status} dropdown>
                 {data.status}
               </TicketStatusBadge>
             </TicketStatusDropdown>
-            <span>{data.date_created}</span>
+            <span className="grow">{data.date_created}</span>
+            <Link href={{ pathname: "/disputes", query: { id: data.dispute_id } }}>
+              Go to dispute
+            </Link>
           </SidebarHeader>
           <div className="overflow-y-auto grow space-y-6 pr-3">
             <Card>
diff --git a/admin-frontend/src/app/(pages)/tickets/page.tsx b/admin-frontend/src/app/(pages)/tickets/page.tsx
index f4c15ca4..f4e3e314 100644
--- a/admin-frontend/src/app/(pages)/tickets/page.tsx
+++ b/admin-frontend/src/app/(pages)/tickets/page.tsx
@@ -14,7 +14,7 @@ import { useState } from "react";
 import TicketFilters from "./ticket-filters";
 
 const searchSchema = z.object({
-  id: z.number().optional(),
+  id: z.coerce.number().optional(),
 });
 
 export default function Tickets({ searchParams }: { searchParams: unknown }) {
diff --git a/admin-frontend/src/components/admin/status-badge.tsx b/admin-frontend/src/components/admin/status-badge.tsx
index a9da5bea..85ee5c62 100644
--- a/admin-frontend/src/components/admin/status-badge.tsx
+++ b/admin-frontend/src/components/admin/status-badge.tsx
@@ -4,7 +4,7 @@ import { cn } from "@/lib/utils";
 import { FunctionComponent, HTMLAttributes } from "react";
 import { ChevronDown } from "lucide-react";
 import { TicketStatus } from "@/lib/types/tickets";
-import { DisputeStatus, ObjectionStatus } from "@/lib/types";
+import { DisputeStatus, ExpertStatus, ObjectionStatus } from "@/lib/types";
 
 const statusVariants = cva("", {
   variants: {
@@ -106,3 +106,9 @@ export const ObjectionStatusBadge = mapStatus<ObjectionStatus>({
   Overruled: "inactive",
   Sustained: "success",
 });
+
+export const ExpertStatusBadge = mapStatus<ExpertStatus>({
+  Review: "warning",
+  Approved: "success",
+  Rejected: "inactive",
+});
diff --git a/admin-frontend/src/lib/api/dispute.ts b/admin-frontend/src/lib/api/dispute.ts
index 16c453da..1d80b8eb 100644
--- a/admin-frontend/src/lib/api/dispute.ts
+++ b/admin-frontend/src/lib/api/dispute.ts
@@ -30,7 +30,12 @@ export async function getDisputeDetails(id: string): Promise<DisputeDetailsRespo
     headers: {
       Authorization: `Bearer ${getAuthToken()}`,
     },
-  }).then(validateResult<DisputeDetailsResponse>);
+  })
+    .then(validateResult<DisputeDetailsResponse>)
+    .then((res) => {
+      console.log(res);
+      return res;
+    });
 }
 
 export async function changeDisputeStatus(id: string, status: DisputeStatus): Promise<void> {
diff --git a/admin-frontend/src/lib/types/dispute.ts b/admin-frontend/src/lib/types/dispute.ts
index 366558cb..ef5c842e 100644
--- a/admin-frontend/src/lib/types/dispute.ts
+++ b/admin-frontend/src/lib/types/dispute.ts
@@ -89,7 +89,7 @@ export interface UserDetails {
 export type ExpertStatus = "Approved" | "Rejected" | "Review";
 export interface ExpertSummary {
   id: number;
-  fullname: string;
+  full_name: string;
   status: ExpertStatus;
 }
 
diff --git a/admin-frontend/src/lib/types/tickets.ts b/admin-frontend/src/lib/types/tickets.ts
index 9af77a3a..ee0e80a4 100644
--- a/admin-frontend/src/lib/types/tickets.ts
+++ b/admin-frontend/src/lib/types/tickets.ts
@@ -23,6 +23,8 @@ export interface TicketSummary {
 }
 
 export interface Ticket extends TicketSummary {
+  dispute_id: number;
+
   // The initial message submitted with the ticket
   body: string;
 

From 6c6c40b51ba050764bf55ee025d7f8c06c50190f Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 13:18:51 +0200
Subject: [PATCH 10/18] feat: Integrate objection status change

---
 .../src/app/(pages)/disputes/modal.tsx        | 28 ++++++++++++++++---
 .../src/app/(pages)/disputes/table.tsx        |  6 ++--
 admin-frontend/src/lib/api/expert.ts          | 16 +++++++++++
 admin-frontend/src/lib/constants.ts           |  6 ++++
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 admin-frontend/src/lib/api/expert.ts

diff --git a/admin-frontend/src/app/(pages)/disputes/modal.tsx b/admin-frontend/src/app/(pages)/disputes/modal.tsx
index 98c0195c..1a53bcbd 100644
--- a/admin-frontend/src/app/(pages)/disputes/modal.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/modal.tsx
@@ -21,6 +21,7 @@ import {
   DisputeDetailsResponse,
   ExpertSummary,
   ObjectionStatus,
+  ExpertStatus,
 } from "@/lib/types/dispute";
 import { changeDisputeStatus, getDisputeDetails } from "@/lib/api/dispute";
 import { useToast } from "@/lib/hooks/use-toast";
@@ -36,24 +37,26 @@ import Link from "next/link";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { ObjectionStatusBadge } from "@/components/admin/status-badge";
 import { DisputeStatusDropdown, ObjectionStatusDropdown } from "@/components/admin/status-dropdown";
+import { changeObjectionStatus } from "@/lib/api/expert";
+import { DISPUTE_DETAILS_KEY, DISPUTE_LIST_KEY } from "@/lib/constants";
 
 export default function DisputeDetails({ id: disputeId }: { id: string }) {
   const { toast } = useToast();
   const client = useQueryClient();
   const { data, error } = useQuery({
-    queryKey: ["dispute"],
+    queryKey: [DISPUTE_DETAILS_KEY],
     queryFn: async () => getDisputeDetails(disputeId),
   });
 
   const status = useMutation({
     mutationFn: (status: DisputeStatus) => changeDisputeStatus(disputeId, status),
     onSuccess: (data, variables) => {
-      client.setQueryData(["dispute"], (old: DisputeDetailsResponse) => ({
+      client.setQueryData([DISPUTE_DETAILS_KEY], (old: DisputeDetailsResponse) => ({
         ...old,
         status: variables,
       }));
       client.invalidateQueries({
-        queryKey: ["disputeTable"],
+        queryKey: [DISPUTE_LIST_KEY],
       });
       toast({
         title: "Status updated successfully",
@@ -270,6 +273,23 @@ function Objection({
   date_submitted: string;
   status: ObjectionStatus;
 }) {
+  const { toast } = useToast();
+  const objection = useMutation({
+    mutationFn: (status: ObjectionStatus) => changeObjectionStatus(id, status),
+    onSuccess: (data, variables) => {
+      toast({
+        title: "Objection status updated successfully",
+      });
+    },
+    onError: (error) => {
+      toast({
+        variant: "error",
+        title: "Something went wrong",
+        description: error?.message,
+      });
+    },
+  });
+
   return (
     <li className="grid grid-cols-[1fr_auto] gap-2 items-center px-3 py-2 border border-primary-500/30 rounded-md">
       <div>
@@ -284,7 +304,7 @@ function Objection({
           by {user_name}, {date_submitted}
         </span>
       </div>
-      <ObjectionStatusDropdown>
+      <ObjectionStatusDropdown onSelect={(s) => objection.mutate(s)}>
         <ObjectionStatusBadge dropdown variant={status}>
           {status}
         </ObjectionStatusBadge>
diff --git a/admin-frontend/src/app/(pages)/disputes/table.tsx b/admin-frontend/src/app/(pages)/disputes/table.tsx
index a615148a..69a551a6 100644
--- a/admin-frontend/src/app/(pages)/disputes/table.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/table.tsx
@@ -24,11 +24,11 @@ import {
   PaginationPrevious,
   PaginationNext,
 } from "@/components/ui/pagination";
-import { PAGE_SIZE } from "@/lib/constants";
+import { DISPUTE_LIST_KEY, PAGE_SIZE } from "@/lib/constants";
 
 export function DisputeTable({ filters, page = 0 }: { filters?: DisputeFilter[]; page: number }) {
   const { data, error, isPending } = useQuery({
-    queryKey: ["disputeTable", filters, page],
+    queryKey: [DISPUTE_LIST_KEY, filters, page],
     queryFn: () =>
       getDisputeList({
         filter: filters,
@@ -106,7 +106,7 @@ export function DisputePager({
   page?: number;
 }) {
   const query = useQuery<AdminDisputesResponse>({
-    queryKey: ["disputeTable", filters, page],
+    queryKey: [DISPUTE_LIST_KEY, filters, page],
   });
 
   const [current, setCurrent] = useState(page);
diff --git a/admin-frontend/src/lib/api/expert.ts b/admin-frontend/src/lib/api/expert.ts
new file mode 100644
index 00000000..51179e5a
--- /dev/null
+++ b/admin-frontend/src/lib/api/expert.ts
@@ -0,0 +1,16 @@
+"use server";
+
+import { ObjectionStatus, type ExpertStatus } from "../types";
+
+export async function changeObjectionStatus(id: number, status: ObjectionStatus): Promise<void> {
+  //   await sf(`${API_URL}/tickets/${id}`, {
+  //     method: "PATCH",
+  //     headers: {
+  //       Authorization: `Bearer ${getAuthToken()}`,
+  //     },
+  //     body: JSON.stringify({
+  //       status,
+  //     }),
+  //   });
+  return;
+}
diff --git a/admin-frontend/src/lib/constants.ts b/admin-frontend/src/lib/constants.ts
index 3341275b..129adb29 100644
--- a/admin-frontend/src/lib/constants.ts
+++ b/admin-frontend/src/lib/constants.ts
@@ -1,3 +1,9 @@
+/** The React Query key used to store the list of disputes */
+export const DISPUTE_LIST_KEY = "disputeList";
+
+/** The React Query key used to store the list of disputes */
+export const DISPUTE_DETAILS_KEY = "disputeDetails";
+
 /** The React Query key used to store the list of tickets */
 export const TICKET_LIST_KEY = "ticketList";
 

From 019a9d5bc052436ad984f47712eab57e3a8775ba Mon Sep 17 00:00:00 2001
From: ZaguePrime <kivashin47@gmail.com>
Date: Sat, 28 Sep 2024 13:54:07 +0200
Subject: [PATCH 11/18] fix: make details good

---
 api/handlers/dispute/dispute.go           | 23 -------
 api/handlers/dispute/dispute_test.go      | 17 +----
 api/handlers/dispute/model.go             | 79 ++++++++++++++++-------
 api/models/models.go                      | 17 ++---
 api/models/responseModels.go              | 17 ++++-
 docs/docs/dev-docs/api-contracts/Admin.md | 30 ++++++++-
 6 files changed, 112 insertions(+), 71 deletions(-)

diff --git a/api/handlers/dispute/dispute.go b/api/handlers/dispute/dispute.go
index 37e3ccd3..bc28b9c1 100644
--- a/api/handlers/dispute/dispute.go
+++ b/api/handlers/dispute/dispute.go
@@ -278,29 +278,6 @@ func (h Dispute) GetDispute(c *gin.Context) {
 			c.JSON(http.StatusInternalServerError, models.Response{Error: "Error retrieving dispute"})
 			return
 		}
-		evidence, err := h.Model.GetEvidenceByDispute(int64(id))
-		if err != nil {
-			logger.WithError(err).Error("Error retrieving dispute evidence")
-			c.JSON(http.StatusInternalServerError, models.Response{Error: err.Error()})
-			return
-		}
-		if evidence == nil {
-			evidence = []models.Evidence{}
-		}
-
-		experts, err := h.Model.GetDisputeExperts(int64(id))
-		if err != nil && err.Error() != "record not found" {
-			logger.WithError(err).Error("Error retrieving dispute experts")
-			c.JSON(http.StatusInternalServerError, models.Response{Error: err.Error()})
-			return
-		}
-
-		if experts == nil {
-			experts = []models.Expert{}
-		}
-
-		dispute.Evidence = evidence
-		dispute.Experts = experts
 
 		c.JSON(http.StatusOK, models.Response{Data: dispute})
 		return
diff --git a/api/handlers/dispute/dispute_test.go b/api/handlers/dispute/dispute_test.go
index dd230570..d2c8deb2 100644
--- a/api/handlers/dispute/dispute_test.go
+++ b/api/handlers/dispute/dispute_test.go
@@ -208,22 +208,11 @@ func (m *mockDisputeModel) GetDispute(disputeId int64) (models.Dispute, error) {
 	}, nil
 }
 
-func (m *mockDisputeModel) GetAdminDisputeDetails(disputeId int64) (models.DisputeDetailsResponse, error) {
+func (m *mockDisputeModel) GetAdminDisputeDetails(disputeId int64) (models.AdminDisputeDetailsResponse, error) {
 	if m.throwErrors {
-		return models.DisputeDetailsResponse{}, errors.ErrUnsupported
+		return models.AdminDisputeDetailsResponse{}, errors.ErrUnsupported
 	}
-	return models.DisputeDetailsResponse{
-		ID:          0,
-		Title:       "title",
-		Description: "desc",
-		Status:      "status",
-		DateCreated: time.Now(),
-		Evidence:    []models.Evidence{},
-		Experts:     []models.Expert{},
-		Role:        "",
-		Complainant: models.UserDetails{},
-		Respondent:  models.UserDetails{},
-	}, nil
+	return models.AdminDisputeDetailsResponse{}, nil
 }
 
 func (m *mockDisputeModel) GetUser(userID int64) (models.UserDetails, error) {
diff --git a/api/handlers/dispute/model.go b/api/handlers/dispute/model.go
index 9ab2a5b0..51d9145e 100644
--- a/api/handlers/dispute/model.go
+++ b/api/handlers/dispute/model.go
@@ -55,7 +55,7 @@ type DisputeModel interface {
 	GenerateAISummary(disputeID int64, disputeDesc string, apiKey string)
 
 	GetUser(UserID int64) (models.UserDetails, error)
-	GetAdminDisputeDetails(disputeId int64) (models.DisputeDetailsResponse, error)
+	GetAdminDisputeDetails(disputeId int64) (models.AdminDisputeDetailsResponse, error)
 }
 
 type Dispute struct {
@@ -262,42 +262,75 @@ func (m *disputeModelReal) GetDispute(disputeId int64) (dispute models.Dispute,
 	return dispute, err
 }
 
-func (m *disputeModelReal) GetAdminDisputeDetails(disputeId int64) (models.DisputeDetailsResponse, error) {
-	logger := utilities.NewLogger().LogWithCaller()
-	var disputeDetails models.Dispute
-	err := m.db.Model(&models.Dispute{}).Where("id = ?", disputeId).First(&disputeDetails).Error
+func (m *disputeModelReal) GetAdminDisputeDetails(disputeId int64) (models.AdminDisputeDetailsResponse, error) {
 
+	logger := utilities.NewLogger().LogWithCaller()
+	dispute, err := m.GetDispute(disputeId)
 	if err != nil {
-		logger.WithError(err).Error("Error retrieving dispute details")
-		return models.DisputeDetailsResponse{}, err
+		logger.WithError(err).Error("Error retrieving dispute")
+		return models.AdminDisputeDetailsResponse{}, err
 	}
 
-	compl, err := m.GetUser(disputeDetails.Complainant)
+	var adminIntermed models.AdminIntermediate
+	err = m.db.Raw("SELECT id, title, status, case_date, date_resolved FROM disputes WHERE id = ?", disputeId).Scan(&adminIntermed).Error
+	if err != nil {
+		logger.WithError(err).Error("Error retrieving dispute")
+		return models.AdminDisputeDetailsResponse{}, err
+	}
+	var workflow models.WorkflowResp
+	err = m.db.Raw("SELECT wf.id, wf.name FROM disputes d JOIN active_workflows aw ON d.workflow = aw.id JOIN workflows wf ON wf.id = aw.workflow WHERE d.id = ?", adminIntermed.Id).First(&workflow).Error
+	if err != nil {
+		logger.WithError(err).Error("Error retrieving workflow for dispute with ID: " + strconv.Itoa(int(adminIntermed.Id)))
+		return models.AdminDisputeDetailsResponse{}, err
+	}
 
+	experts, err := m.GetExperts(disputeId)
 	if err != nil {
-		logger.WithError(err).Error("Error retrieving user details")
-		return models.DisputeDetailsResponse{}, err
+		logger.WithError(err).Error("Error retrieving experts for dispute with ID: " + strconv.Itoa(int(adminIntermed.Id)))
+		return models.AdminDisputeDetailsResponse{}, err
 	}
 
-	resp, err := m.GetUser(*disputeDetails.Respondant)
+	var evidence []models.Evidence
+	evidence, err = m.GetEvidenceByDispute(disputeId)
+	if err != nil {
+		logger.WithError(err).Error("Error retrieving evidence for dispute with ID: " + strconv.Itoa(int(adminIntermed.Id)))
+		return models.AdminDisputeDetailsResponse{}, err
+	}
 
+	var complainant models.UserDetails
+	complainant, err = m.GetUser(dispute.Complainant)
 	if err != nil {
-		logger.WithError(err).Error("Error retrieving user details")
-		return models.DisputeDetailsResponse{}, err
+		logger.WithError(err).Error("Error retrieving complainant for dispute with ID: " + strconv.Itoa(int(adminIntermed.Id)))
+		return models.AdminDisputeDetailsResponse{}, err
 	}
 
-	var actualDetails models.DisputeDetailsResponse = models.DisputeDetailsResponse{
-		ID:          *disputeDetails.ID,
-		Title:       disputeDetails.Title,
-		Description: disputeDetails.Description,
-		Status:      disputeDetails.Status,
-		DateCreated: disputeDetails.CaseDate,
-		Role:        "",
-		Complainant: compl,
-		Respondent:  resp,
+	var respondent models.UserDetails
+	respondent, err = m.GetUser(*dispute.Respondant)
+	if err != nil {
+		logger.WithError(err).Error("Error retrieving respondent for dispute with ID: " + strconv.Itoa(int(adminIntermed.Id)))
+		return models.AdminDisputeDetailsResponse{}, err
+	}
+
+	adminDisputeDetails := models.AdminDisputeDetailsResponse{
+		AdminDisputeSummariesResponse: models.AdminDisputeSummariesResponse{
+			Id:        strconv.Itoa(int(adminIntermed.Id)),
+			Title:     adminIntermed.Title,
+			Status:    adminIntermed.Status,
+			Workflow:  workflow,
+			DateFiled: adminIntermed.CaseDate.Format("2006-01-02"),
+			Experts:   experts,
+		},
+		Description: dispute.Description,
+		Evidence:    evidence,
+		Complainant: complainant,
+		Respondent:  respondent,
+	}
+	if dispute.DateResolved != nil {
+		dateResolved := dispute.DateResolved.Format("2006-01-02")
+		adminDisputeDetails.DateResolved = &dateResolved
 	}
 
-	return actualDetails, nil
+	return adminDisputeDetails, nil
 }
 
 func (m *disputeModelReal) GetEvidenceByDispute(disputeId int64) (evidence []models.Evidence, err error) {
diff --git a/api/models/models.go b/api/models/models.go
index 2ed17d32..89a1636a 100644
--- a/api/models/models.go
+++ b/api/models/models.go
@@ -63,14 +63,15 @@ const (
 )
 
 type Dispute struct {
-	ID          *int64        `json:"id" gorm:"primaryKey;autoIncrement;column:id"`
-	CaseDate    time.Time     `json:"case_date" gorm:"type:date;default:CURRENT_DATE;column:case_date"`
-	Workflow    *int64        `json:"workflow" gorm:"column:workflow"`
-	Status      DisputeStatus `json:"status" gorm:"type:dispute_status_enum;default:'Awaiting Respondant';column:status"`
-	Title       string        `json:"title" gorm:"type:varchar(255);not null;column:title"`
-	Description string        `json:"description" gorm:"type:text;column:description"`
-	Complainant int64         `json:"complainant" gorm:"column:complainant"`
-	Respondant  *int64        `json:"respondant" gorm:"column:respondant"`
+	ID           *int64        `json:"id" gorm:"primaryKey;autoIncrement;column:id"`
+	CaseDate     time.Time     `json:"case_date" gorm:"type:date;default:CURRENT_DATE;column:case_date"`
+	Workflow     *int64        `json:"workflow" gorm:"column:workflow"`
+	Status       DisputeStatus `json:"status" gorm:"type:dispute_status_enum;default:'Awaiting Respondant';column:status"`
+	Title        string        `json:"title" gorm:"type:varchar(255);not null;column:title"`
+	Description  string        `json:"description" gorm:"type:text;column:description"`
+	Complainant  int64         `json:"complainant" gorm:"column:complainant"`
+	Respondant   *int64        `json:"respondant" gorm:"column:respondant"`
+	DateResolved *time.Time    `json:"date_resolved" gorm:"type:timestamp;column:date_resolved"`
 }
 
 type Workflow struct {
diff --git a/api/models/responseModels.go b/api/models/responseModels.go
index 2c4045e6..6d8ea540 100644
--- a/api/models/responseModels.go
+++ b/api/models/responseModels.go
@@ -39,6 +39,12 @@ type DisputeDetailsResponse struct {
 	Respondent  UserDetails   `json:"respondent"`
 }
 
+type ExpertSummary struct {
+	ID       string `json:"id"`
+	FullName string `json:"full_name"`
+	Status   string `json:"status"`
+}
+
 type UserDetails struct {
 	FullName string `json:"name" gorm:"column:full_name"`
 	Email    string `json:"email" gorm:"column:email"`
@@ -77,6 +83,14 @@ type AdminDisputeSummariesResponse struct {
 	Experts      []AdminDisputeExperts `json:"experts"`
 }
 
+type AdminDisputeDetailsResponse struct {
+	AdminDisputeSummariesResponse
+	Description string      `json:"description"`
+	Evidence    []Evidence  `json:"evidence"`
+	Complainant UserDetails `json:"complainant"`
+	Respondent  UserDetails `json:"respondent"`
+}
+
 type TicketUser struct {
 	ID       string `gorm:"column:first_name" json:"id"`
 	FullName string `gorm:"column:surname" json:"full_name"`
@@ -187,7 +201,6 @@ func (d *DurationWrapper) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-
 type TriggerResponse struct {
 	Trigger []string `json:"triggers"`
-}
\ No newline at end of file
+}
diff --git a/docs/docs/dev-docs/api-contracts/Admin.md b/docs/docs/dev-docs/api-contracts/Admin.md
index aa93bbc2..394f213d 100644
--- a/docs/docs/dev-docs/api-contracts/Admin.md
+++ b/docs/docs/dev-docs/api-contracts/Admin.md
@@ -90,7 +90,6 @@ type AdminDisputes = Array<{
 
   // Optional because dispute may still be active (i.e. no resolved date)
   date_resolved?: string;
-  experts: []ExpertSummary;
 }>;
 
 type AdminDisputesResponse = {
@@ -98,3 +97,32 @@ type AdminDisputesResponse = {
   total: number;
 };
 ```
+
+# Dispute Details
+- **Endpoint:** `GET /disputes/{id}`
+- **Headers:**
+  - `Authorization: Bearer <JWT>`
+```ts
+type AdminDisputes = {
+  id: string;
+  title: string;
+  status: string;
+
+  // The workflow that the dispute follows
+  workflow: {
+    id: string;
+    title: string;
+  };
+
+  date_filed: string;
+
+  // Optional because dispute may still be active (i.e. no resolved date)
+  date_resolved?: string;
+
+  description: string;
+  evidence: Evidence[];
+  complainant: UserDetails;
+  respondent: UserDetails;
+
+  experts: ExpertSummary[];
+};```
\ No newline at end of file

From 125318f1836f4d5951f4cccee34707fcbfbb462a Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 15:28:47 +0200
Subject: [PATCH 12/18] feat: Add integrated functions

---
 admin-frontend/src/lib/api/expert.ts    | 37 +++++++++++++++++--------
 admin-frontend/src/lib/types/dispute.ts |  3 --
 admin-frontend/src/lib/types/experts.ts | 29 +++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 admin-frontend/src/lib/types/experts.ts

diff --git a/admin-frontend/src/lib/api/expert.ts b/admin-frontend/src/lib/api/expert.ts
index 51179e5a..a3b4954c 100644
--- a/admin-frontend/src/lib/api/expert.ts
+++ b/admin-frontend/src/lib/api/expert.ts
@@ -1,16 +1,29 @@
 "use server";
 
-import { ObjectionStatus, type ExpertStatus } from "../types";
+import { getAuthToken } from "../jwt";
+import { ObjectionStatus, type ObjectionListResponse } from "../types/experts";
+import { API_URL, sf, validateResult } from "../utils";
 
-export async function changeObjectionStatus(id: number, status: ObjectionStatus): Promise<void> {
-  //   await sf(`${API_URL}/tickets/${id}`, {
-  //     method: "PATCH",
-  //     headers: {
-  //       Authorization: `Bearer ${getAuthToken()}`,
-  //     },
-  //     body: JSON.stringify({
-  //       status,
-  //     }),
-  //   });
-  return;
+export async function getExpertObjections(dispute: number): Promise<ObjectionListResponse> {
+  return sf(`${API_URL}/disputes/${dispute}/objections`, {
+    headers: {
+      Authorization: `Bearer ${getAuthToken()}`,
+    },
+  }).then(validateResult<ObjectionListResponse>);
+}
+
+export async function changeObjectionStatus(
+  dispute: number,
+  objection: number,
+  status: ObjectionStatus
+): Promise<void> {
+  await sf(`${API_URL}/disputes/${dispute}/objections/${objection}`, {
+    method: "PATCH",
+    headers: {
+      Authorization: `Bearer ${getAuthToken()}`,
+    },
+    body: JSON.stringify({
+      status,
+    }),
+  });
 }
diff --git a/admin-frontend/src/lib/types/dispute.ts b/admin-frontend/src/lib/types/dispute.ts
index ef5c842e..e463c981 100644
--- a/admin-frontend/src/lib/types/dispute.ts
+++ b/admin-frontend/src/lib/types/dispute.ts
@@ -13,9 +13,6 @@ export const DISPUTE_STATUS = [
 ] as const;
 export type DisputeStatus = (typeof DISPUTE_STATUS)[number];
 
-export const OBJECTION_STATUS = ["Review", "Overruled", "Sustained"] as const;
-export type ObjectionStatus = (typeof OBJECTION_STATUS)[number];
-
 export type DisputeFilter = Filter<"status" | "workflow">;
 export type DisputeSort = Sort<"title" | "status" | "workflow" | "date_filed" | "date_resolved">;
 
diff --git a/admin-frontend/src/lib/types/experts.ts b/admin-frontend/src/lib/types/experts.ts
new file mode 100644
index 00000000..4a8f6371
--- /dev/null
+++ b/admin-frontend/src/lib/types/experts.ts
@@ -0,0 +1,29 @@
+export const OBJECTION_STATUS = ["Review", "Overruled", "Sustained"] as const;
+export type ObjectionStatus = (typeof OBJECTION_STATUS)[number];
+
+export interface Objection {
+  /** ID of the objection itself. */
+  id: number;
+
+  /** ID  of the ticket the objection is related to */
+  ticket_id: number;
+
+  /** The full name of the expert being objected to */
+  expert_name: string;
+
+  /** The full name of the user that submitted the objection */
+  user_name: string;
+
+  /** When the objection was submitted */
+  date_submitted: string;
+
+  /** The status of the objection */
+  status: ObjectionStatus;
+}
+
+// ----------------------------------------------------------------- REQUEST/RESPONSE TYPES
+export type ObjectionListResponse = Objection[];
+
+export interface ObjectionListRequest {
+  status?: ObjectionStatus;
+}

From 18451259307523d68a88b975921c8a54cb62a9d7 Mon Sep 17 00:00:00 2001
From: S3BzA <sebguim2002@gmail.com>
Date: Sat, 28 Sep 2024 15:53:17 +0200
Subject: [PATCH 13/18] feat: add restart policy to all containers to improve
 fault tolerance

---
 compose.yaml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 5a393474..19d1491a 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -13,6 +13,11 @@ services:
           path: ./frontend
     labels:
       - "traefik.http.routers.frontend.rule=Host(`localhost`)"
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   admin-frontend: # --------------------------------------------------------- Admin Frontend
     build: ./admin-frontend
     ports:
@@ -25,6 +30,11 @@ services:
       watch:
         - action: rebuild
           path: ./admin-frontend
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   api: # ------------------------------------------------------------------API
     build: ./api
     ports:
@@ -40,7 +50,6 @@ services:
       watch:
         - action: rebuild
           path: ./api
-    restart: unless-stopped
     logging:
       driver: loki
       options:
@@ -48,6 +57,11 @@ services:
         mode: non-blocking
         max-buffer-size: 4m
         loki-retries: "3"
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   orchestrator: # ---------------------------------------------------Orchestrator
     build: ./orchestrator
     ports:
@@ -67,6 +81,11 @@ services:
         mode: non-blocking
         max-buffer-size: 4m
         loki-retries: "3"
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   postgres: # ----------------------------------------------------------Postgres
     image: postgres
     ports:
@@ -76,6 +95,11 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
       - ./initdb:/docker-entrypoint-initdb.d
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   redis-cache: # --------------------------------------------------------Redis
     image: redis
     ports:
@@ -83,6 +107,11 @@ services:
     env_file:
       - red.env
     command: sh -c 'redis-server --requirepass "$$REDIS_PASSWORD"'
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   prometheus: # ----------------------------------------------------------Prometheus
     image: docker.io/prom/prometheus
     container_name: prometheus
@@ -92,7 +121,11 @@ services:
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
       - prometheus-data:/prometheus
-    restart: unless-stopped
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   grafana: # -------------------------------------------------------------Grafana
     image: docker.io/grafana/grafana-oss
     container_name: grafana
@@ -102,9 +135,13 @@ services:
       - "3001:3000" # Changed Grafana's port to avoid conflict with frontend
     volumes:
       - grafana-data:/var/lib/grafana
-    restart: unless-stopped
     labels:
       - "traefik.http.routers.grafana.rule=Host(`grafana.localhost`)"
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   cadvisor: # -----------------------------------------------------------Cadvisor
     image: gcr.io/cadvisor/cadvisor
     container_name: cadvisor
@@ -121,7 +158,11 @@ services:
       - 8081:8080
     environment:
       - allowlisted_container_labels=com.docker.swarm.service.name
-    restart: unless-stopped
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   loki: # ---------------------------------------------------------------Loki
     image: grafana/loki
     ports:
@@ -133,6 +174,11 @@ services:
       - source: loki-config
         target: /etc/loki/loki-config.yaml
     user: root
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   promtail: # -----------------------------------------------------------Promtail
     image: grafana/promtail
     volumes:
@@ -145,7 +191,11 @@ services:
         target: /etc/promtail/config.yaml
     labels:
       - "traefik.enable=false"
-
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
   reverse-proxy: # ------------------------------------------------------Traefik
     image: traefik:v3.1
     command: --api.insecure=true --providers.docker
@@ -154,6 +204,11 @@ services:
       - "8080:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
 volumes: # ---------------------------------------------------------------Volumes
   pgdata:
   evi_files:

From d3c07019a1e8d1fa0bd3ac91bf2978513815a872 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 15:57:33 +0200
Subject: [PATCH 14/18] feat: Integrate objection status changed

---
 .../src/app/(pages)/disputes/modal.tsx        | 130 +++++++++---------
 .../src/components/admin/status-dropdown.tsx  |   8 +-
 admin-frontend/src/lib/api/dispute.ts         |   4 +-
 3 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/admin-frontend/src/app/(pages)/disputes/modal.tsx b/admin-frontend/src/app/(pages)/disputes/modal.tsx
index 1a53bcbd..84ec3d71 100644
--- a/admin-frontend/src/app/(pages)/disputes/modal.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/modal.tsx
@@ -9,19 +9,13 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
-import {
-  DisputeStatusBadge,
-  ExpertStatusBadge,
-  StatusBadge,
-} from "@/components/admin/status-badge";
+import { DisputeStatusBadge, ExpertStatusBadge } from "@/components/admin/status-badge";
 import {
   type UserDetails,
   type DisputeDetails,
-  DisputeStatus,
-  DisputeDetailsResponse,
-  ExpertSummary,
-  ObjectionStatus,
-  ExpertStatus,
+  type DisputeStatus,
+  type DisputeDetailsResponse,
+  type ExpertSummary,
 } from "@/lib/types/dispute";
 import { changeDisputeStatus, getDisputeDetails } from "@/lib/api/dispute";
 import { useToast } from "@/lib/hooks/use-toast";
@@ -37,21 +31,26 @@ import Link from "next/link";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { ObjectionStatusBadge } from "@/components/admin/status-badge";
 import { DisputeStatusDropdown, ObjectionStatusDropdown } from "@/components/admin/status-dropdown";
-import { changeObjectionStatus } from "@/lib/api/expert";
+import { changeObjectionStatus, getExpertObjections } from "@/lib/api/expert";
 import { DISPUTE_DETAILS_KEY, DISPUTE_LIST_KEY } from "@/lib/constants";
+import { ObjectionListResponse, ObjectionStatus } from "@/lib/types/experts";
 
-export default function DisputeDetails({ id: disputeId }: { id: string }) {
+export default function DisputeDetails({ id: disputeId }: { id: number }) {
   const { toast } = useToast();
   const client = useQueryClient();
-  const { data, error } = useQuery({
-    queryKey: [DISPUTE_DETAILS_KEY],
+  const details = useQuery({
+    queryKey: [DISPUTE_DETAILS_KEY, disputeId],
     queryFn: async () => getDisputeDetails(disputeId),
   });
+  const objections = useQuery({
+    queryKey: [DISPUTE_DETAILS_KEY, disputeId, "objections"],
+    queryFn: async () => getExpertObjections(disputeId),
+  });
 
   const status = useMutation({
     mutationFn: (status: DisputeStatus) => changeDisputeStatus(disputeId, status),
     onSuccess: (data, variables) => {
-      client.setQueryData([DISPUTE_DETAILS_KEY], (old: DisputeDetailsResponse) => ({
+      client.setQueryData([DISPUTE_DETAILS_KEY, disputeId], (old: DisputeDetailsResponse) => ({
         ...old,
         status: variables,
       }));
@@ -72,10 +71,10 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
   });
 
   return (
-    data && (
+    details.data && (
       <Sidebar open className="p-6 md:pl-8 rounded-l-2xl flex flex-col">
         <DialogHeader className="grid grid-cols-[1fr_auto] gap-2 border-b pb-6 mb-6 border-primary-500/50 space-y-0 items-center">
-          <DialogTitle className="p-2">{data.title}</DialogTitle>
+          <DialogTitle className="p-2">{details.data.title}</DialogTitle>
           <div className="flex justify-end items-start">
             <DialogClose asChild>
               <Button variant="ghost" className="rounded-full aspect-square p-2 m-0">
@@ -85,30 +84,30 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
           </div>
           <div className="flex gap-2 items-center">
             <DisputeStatusDropdown
-              initialValue={data.status}
+              initialValue={details.data.status}
               onSelect={(val) => status.mutate(val)}
               disabled={status.isPending}
             >
-              <DisputeStatusBadge dropdown variant={data.status}>
-                {data.status}
+              <DisputeStatusBadge dropdown variant={details.data.status}>
+                {details.data.status}
               </DisputeStatusBadge>
             </DisputeStatusDropdown>
-            <span>{data.date_filed}</span>
+            <span>{details.data.date_filed}</span>
           </div>
 
-          <p>Case Number: {data.id}</p>
+          <p>Case Number: {details.data.id}</p>
         </DialogHeader>
         <div className="overflow-y-auto grow space-y-6 pr-3">
           <Card>
             <CardHeader>
               <CardTitle>Overview</CardTitle>
-              <CardDescription>{data.description}</CardDescription>
+              <CardDescription>{details.data.description}</CardDescription>
             </CardHeader>
             <CardContent>
               <h4 className="mb-1">Evidence</h4>
               <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
-                {data.evidence.length > 0 ? (
-                  data.evidence.map((evi) => (
+                {details.data.evidence.length > 0 ? (
+                  details.data.evidence.map((evi) => (
                     <Evidence
                       key={evi.id}
                       id={evi.id}
@@ -129,11 +128,11 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
             <CardContent className="grid grid-cols-1 md:grid-cols-2 gap-3">
               <section className="space-y-3">
                 <CardTitle>Complainant</CardTitle>
-                <UserDetails {...data.complainant} />
+                <UserDetails {...details.data.complainant} />
               </section>
               <section className="space-y-3">
                 <CardTitle>Respondent</CardTitle>
-                <UserDetails {...data.respondent} />
+                <UserDetails {...details.data.respondent} />
               </section>
             </CardContent>
           </Card>
@@ -144,45 +143,25 @@ export default function DisputeDetails({ id: disputeId }: { id: string }) {
             </CardHeader>
             <CardContent>
               <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
-                {data.experts.map((exp) => (
+                {details.data?.experts.length == 0 && (
+                  <li className="text-sm text-black/50 dark:text-white/50">
+                    No experts are assigned to the case.
+                  </li>
+                )}
+                {details.data?.experts.map((exp) => (
                   <ExpertAssignment key={exp.id} {...exp} />
                 ))}
               </ul>
-              <CardTitle className="mt-5 text-lg">Objections</CardTitle>
-              <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
-                <Objection
-                  id={0}
-                  ticket_id={1}
-                  expert_name={"Jonny Test"}
-                  user_name={"Finn Human"}
-                  date_submitted={"today"}
-                  status={"Review"}
-                />
-                <Objection
-                  id={0}
-                  ticket_id={1}
-                  expert_name={"Jonny Test"}
-                  user_name={"Finn Human"}
-                  date_submitted={"today"}
-                  status={"Review"}
-                />
-                <Objection
-                  id={0}
-                  ticket_id={1}
-                  expert_name={"Jonny Test"}
-                  user_name={"Finn Human"}
-                  date_submitted={"today"}
-                  status={"Review"}
-                />
-                <Objection
-                  id={0}
-                  ticket_id={1}
-                  expert_name={"Jonny Test"}
-                  user_name={"Finn Human"}
-                  date_submitted={"today"}
-                  status={"Review"}
-                />
-              </ul>
+              {!objections.isPending && objections.data!.length > 0 && (
+                <>
+                  <CardTitle className="mt-5 text-lg">Objections</CardTitle>
+                  <ul className="grid grid-cols-[repeat(auto-fill,minmax(300px,1fr))] gap-2">
+                    {objections.data!.map((obj) => (
+                      <Objection key={obj.id} disputeId={disputeId} {...obj} />
+                    ))}
+                  </ul>
+                </>
+              )}
             </CardContent>
           </Card>
         </div>
@@ -259,6 +238,7 @@ function ExpertAssignment({ id, full_name, status }: ExpertSummary) {
 }
 
 function Objection({
+  disputeId,
   id,
   ticket_id,
   expert_name,
@@ -266,6 +246,7 @@ function Objection({
   date_submitted,
   status,
 }: {
+  disputeId: number;
   id: number;
   ticket_id: number;
   expert_name: string;
@@ -274,9 +255,26 @@ function Objection({
   status: ObjectionStatus;
 }) {
   const { toast } = useToast();
-  const objection = useMutation({
-    mutationFn: (status: ObjectionStatus) => changeObjectionStatus(id, status),
+  const client = useQueryClient();
+  const statusMut = useMutation({
+    mutationFn: (data: ObjectionStatus) => changeObjectionStatus(disputeId, id, data),
+
     onSuccess: (data, variables) => {
+      client.setQueryData(
+        [DISPUTE_DETAILS_KEY, disputeId, "objections"],
+        (old: ObjectionListResponse) =>
+          old.map((obj) =>
+            obj.id !== id
+              ? obj
+              : {
+                  ...obj,
+                  status: variables,
+                }
+          )
+      );
+      client.invalidateQueries({
+        queryKey: [DISPUTE_LIST_KEY, disputeId],
+      });
       toast({
         title: "Objection status updated successfully",
       });
@@ -304,7 +302,7 @@ function Objection({
           by {user_name}, {date_submitted}
         </span>
       </div>
-      <ObjectionStatusDropdown onSelect={(s) => objection.mutate(s)}>
+      <ObjectionStatusDropdown onSelect={(s) => statusMut.mutate(s)}>
         <ObjectionStatusBadge dropdown variant={status}>
           {status}
         </ObjectionStatusBadge>
diff --git a/admin-frontend/src/components/admin/status-dropdown.tsx b/admin-frontend/src/components/admin/status-dropdown.tsx
index 24165f82..868afb34 100644
--- a/admin-frontend/src/components/admin/status-dropdown.tsx
+++ b/admin-frontend/src/components/admin/status-dropdown.tsx
@@ -13,12 +13,8 @@ import { ReactNode } from "react";
 
 import { TICKET_STATUS, TicketStatus } from "@/lib/types/tickets";
 import { DisputeStatusBadge, ObjectionStatusBadge, TicketStatusBadge } from "./status-badge";
-import {
-  DISPUTE_STATUS,
-  DisputeStatus,
-  OBJECTION_STATUS,
-  ObjectionStatus,
-} from "@/lib/types/dispute";
+import { DISPUTE_STATUS, DisputeStatus } from "@/lib/types/dispute";
+import { OBJECTION_STATUS, ObjectionStatus } from "@/lib/types/experts";
 
 const statusVariants = cva("", {
   variants: {
diff --git a/admin-frontend/src/lib/api/dispute.ts b/admin-frontend/src/lib/api/dispute.ts
index 1d80b8eb..fa4c8434 100644
--- a/admin-frontend/src/lib/api/dispute.ts
+++ b/admin-frontend/src/lib/api/dispute.ts
@@ -24,7 +24,7 @@ export async function getDisputeList(req: AdminDisputesRequest): Promise<AdminDi
   }).then(validateResult<AdminDisputesResponse>);
 }
 
-export async function getDisputeDetails(id: string): Promise<DisputeDetailsResponse> {
+export async function getDisputeDetails(id: number): Promise<DisputeDetailsResponse> {
   return sf(`${API_URL}/disputes/${id}`, {
     method: "GET",
     headers: {
@@ -38,7 +38,7 @@ export async function getDisputeDetails(id: string): Promise<DisputeDetailsRespo
     });
 }
 
-export async function changeDisputeStatus(id: string, status: DisputeStatus): Promise<void> {
+export async function changeDisputeStatus(id: number, status: DisputeStatus): Promise<void> {
   await sf(`${API_URL}/disputes/${id}/status`, {
     method: "PUT",
     headers: {

From efbf3cd081571f5e95715618ed5cd683d22e743a Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 16:04:07 +0200
Subject: [PATCH 15/18] feat: Add better error messages

---
 admin-frontend/src/app/(pages)/disputes/page.tsx | 8 ++++++--
 admin-frontend/src/app/(pages)/tickets/page.tsx  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/admin-frontend/src/app/(pages)/disputes/page.tsx b/admin-frontend/src/app/(pages)/disputes/page.tsx
index e91e4b03..6fbf0e5c 100644
--- a/admin-frontend/src/app/(pages)/disputes/page.tsx
+++ b/admin-frontend/src/app/(pages)/disputes/page.tsx
@@ -16,13 +16,17 @@ import { useState } from "react";
 import DisputeFilters from "./dispute-filter";
 
 const searchSchema = z.object({
-  id: z.string().optional(),
+  id: z.coerce
+    .number({
+      message: "Invalid dispute ID",
+    })
+    .optional(),
 });
 
 export default function Disputes({ searchParams }: { searchParams: unknown }) {
   const { data: params, error: searchError } = searchSchema.safeParse(searchParams);
   if (!params) {
-    throw new Error(JSON.stringify(searchError));
+    throw new Error(searchError.issues[0].message);
   }
 
   const [client] = useState(new QueryClient());
diff --git a/admin-frontend/src/app/(pages)/tickets/page.tsx b/admin-frontend/src/app/(pages)/tickets/page.tsx
index f4e3e314..e71b3767 100644
--- a/admin-frontend/src/app/(pages)/tickets/page.tsx
+++ b/admin-frontend/src/app/(pages)/tickets/page.tsx
@@ -14,13 +14,17 @@ import { useState } from "react";
 import TicketFilters from "./ticket-filters";
 
 const searchSchema = z.object({
-  id: z.coerce.number().optional(),
+  id: z.coerce
+    .number({
+      message: "Invalid ticket ID",
+    })
+    .optional(),
 });
 
 export default function Tickets({ searchParams }: { searchParams: unknown }) {
   const { data: params, error: searchError } = searchSchema.safeParse(searchParams);
   if (!params) {
-    throw new Error(JSON.stringify(searchError));
+    throw new Error(searchError.issues[0].message);
   }
 
   const [client] = useState(new QueryClient());

From 016ffc3e9a982c0fe7ccee4d36b6d99269a7b276 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 16:15:20 +0200
Subject: [PATCH 16/18] feat: Integrate expert rejection form

---
 frontend/src/lib/actions/dispute.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/actions/dispute.ts b/frontend/src/lib/actions/dispute.ts
index 535fd406..5d82a900 100644
--- a/frontend/src/lib/actions/dispute.ts
+++ b/frontend/src/lib/actions/dispute.ts
@@ -65,7 +65,7 @@ export async function createDispute(_initial: unknown, data: FormData): Promise<
 export async function rejectExpert(
   _initial: unknown,
   data: FormData
-): Promise<Result<string, ExpertRejectError>> {
+): Promise<Result<number, ExpertRejectError>> {
   const { data: parsed, error: parseErr } = expertRejectSchema.safeParse(Object.fromEntries(data));
   if (parseErr) {
     return {
@@ -73,8 +73,8 @@ export async function rejectExpert(
     };
   }
 
-  const res = await formFetch<ExpertRejectData, string>(
-    `${API_URL}/disputes/${parsed.dispute_id}/experts/reject`,
+  const res = await formFetch<ExpertRejectData, number>(
+    `${API_URL}/disputes/${parsed.dispute_id}/objections`,
     {
       method: "POST",
       headers: {

From 6102df90486ea3914ca93f9a1d1f54f4f4de75f9 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 16:26:51 +0200
Subject: [PATCH 17/18] feat: Blood sacrifice to the CI/CD overlords

---
 admin-frontend/src/components/admin/status-badge.tsx |  5 +++--
 frontend/src/lib/actions/dispute.ts                  | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/admin-frontend/src/components/admin/status-badge.tsx b/admin-frontend/src/components/admin/status-badge.tsx
index 85ee5c62..74c1a833 100644
--- a/admin-frontend/src/components/admin/status-badge.tsx
+++ b/admin-frontend/src/components/admin/status-badge.tsx
@@ -3,8 +3,9 @@ import { Badge } from "../ui/badge";
 import { cn } from "@/lib/utils";
 import { FunctionComponent, HTMLAttributes } from "react";
 import { ChevronDown } from "lucide-react";
-import { TicketStatus } from "@/lib/types/tickets";
-import { DisputeStatus, ExpertStatus, ObjectionStatus } from "@/lib/types";
+import { type TicketStatus } from "@/lib/types/tickets";
+import { type DisputeStatus, type ExpertStatus } from "@/lib/types";
+import { type ObjectionStatus } from "@/lib/types/experts";
 
 const statusVariants = cva("", {
   variants: {
diff --git a/frontend/src/lib/actions/dispute.ts b/frontend/src/lib/actions/dispute.ts
index 5d82a900..1f7705f7 100644
--- a/frontend/src/lib/actions/dispute.ts
+++ b/frontend/src/lib/actions/dispute.ts
@@ -65,7 +65,7 @@ export async function createDispute(_initial: unknown, data: FormData): Promise<
 export async function rejectExpert(
   _initial: unknown,
   data: FormData
-): Promise<Result<number, ExpertRejectError>> {
+): Promise<Result<string, ExpertRejectError>> {
   const { data: parsed, error: parseErr } = expertRejectSchema.safeParse(Object.fromEntries(data));
   if (parseErr) {
     return {
@@ -88,10 +88,14 @@ export async function rejectExpert(
     }
   );
 
-  if (!res.error) {
-    revalidatePath(`/disputes/${parsed.dispute_id}`);
+  if (res.error) {
+    return res;
   }
-  return res;
+
+  revalidatePath(`/disputes/${parsed.dispute_id}`);
+  return {
+    data: res.data!.toString(),
+  };
 }
 
 export async function uploadEvidence(

From 58ed8975c4c81af73712faa0956878d61983aa50 Mon Sep 17 00:00:00 2001
From: Vincent <vafdaf11@gmail.com>
Date: Sat, 28 Sep 2024 18:47:41 +0200
Subject: [PATCH 18/18] fix: Wrong endpoint for uploading

---
 frontend/src/lib/actions/dispute.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/actions/dispute.ts b/frontend/src/lib/actions/dispute.ts
index e50e33ee..63a3066e 100644
--- a/frontend/src/lib/actions/dispute.ts
+++ b/frontend/src/lib/actions/dispute.ts
@@ -156,7 +156,7 @@ export async function uploadDecision(
     return { error: parseErr.format() };
   }
 
-  const res = await fetch(`${API_URL}/disputes/${parsed?.dispute_id}/evidence`, {
+  const res = await fetch(`${API_URL}/disputes/${parsed?.dispute_id}/decision`, {
     method: "POST",
     headers: {
       // Sub this for the proper getAuthToken thing