diff --git a/src/main/java/org/example/untitled/user/controller/UserController.java b/src/main/java/org/example/untitled/user/controller/UserController.java index ecf6b0a..786656c 100644 --- a/src/main/java/org/example/untitled/user/controller/UserController.java +++ b/src/main/java/org/example/untitled/user/controller/UserController.java @@ -6,6 +6,7 @@ import org.example.untitled.exception.UserAlreadyExistsException; import org.example.untitled.user.service.UserService; import org.example.untitled.usercase.service.CaseService; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; @@ -28,6 +29,7 @@ public UserController(UserService service, CaseService caseService) { } @GetMapping("/user") + @PreAuthorize("hasRole('USER')") public String userLanding(Model model, @AuthenticationPrincipal UserDetails userDetails, @RequestParam(required = false) String filter) { diff --git a/src/main/java/org/example/untitled/usercase/repository/CommentRepository.java b/src/main/java/org/example/untitled/usercase/repository/CommentRepository.java index f959bde..f5e6263 100644 --- a/src/main/java/org/example/untitled/usercase/repository/CommentRepository.java +++ b/src/main/java/org/example/untitled/usercase/repository/CommentRepository.java @@ -3,10 +3,17 @@ import org.example.untitled.usercase.CaseEntity; import org.example.untitled.usercase.Comment; import org.example.untitled.usercase.dto.CommentDto; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.ListCrudRepository; +import org.springframework.data.repository.query.Param; import java.util.List; public interface CommentRepository extends ListCrudRepository { - List findCommentsByCaseEntity(CaseEntity caseEntity); + + @Query("SELECT new org.example.untitled.usercase.dto.CommentDto(" + + "c.id, c.text, c.author.id, c.author.username, c.caseEntity.id, c.createdAt) " + + "FROM Comment c WHERE c.caseEntity = :caseEntity " + + "ORDER BY c.createdAt ASC") + List findCommentsByCaseEntity(@Param("caseEntity") CaseEntity caseEntity); } diff --git a/src/main/resources/templates/ticket.html b/src/main/resources/templates/ticket.html index 891c0b9..ef79986 100644 --- a/src/main/resources/templates/ticket.html +++ b/src/main/resources/templates/ticket.html @@ -1,5 +1,7 @@ - + Ticket @@ -26,7 +28,6 @@

Ticket Details

-

Author: @@ -37,7 +38,10 @@

Ticket Details

diff --git a/src/main/resources/templates/userpage.html b/src/main/resources/templates/userpage.html index bd8fe14..5d5e298 100644 --- a/src/main/resources/templates/userpage.html +++ b/src/main/resources/templates/userpage.html @@ -11,7 +11,7 @@

My Tickets

+ New ticket - Upload file + Upload file
@@ -46,6 +46,7 @@

My Tickets

+ View Edit Close