-
Notifications
You must be signed in to change notification settings - Fork 1
feat: add Thymeleaf frontend with ticket management views and styles #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
df09c30
feat: add Thymeleaf frontend with ticket management views and styles
VonAdamo 1917395
feat: optimize user insertion in DataInitializer with batch insert sy…
VonAdamo 0bd83dc
feat: enhance ticket creation and comment submission with validation …
VonAdamo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/main/java/org/group1/projectbackend/controller/web/HomeController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package org.group1.projectbackend.controller.web; | ||
|
|
||
| import org.springframework.stereotype.Controller; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
|
|
||
| @Controller | ||
| public class HomeController { | ||
|
|
||
| @GetMapping("/") | ||
| public String home() { | ||
| return "index"; | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
src/main/java/org/group1/projectbackend/controller/web/TicketViewController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package org.group1.projectbackend.controller.web; | ||
|
|
||
| import jakarta.validation.Valid; | ||
| import java.security.Principal; | ||
| import org.group1.projectbackend.dto.comment.CreateCommentDto; | ||
| import org.group1.projectbackend.dto.ticket.CreateTicketRequest; | ||
| import org.group1.projectbackend.dto.ticket.TicketResponse; | ||
| import org.group1.projectbackend.dto.ticket.UpdateTicketStatusRequest; | ||
| import org.group1.projectbackend.entity.User; | ||
| import org.group1.projectbackend.entity.enums.TicketPriority; | ||
| import org.group1.projectbackend.entity.enums.TicketStatus; | ||
| import org.group1.projectbackend.exception.ResourceNotFoundException; | ||
| import org.group1.projectbackend.repository.UserRepository; | ||
| import org.group1.projectbackend.service.CommentService; | ||
| import org.group1.projectbackend.service.SupportTicketService; | ||
| import org.springframework.stereotype.Controller; | ||
| import org.springframework.ui.Model; | ||
| import org.springframework.validation.BindingResult; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.ModelAttribute; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
|
|
||
| @Controller | ||
| public class TicketViewController { | ||
|
|
||
| private final SupportTicketService supportTicketService; | ||
| private final CommentService commentService; | ||
| private final UserRepository userRepository; | ||
|
|
||
| public TicketViewController( | ||
| SupportTicketService supportTicketService, | ||
| CommentService commentService, | ||
| UserRepository userRepository | ||
| ) { | ||
| this.supportTicketService = supportTicketService; | ||
| this.commentService = commentService; | ||
| this.userRepository = userRepository; | ||
| } | ||
|
|
||
| @GetMapping("/tickets") | ||
| public String listTickets(Model model) { | ||
| model.addAttribute("tickets", supportTicketService.getAllTickets()); | ||
| return "tickets/list"; | ||
| } | ||
|
|
||
| @GetMapping("/tickets/{id}") | ||
| public String showTicket(@PathVariable Long id, Model model) { | ||
| model.addAttribute("ticket", supportTicketService.getTicketById(id)); | ||
| model.addAttribute("comments", commentService.getCommentsBySupportTicketId(id, "asc")); | ||
| model.addAttribute("statuses", TicketStatus.values()); | ||
| return "tickets/detail"; | ||
| } | ||
|
|
||
| @GetMapping("/tickets/new") | ||
| public String showCreateTicketForm(Model model) { | ||
| model.addAttribute("createTicketRequest", new CreateTicketRequest("", "", null)); | ||
| model.addAttribute("priorities", TicketPriority.values()); | ||
| return "tickets/new"; | ||
| } | ||
|
|
||
| @PostMapping("/tickets") | ||
| public String createTicket( | ||
| Principal principal, | ||
| @Valid @ModelAttribute CreateTicketRequest request, | ||
| BindingResult bindingResult, | ||
| Model model | ||
| ) { | ||
| if (bindingResult.hasErrors()) { | ||
| model.addAttribute("priorities", TicketPriority.values()); | ||
| return "tickets/new"; | ||
| } | ||
|
|
||
| TicketResponse ticket = supportTicketService.createTicket(principal.getName(), request); | ||
|
|
||
| return "redirect:/tickets/" + ticket.id(); | ||
| } | ||
|
|
||
| @PostMapping("/tickets/{id}/comments") | ||
| public String createComment( | ||
| @PathVariable Long id, | ||
| @RequestParam String content, | ||
| Principal principal | ||
| ) { | ||
| User user = userRepository.findByUsername(principal.getName()) | ||
| .orElseThrow(() -> new ResourceNotFoundException("User not found with username: " + principal.getName())); | ||
|
|
||
| CreateCommentDto comment = new CreateCommentDto(); | ||
| comment.setContent(content); | ||
| comment.setSupportTicketId(id); | ||
| comment.setUserId(user.getId()); | ||
|
|
||
| commentService.createComment(comment); | ||
|
VonAdamo marked this conversation as resolved.
|
||
|
|
||
| return "redirect:/tickets/" + id; | ||
| } | ||
|
|
||
| @PostMapping("/tickets/{id}/status") | ||
| public String updateTicketStatus( | ||
| @PathVariable Long id, | ||
| @RequestParam TicketStatus status | ||
| ) { | ||
| supportTicketService.updateStatus(id, new UpdateTicketStatusRequest(status)); | ||
|
|
||
| return "redirect:/tickets/" + id; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.