From f63fb553a135f0157581d4288cf1e8a50c5b6452 Mon Sep 17 00:00:00 2001
From: Christian Rodrigues <Christianrodrigues02@gmail.com>
Date: Fri, 10 Oct 2025 11:42:48 -0700
Subject: [PATCH] client(feat): implement ticket completion feature with
 documentation modal

---
 .../tickets/ticket-complete-modal.tsx         | 107 ++++++++++++++++++
 client/components/tickets/ticket-detail.tsx   |  97 ++++++++++++++--
 client/components/tickets/ticket-edit.tsx     |  40 +++++--
 client/lib/api/tickets.ts                     |   5 +
 client/lib/hooks/queries/use-tickets.ts       |  16 ++-
 client/lib/types/ticket.ts                    |   1 +
 server/internal/api/handlers.go               |  36 ++++++
 server/internal/models/ticket.go              |  69 +++++------
 server/internal/storage/storage.go            |   5 +
 9 files changed, 322 insertions(+), 54 deletions(-)
 create mode 100644 client/components/tickets/ticket-complete-modal.tsx

diff --git a/client/components/tickets/ticket-complete-modal.tsx b/client/components/tickets/ticket-complete-modal.tsx
new file mode 100644
index 0000000..bbed5b7
--- /dev/null
+++ b/client/components/tickets/ticket-complete-modal.tsx
@@ -0,0 +1,107 @@
+"use client";
+
+import { BookOpen, CheckCircle } from "lucide-react";
+import { FormEvent, useState } from "react";
+
+import Button from "../ui/button";
+import LabeledIcon from "../ui/labeled-icon";
+import Modal from "../ui/modal";
+
+export interface TicketCompleteModalProps {
+  isOpen: boolean;
+  ticketTitle: string;
+  existingDocumentation?: string;
+  onClose: () => void;
+  onComplete: (documentation: string) => void;
+  isLoading?: boolean;
+}
+
+export default function TicketCompleteModal({
+  isOpen,
+  ticketTitle,
+  existingDocumentation = "",
+  onClose,
+  onComplete,
+  isLoading = false,
+}: TicketCompleteModalProps) {
+  const [documentation, setDocumentation] = useState(existingDocumentation);
+
+  const handleSubmit = (e: FormEvent) => {
+    e.preventDefault();
+    onComplete(documentation);
+  };
+
+  const handleClose = () => {
+    setDocumentation(existingDocumentation); // Reset to original value
+    onClose();
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={handleClose}>
+      <div className="max-w-2xl p-4">
+        <div className="mb-6">
+          <div className="flex items-center gap-2 mb-2">
+            <CheckCircle className="w-5 h-5 text-green-600" />
+            <h3 className="text-lg font-semibold text-gray-800 dark:text-gray-200">
+              Complete Ticket
+            </h3>
+          </div>
+          <p className="text-gray-600 dark:text-gray-400 mb-2">
+            <strong>Ticket:</strong> {ticketTitle}
+          </p>
+          <p className="text-sm text-gray-500 dark:text-gray-500">
+            Before marking this ticket as complete, please document how you resolved it. 
+            This helps other team members learn from your solution.
+          </p>
+        </div>
+
+        <form onSubmit={handleSubmit}>
+          <div className="mb-6">
+            <label className="flex items-center text-sm font-medium text-gray-800 dark:text-gray-300 mb-2">
+              <LabeledIcon className="mr-2" icon={<BookOpen className="w-4" />} label="Resolution Documentation" />
+            </label>
+            <textarea
+              value={documentation}
+              onChange={(e) => setDocumentation(e.target.value)}
+              placeholder="Describe how you resolved this ticket:&#10;• What was the root cause?&#10;• What steps did you take?&#10;• What solution worked?&#10;• Any preventive measures for the future?"
+              className="w-full p-3 border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-300 rounded-md resize-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              rows={8}
+              required
+            />
+            <p className="text-xs text-gray-500 mt-1">
+              Documentation is required to complete the ticket
+            </p>
+          </div>
+
+          <div className="flex justify-end gap-3">
+            <Button
+              type="button"
+              className="bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-600 dark:text-white rounded"
+              onClick={handleClose}
+              disabled={isLoading}
+            >
+              Cancel
+            </Button>
+            <Button
+              type="submit"
+              className="bg-green-600 hover:bg-green-700 text-white rounded"
+              disabled={isLoading || !documentation.trim()}
+            >
+              {isLoading ? (
+                <span className="flex items-center gap-2">
+                  <div className="w-4 h-4 border-2 border-white border-t-transparent rounded-full animate-spin" />
+                  Completing...
+                </span>
+              ) : (
+                <span className="flex items-center gap-2">
+                  <CheckCircle className="w-4 h-4" />
+                  Complete Ticket
+                </span>
+              )}
+            </Button>
+          </div>
+        </form>
+      </div>
+    </Modal>
+  );
+}
\ No newline at end of file
diff --git a/client/components/tickets/ticket-detail.tsx b/client/components/tickets/ticket-detail.tsx
index 5f40eb2..8c6b229 100644
--- a/client/components/tickets/ticket-detail.tsx
+++ b/client/components/tickets/ticket-detail.tsx
@@ -1,11 +1,12 @@
 "use client";
 
 import Link from "next/link";
