diff --git a/src/main/java/org/example/untitled/usercase/controller/CaseController.java b/src/main/java/org/example/untitled/usercase/controller/CaseController.java index 60cbdac..e600666 100644 --- a/src/main/java/org/example/untitled/usercase/controller/CaseController.java +++ b/src/main/java/org/example/untitled/usercase/controller/CaseController.java @@ -7,6 +7,8 @@ import org.example.untitled.usercase.dto.CommentDto; import org.example.untitled.usercase.dto.CreateCaseRequest; import org.example.untitled.usercase.dto.CreateCommentRequest; +import org.example.untitled.usercase.AuditLog; +import org.example.untitled.usercase.service.AuditLogService; import org.example.untitled.usercase.service.CaseService; import org.example.untitled.usercase.service.CommentService; import org.slf4j.Logger; @@ -32,12 +34,14 @@ public class CaseController { private final CaseService caseService; private final CommentService commentService; + private final AuditLogService auditLogService; private static final Logger log = LoggerFactory.getLogger(CaseController.class); - public CaseController(CaseService caseService, CommentService commentService) { + public CaseController(CaseService caseService, CommentService commentService, AuditLogService auditLogService) { this.caseService = caseService; this.commentService = commentService; + this.auditLogService = auditLogService; } @PostMapping @@ -71,8 +75,10 @@ public String showTicketDetails( throw new ResponseStatusException(HttpStatus.FORBIDDEN, "You do not own this ticket"); List comments = commentService.getCommentsByTicketId(id); + List auditLogs = auditLogService.getLogsForCase(id); model.addAttribute("ticket", ticket); model.addAttribute("comments", comments); + model.addAttribute("auditLogs", auditLogs); return "ticket"; } diff --git a/src/main/resources/templates/ticket.html b/src/main/resources/templates/ticket.html index ef79986..8650650 100644 --- a/src/main/resources/templates/ticket.html +++ b/src/main/resources/templates/ticket.html @@ -1,49 +1,59 @@ - Ticket - + -
+

Ticket Details

-
-

+
+ + +
-

Status:

-

-

Handler:

-


-

Description:

-


+

Handler:

+

-
-
-
-

-

- Author: -

+ +
+

Comments

+
+

+

Author:

+
+
+ +
+

Activity Log

+
+
+ +
- +
- + \ No newline at end of file