RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chat now present in the bottom right.

Browse Source
This commit is contained in:
augmentedpotato
2026-04-14 05:59:33 -06:00
parent 7bddd74a6e
commit 7303c22cd3
6 changed files with 655 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/petshop/backend/controller/ChatController.java
View File

@@ -68,9 +68,10 @@ public class ChatController {
@GetMapping("/conversations")
@PreAuthorize("hasAnyRole('CUSTOMER', 'STAFF', 'ADMIN')")
public ResponseEntity<List<ConversationResponse>> getConversations() {
public ResponseEntity<List<ConversationResponse>> getConversations(
@RequestParam(required = false, defaultValue = "false") boolean mine) {
User user = getCurrentUser();
List<ConversationResponse> conversations = chatService.getConversations(user.getId(), user.getRole());
List<ConversationResponse> conversations = chatService.getConversations(user.getId(), user.getRole(), mine);
return ResponseEntity.ok(conversations);
}

4
backend/src/main/java/com/petshop/backend/service/ChatService.java
View File

@@ -65,10 +65,10 @@ public class ChatService {
return ConversationResponse.fromEntity(conversation, request.getMessage(), userId);
}
public List<ConversationResponse> getConversations(Long userId, User.Role role) {
public List<ConversationResponse> getConversations(Long userId, User.Role role, boolean mine) {
List<Conversation> conversations;
if (role == User.Role.CUSTOMER) {
if (mine || role == User.Role.CUSTOMER) {
conversations = conversationRepository.findByCustomerId(userId);
} else if (role == User.Role.STAFF) {
List<Conversation> assignedToMe = conversationRepository.findByStaffId(userId);