-import { Building, Calendar, PencilLine, SquareArrowUpRight, Tag, User } from "lucide-react";
+import { Building, Calendar, FileText, PencilLine, SquareArrowUpRight, Tag, User, BookOpen } from "lucide-react";
 import { MouseEvent, useEffect, useState } from "react";
 
 import TicketAssignedTo from "./ticket-assigned-to";
 import TicketEdit from "./ticket-edit";
+import TicketCompleteModal from "./ticket-complete-modal";
 import { useTicket, useUpdateTicket } from "@/lib/hooks/queries/use-tickets";
 import { Status, Statuses } from "@/lib/types/ticket";
 import Button from "../ui/button";
@@ -23,6 +24,8 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
   const { mutate: updateTicket } = useUpdateTicket();
   const [status, setStatus] = useState<Status>("Active");
   const [isEditing, setIsEditing] = useState(false);
+  const [isCompletionModalOpen, setIsCompletionModalOpen] = useState(false);
+  const [isCompleting, setIsCompleting] = useState(false);
 
   useEffect(() => {
     if (ticket) {
@@ -58,7 +61,7 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
         onSave={(updates) => {
           setIsEditing(false);
           updateTicket({ id: ticketId, updates });
-          setTimeout(onUpdate, 300);
+          onUpdate(); // Call immediately since cache is updated
         }}
       />
     );
@@ -91,7 +94,35 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
 
     setStatus(updatedStatus);
     updateTicket({ id: ticketId, updates: { status: updatedStatus } });
-    setTimeout(onUpdate, 300);
+    onUpdate(); // Call immediately since cache is updated
+  };
+
+  const handleCompleteTicket = () => {
+    setIsCompletionModalOpen(true);
+  };
+
+  const handleCompleteWithDocumentation = (documentation: string) => {
+    setIsCompleting(true);
+    
+    // Use updateTicket instead of completeTicket to set both status and documentation
+    updateTicket({ 
+      id: ticketId, 
+      updates: { 
+        status: "Closed",
+        documentation: documentation
+      } 
+    }, {
+      onSuccess: (updatedTicket) => {
+        setStatus("Closed");
+        setIsCompletionModalOpen(false);
+        setIsCompleting(false);
+        onUpdate(); // Call immediately since cache is updated
+      },
+      onError: (error) => {
+        console.error('Error updating ticket:', error);
+        setIsCompleting(false);
+      },
+    });
   };
 
   return (
@@ -103,12 +134,22 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
         >
           &lt;-
         </Button>
-        <Button
-          className="bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-600 dark:text-white rounded"
-          onClick={() => setIsEditing(true)}
-        >
-          <LabeledIcon icon={<PencilLine className="w-4" />} label="Edit" />
-        </Button>
+        <div className="flex gap-2">
+          {ticket.status !== "Closed" && (
+            <Button
+              className="bg-green-600 hover:bg-green-700 text-white rounded px-4 py-2 font-medium"
+              onClick={handleCompleteTicket}
+            >
+              Complete Ticket
+            </Button>
+          )}
+          <Button
+            className="bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-600 dark:text-white rounded"
+            onClick={() => setIsEditing(true)}
+          >
+            <LabeledIcon icon={<PencilLine className="w-4" />} label="Edit" />
+          </Button>
+        </div>
       </div>
       <p className="mt-3 mb-1 text-sm text-gray-600 dark:text-gray-500">TK {ticket.id}</p>
       <div className="flex gap-5 items-center">
@@ -122,7 +163,33 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
         </Dropdown>
         <p className="text-xl font-bold text-gray-800 dark:text-gray-300">{ticket.title}</p>
       </div>
-      <p className="my-4 text-gray-800 dark:text-gray-300">{ticket.description}</p>
+      
+      {/* Description Section */}
+      <div className="my-6">
+        <div className="mb-2">
+          <LabeledIcon icon={<FileText className="w-5" />} label="Description" />
+        </div>
+        <div className="bg-white dark:bg-gray-900 p-4 rounded-lg border border-gray-200 dark:border-gray-700">
+          <p className="text-gray-800 dark:text-gray-300 whitespace-pre-wrap">
+            {ticket.description || "No description provided."}
+          </p>
+        </div>
+      </div>
+
+      {/* Documentation Section */}
+      <div className="my-6">
+        <div className="mb-2">
+          <LabeledIcon icon={<BookOpen className="w-5" />} label="Resolution Documentation" />
+        </div>
+        <div className="bg-white dark:bg-gray-900 p-4 rounded-lg border border-gray-200 dark:border-gray-700">
+          <p className="text-gray-800 dark:text-gray-300 whitespace-pre-wrap">
+            {ticket.documentation && ticket.documentation.trim() 
+              ? ticket.documentation 
+              : "No resolution documentation provided yet."}
+          </p>
+        </div>
+      </div>
+
       <table className="table-auto min-w-full">
         <tbody>
           <tr>
@@ -167,6 +234,16 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
           </tr>
         </tbody>
       </table>
+
+      {/* Completion Modal */}
+      <TicketCompleteModal
+        isOpen={isCompletionModalOpen}
+        ticketTitle={ticket.title}
+        existingDocumentation={ticket.documentation || ""}
+        onClose={() => setIsCompletionModalOpen(false)}
+        onComplete={handleCompleteWithDocumentation}
+        isLoading={isCompleting}
+      />
     </div>
   );
 }
diff --git a/client/components/tickets/ticket-edit.tsx b/client/components/tickets/ticket-edit.tsx
index 43c2a74..5050f8d 100644
--- a/client/components/tickets/ticket-edit.tsx
+++ b/client/components/tickets/ticket-edit.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Building, Tag, User } from "lucide-react";
-import { FormEvent, useState } from "react";
+import { BookOpen, Building, Tag, User } from "lucide-react";
+import { FormEvent, useState, useEffect } from "react";
 
 import { useTicket, useUpdateTicket } from "@/lib/hooks/queries/use-tickets";
 import { useToast } from "@/lib/hooks/use-toast";
@@ -20,9 +20,16 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
   const { data: ticket } = useTicket(ticketId);
   const { mutate: updateTicket } = useUpdateTicket();
 
-  const [formData, setFormData] = useState<Partial<Ticket>>(ticket || {});
+  const [formData, setFormData] = useState<Partial<Ticket>>({});
   const [isSaving, setIsSaving] = useState(false);
 
+  // Update form data when ticket data loads/changes
+  useEffect(() => {
+    if (ticket) {
+      setFormData(ticket);
+    }
+  }, [ticket]);
+
   if (!ticket) {
     let layout = <></>;
 
@@ -95,7 +102,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
         <p className="mb-2 text-sm text-gray-600 dark:text-gray-500">TK {ticket.id}</p>
         <div className="mb-4">
           <label className={`block ${labelStyle}`}>Status</label>
-          <select name="status" value={formData.status || ticket.status} onChange={handleChange} className={inputStyles}>
+          <select name="status" value={formData.status || ""} onChange={handleChange} className={inputStyles}>
             {Statuses.map((status) => (
               <option key={status} value={status}>
                 {status}
@@ -107,7 +114,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
           <label className={`block ${labelStyle}`}>Priority</label>
           <select
             name="priority"
-            value={formData.priority || ticket.priority}
+            value={formData.priority || ""}
             onChange={handleChange}
             className={inputStyles}
             required
@@ -127,7 +134,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
           <input
             type="text"
             name="title"
-            value={formData.title}
+            value={formData.title || ""}
             placeholder="Enter a title"
             onChange={handleChange}
             className={inputStyles}
@@ -138,13 +145,26 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
           <label className={`block ${labelStyle}`}>Description</label>
           <textarea
             name="description"
-            value={formData.description}
+            value={formData.description || ""}
             placeholder="A descriptive ticket makes a good ticket."
             onChange={handleChange}
             className={inputStyles}
             rows={4}
           />
         </div>
+        <div className="mb-4">
+          <label className={`flex items-center ${labelStyle}`}>
+            <LabeledIcon className="mr-1" icon={<BookOpen className="w-4" />} label="Resolution Documentation" />
+          </label>
+          <textarea
+            name="documentation"
+            value={formData.documentation || ""}
+            placeholder="Document how this ticket was resolved, steps taken, solutions applied, etc."
+            onChange={handleChange}
+            className={inputStyles}
+            rows={4}
+          />
+        </div>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
           <div>
             <label className={`flex items-center ${labelStyle}`}>
@@ -153,7 +173,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
             <input
               type="text"
               name="assignedTo"
-              value={formData.assignedTo}
+              value={formData.assignedTo || ""}
               placeholder="Unassigned"
               onChange={handleChange}
               className={inputStyles}
@@ -163,7 +183,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
             <label className={`flex items-center ${labelStyle}`}>
               <LabeledIcon className="mr-1" icon={<Building className="w-4" />} label="Site" />
             </label>
-            <select name="site" value={formData.site || ticket.site} onChange={handleChange} className={inputStyles}>
+            <select name="site" value={formData.site || ""} onChange={handleChange} className={inputStyles}>
               {Sites.map((site) => (
                 <option key={site} value={site}>
                   {site}
@@ -175,7 +195,7 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
             <label className={`flex items-center ${labelStyle}`}>
               <LabeledIcon className="mr-1" icon={<Tag className="w-4" />} label="Category" />
             </label>
-            <select name="category" value={formData.category || ticket.category} onChange={handleChange} className={inputStyles}>
+            <select name="category" value={formData.category || ""} onChange={handleChange} className={inputStyles}>
               {Categories.map((category) => (
                 <option key={category} value={category}>
                   {category}
diff --git a/client/lib/api/tickets.ts b/client/lib/api/tickets.ts
index 49afa46..10f24ae 100644
--- a/client/lib/api/tickets.ts
+++ b/client/lib/api/tickets.ts
@@ -20,3 +20,8 @@ export async function updateTicket(id: string, updates: Partial<Ticket>) {
   const { data: updatedTicket } = await server.put<Ticket>(`/tickets/${id}`, updates);
   return updatedTicket;
 }
+
+export async function completeTicket(id: string) {
+  const { data: completedTicket } = await server.post<Ticket>(`/tickets/${id}/complete`);
+  return completedTicket;
+}
diff --git a/client/lib/hooks/queries/use-tickets.ts b/client/lib/hooks/queries/use-tickets.ts
index 26ef4b2..9761e79 100644
--- a/client/lib/hooks/queries/use-tickets.ts
+++ b/client/lib/hooks/queries/use-tickets.ts
@@ -1,4 +1,4 @@
-import { createTicket, getTicket, getTickets, updateTicket } from "@/lib/api/tickets";
+import { completeTicket, createTicket, getTicket, getTickets, updateTicket } from "@/lib/api/tickets";
 import Ticket from "@/lib/types/ticket";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
@@ -39,6 +39,20 @@ export const useUpdateTicket = () => {
 
   return useMutation<Ticket, Error, { id: string; updates: Partial<Ticket> }>({
     mutationFn: ({ id, updates }) => updateTicket(id, updates),
+    onSuccess: (updatedTicket, variables) => {
+      // Update the individual ticket cache with the fresh data
+      client.setQueryData(["tickets", variables.id], updatedTicket);
+      // Invalidate the tickets list to refresh it as well
+      client.invalidateQueries({ queryKey: ["tickets"], exact: false });
+    },
+  });
+};
+
+export const useCompleteTicket = () => {
+  const client = useQueryClient();
+
+  return useMutation<Ticket, Error, string>({
+    mutationFn: (id) => completeTicket(id),
     onSuccess: () => client.invalidateQueries({ queryKey: ["tickets"] }),
   });
 };
diff --git a/client/lib/types/ticket.ts b/client/lib/types/ticket.ts
index af6456e..3e3e505 100644
--- a/client/lib/types/ticket.ts
+++ b/client/lib/types/ticket.ts
@@ -2,6 +2,7 @@ export default interface Ticket {
   id: string;
   title: string;
   description: string;
+  documentation?: string;
   site: Site;
   category: Category;
   assignedTo?: string;
diff --git a/server/internal/api/handlers.go b/server/internal/api/handlers.go
index 2980eb5..fd8b848 100644
--- a/server/internal/api/handlers.go
+++ b/server/internal/api/handlers.go
@@ -43,6 +43,7 @@ func (h *TicketHandler) RegisterRoutes(mux *http.ServeMux) {
 	mux.HandleFunc("GET /api/v1/tickets", h.handleGetTickets)
 	mux.HandleFunc("GET /api/v1/tickets/{id}", h.handleGetTicket)
 	mux.HandleFunc("PUT /api/v1/tickets/{id}", h.handleUpdateTicket)
+	mux.HandleFunc("POST /api/v1/tickets/{id}/complete", h.handleCompleteTicket)
 	mux.HandleFunc("DELETE /api/v1/tickets/{id}", h.handleDeleteTicket)
 }
 
@@ -187,6 +188,41 @@ func (h *TicketHandler) handleUpdateTicket(w http.ResponseWriter, r *http.Reques
 	encodeJSON(h, w, ticket)
 }
 
+// handleCompleteTicket handles marking a ticket as completed (closed)
+func (h *TicketHandler) handleCompleteTicket(w http.ResponseWriter, r *http.Request) {
+	var (
+		ticketId = r.PathValue("id")
+		updates  = map[string]any{
+			"status":    "Closed",
+			"updatedAt": time.Now(),
+		}
+		sugar = h.logger.Sugar()
+	)
+
+	ctx, cancel := context.WithTimeout(context.Background(), _databaseTimeoutPolicy)
+	defer cancel()
+
+	ticket, err := h.store.UpdateTicket(ctx, ticketId, updates)
+	if err != nil {
+		switch {
+		case errors.Is(err, storage.ErrTicketNotFound):
+			sugar.Debug(err)
+			http.Error(w, err.Error(), http.StatusNotFound)
+
+			return
+		default:
+			sugar.Error(err)
+			http.Error(w, errInternal.Error(), http.StatusInternalServerError)
+
+			return
+		}
+	}
+
+	w.WriteHeader(http.StatusOK)
+
+	encodeJSON(h, w, ticket)
+}
+
 // handleDeleteTicket handles deleting a ticket
 func (h *TicketHandler) handleDeleteTicket(w http.ResponseWriter, r *http.Request) {
 	var (
diff --git a/server/internal/models/ticket.go b/server/internal/models/ticket.go
index 0b5a018..7c1e972 100644
--- a/server/internal/models/ticket.go
+++ b/server/internal/models/ticket.go
@@ -9,17 +9,18 @@ import (
 
 // Ticket represents an IT ticket with associated metadata
 type Ticket struct {
-	ID          string    `json:"id" bson:"_id"`
-	Title       string    `json:"title"`
-	Description string    `json:"description"`
-	Site        string    `json:"site"`
-	Category    string    `json:"category"`
-	AssignedTo  string    `json:"assignedTo"`
-	CreatedBy   string    `json:"createdBy"`
-	Priority    int       `json:"priority"`
-	Status      string    `json:"status"`
-	CreatedOn   time.Time `json:"createdOn"`
-	UpdatedAt   time.Time `json:"updatedAt"`
+	ID            string    `json:"id" bson:"_id"`
+	Title         string    `json:"title" bson:"title"`
+	Description   string    `json:"description" bson:"description"`
+	Documentation string    `json:"documentation" bson:"documentation"`
+	Site          string    `json:"site" bson:"site"`
+	Category      string    `json:"category" bson:"category"`
+	AssignedTo    string    `json:"assignedTo" bson:"assignedTo"`
+	CreatedBy     string    `json:"createdBy" bson:"createdBy"`
+	Priority      int       `json:"priority" bson:"priority"`
+	Status        string    `json:"status" bson:"status"`
+	CreatedOn     time.Time `json:"createdOn" bson:"createdOn"`
+	UpdatedAt     time.Time `json:"updatedAt" bson:"updatedAt"`
 }
 
 // UnmarshalBSON provides a custom unmarshal implementation for Ticket, enabling
@@ -28,17 +29,18 @@ func (t *Ticket) UnmarshalBSON(data []byte) error {
 	var (
 		buffer bytes.Buffer
 		result struct {
-			ID          string    `json:"id" bson:"_id"`
-			Title       string    `json:"title"`
-			Description string    `json:"description"`
-			Site        string    `json:"site"`
-			Category    string    `json:"category"`
-			AssignedTo  string    `json:"assignedTo"`
-			CreatedBy   string    `json:"createdBy"`
-			Priority    int       `json:"priority"`
-			Status      string    `json:"status"`
-			CreatedOn   time.Time `json:"createdOn"`
-			UpdatedAt   time.Time `json:"updatedAt"`
+			ID            string    `json:"id" bson:"_id"`
+			Title         string    `json:"title" bson:"title"`
+			Description   string    `json:"description" bson:"description"`
+			Documentation string    `json:"documentation" bson:"documentation"`
+			Site          string    `json:"site" bson:"site"`
+			Category      string    `json:"category" bson:"category"`
+			AssignedTo    string    `json:"assignedTo" bson:"assignedTo"`
+			CreatedBy     string    `json:"createdBy" bson:"createdBy"`
+			Priority      int       `json:"priority" bson:"priority"`
+			Status        string    `json:"status" bson:"status"`
+			CreatedOn     time.Time `json:"createdOn" bson:"createdOn"`
+			UpdatedAt     time.Time `json:"updatedAt" bson:"updatedAt"`
 		}
 	)
 	_, _ = buffer.Write(data)
@@ -51,17 +53,18 @@ func (t *Ticket) UnmarshalBSON(data []byte) error {
 	}
 
 	*t = Ticket{
-		ID:          result.ID,
-		Title:       result.Title,
-		Description: result.Description,
-		Site:        result.Site,
-		Category:    result.Category,
-		AssignedTo:  result.AssignedTo,
-		CreatedBy:   result.CreatedBy,
-		Priority:    result.Priority,
-		Status:      result.Status,
-		CreatedOn:   result.CreatedOn,
-		UpdatedAt:   result.UpdatedAt,
+		ID:            result.ID,
+		Title:         result.Title,
+		Description:   result.Description,
+		Documentation: result.Documentation,
+		Site:          result.Site,
+		Category:      result.Category,
+		AssignedTo:    result.AssignedTo,
+		CreatedBy:     result.CreatedBy,
+		Priority:      result.Priority,
+		Status:        result.Status,
+		CreatedOn:     result.CreatedOn,
+		UpdatedAt:     result.UpdatedAt,
 	}
 
 	return nil
diff --git a/server/internal/storage/storage.go b/server/internal/storage/storage.go
index 42bd96e..d8de2fb 100644
--- a/server/internal/storage/storage.go
+++ b/server/internal/storage/storage.go
@@ -54,6 +54,7 @@ func (s *TicketStore) CreateTicket(ctx context.Context, ticket models.Ticket) (i
 		doc   = bson.D{
 			{Key: "title", Value: ticket.Title},
 			{Key: "description", Value: ticket.Description},
+			{Key: "documentation", Value: ticket.Documentation},
 			{Key: "site", Value: ticket.Site},
 			{Key: "category", Value: ticket.Category},
 			{Key: "assignedTo", Value: ticket.AssignedTo},
@@ -148,6 +149,10 @@ func (s *TicketStore) UpdateTicket(ctx context.Context, id string, updates map[s
 		updatesDoc = append(updatesDoc, bson.E{Key: "description", Value: description})
 	}
 
+	if documentation, ok := updates["documentation"].(string); ok {
+		updatesDoc = append(updatesDoc, bson.E{Key: "documentation", Value: documentation})
+	}
+
 	if site, ok := updates["site"].(string); ok {
 		updatesDoc = append(updatesDoc, bson.E{Key: "site", Value: site})
 	}